From 1262bf8484f2d70226dd2345fd77475ff3d71c94 Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Sat, 18 Jan 2025 15:57:49 +1100
Subject: [PATCH] Building Julia with MMTk using BinaryBuilder (#56989)

Adding `mmtk-julia` as a BinaryBuilder dependency and using that as the
default setup for building Julia with MMTk.

~NB: still have to update the version and checksum files after
https://github.com/JuliaPackaging/Yggdrasil/pull/10288 gets merged.~
---
 Make.inc                  | 2 +-
 Makefile                  | 4 ++++
 deps/checksums/mmtk_julia | 4 +++-
 deps/mmtk_julia.mk        | 8 ++++++++
 deps/mmtk_julia.version   | 2 ++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Make.inc b/Make.inc
index 26b5ae7752555..16e238c6f0683 100644
--- a/Make.inc
+++ b/Make.inc
@@ -1402,7 +1402,7 @@ CSL_NEXT_GLIBCXX_VERSION=GLIBCXX_3\.4\.34|GLIBCXX_3\.5\.|GLIBCXX_4\.
 # Note: we explicitly _do not_ define `CSL` here, since it requires some more
 # advanced techniques to decide whether it should be installed from a BB source
 # or not.  See `deps/csl.mk` for more detail.
-BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE OPENLIBM GMP OPENSSL LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT BOLT
+BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE OPENLIBM GMP OPENSSL LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT BOLT MMTK_JULIA
 define SET_BB_DEFAULT
 # First, check to see if BB is disabled on a global setting
 ifeq ($$(USE_BINARYBUILDER),0)
diff --git a/Makefile b/Makefile
index 20d131ee8524c..b193b3849c6aa 100644
--- a/Makefile
+++ b/Makefile
@@ -281,6 +281,10 @@ endif
 endif
 endif
 
+ifneq (${MMTK_PLAN},None)
+JL_PRIVATE_LIBS-0 += libmmtk_julia
+endif
+
 # Note that we disable MSYS2's path munging here, as otherwise
 # it replaces our `:`-separated list as a `;`-separated one.
 define stringreplace
diff --git a/deps/checksums/mmtk_julia b/deps/checksums/mmtk_julia
index 49b7a50a8e136..979ab79e52207 100644
--- a/deps/checksums/mmtk_julia
+++ b/deps/checksums/mmtk_julia
@@ -1,4 +1,6 @@
 mmtk_julia-b69acf5af7a7dd97c1cc6fd99f7c2d51b477f214.tar.gz/md5/1911cf084d26c48e2ed58af3d268b4b6
 mmtk_julia-b69acf5af7a7dd97c1cc6fd99f7c2d51b477f214.tar.gz/sha512/75beab54398989c46b62e714b242cf6705d88d220f40c21e494e0f29161437f5fbe9ba05b543d2353a1ad76f4239ac4025b476be0be864649f310f14935289fe
 mmtk_julia-f07d66aafc86af84ea988b35335acc9bbc770fa1.tar.gz/md5/38afb5db6d8c55413a4ec96aefa2ebb4
-mmtk_julia-f07d66aafc86af84ea988b35335acc9bbc770fa1.tar.gz/sha512/78525582a46a6baf8d33df7b622e55cf244439afcd7192ba55489c1bc18393d1237d2903d517c610484bf9e2a7338ad31435a9cbf70889d6bcf87c40cec829e5
\ No newline at end of file
+mmtk_julia-f07d66aafc86af84ea988b35335acc9bbc770fa1.tar.gz/sha512/78525582a46a6baf8d33df7b622e55cf244439afcd7192ba55489c1bc18393d1237d2903d517c610484bf9e2a7338ad31435a9cbf70889d6bcf87c40cec829e5
+mmtk_julia.v0.30.3+1.x86_64-linux-gnu.tar.gz/md5/631b204574da7062802dac501a4b711f
+mmtk_julia.v0.30.3+1.x86_64-linux-gnu.tar.gz/sha512/daaed59d08fc49621479ed638dea0aac0cba123986e486571447e8e21e9a098776ce2e87fbd92ddea276782fc44621f23d40fa213296b28e1d4480553c7de4f7
diff --git a/deps/mmtk_julia.mk b/deps/mmtk_julia.mk
index 7ec55426821c3..424113fd4164c 100644
--- a/deps/mmtk_julia.mk
+++ b/deps/mmtk_julia.mk
@@ -6,6 +6,7 @@
 MMTK_MOVING := 0
 MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING=$(MMTK_MOVING)
 
+ifneq ($(USE_BINARYBUILDER_MMTK_JULIA),1)
 $(eval $(call git-external,mmtk_julia,MMTK_JULIA,,,$(BUILDDIR)))
 get-mmtk_julia: $(MMTK_JULIA_SRC_FILE)
 
@@ -70,3 +71,10 @@ $(build_prefix)/manifest/mmtk_julia: $(BUILDROOT)/usr/lib/libmmtk_julia.so
 	@echo $(UNINSTALL_mmtk_julia) > $@
 
 endif # MMTK_JULIA_DIR
+
+else
+# We are building using the BinaryBuilder version of the binding
+
+$(eval $(call bb-install,mmtk_julia,MMTK_JULIA,false))
+
+endif # USE_BINARYBUILDER_MMTK_JULIA
diff --git a/deps/mmtk_julia.version b/deps/mmtk_julia.version
index 4d821bffd5b9b..cb1e8064f9825 100644
--- a/deps/mmtk_julia.version
+++ b/deps/mmtk_julia.version
@@ -2,3 +2,5 @@ MMTK_JULIA_BRANCH = master
 MMTK_JULIA_SHA1 = f07d66aafc86af84ea988b35335acc9bbc770fa1
 MMTK_JULIA_GIT_URL := https://github.com/mmtk/mmtk-julia.git
 MMTK_JULIA_TAR_URL = https://github.com/mmtk/mmtk-julia/archive/refs/tags/v0.30.3.tar.gz
+MMTK_JULIA_JLL_VER := 0.30.3+1
+MMTK_JULIA_JLL_NAME := mmtk_julia