Skip to content

Commit 1262bf8

Browse files
authored
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 JuliaPackaging/Yggdrasil#10288 gets merged.~
1 parent 11c692e commit 1262bf8

File tree

5 files changed

+18
-2
lines changed

5 files changed

+18
-2
lines changed

Make.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@ CSL_NEXT_GLIBCXX_VERSION=GLIBCXX_3\.4\.34|GLIBCXX_3\.5\.|GLIBCXX_4\.
14021402
# Note: we explicitly _do not_ define `CSL` here, since it requires some more
14031403
# advanced techniques to decide whether it should be installed from a BB source
14041404
# or not. See `deps/csl.mk` for more detail.
1405-
BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE OPENLIBM GMP OPENSSL LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT BOLT
1405+
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
14061406
define SET_BB_DEFAULT
14071407
# First, check to see if BB is disabled on a global setting
14081408
ifeq ($$(USE_BINARYBUILDER),0)

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,10 @@ endif
281281
endif
282282
endif
283283

284+
ifneq (${MMTK_PLAN},None)
285+
JL_PRIVATE_LIBS-0 += libmmtk_julia
286+
endif
287+
284288
# Note that we disable MSYS2's path munging here, as otherwise
285289
# it replaces our `:`-separated list as a `;`-separated one.
286290
define stringreplace

deps/checksums/mmtk_julia

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
mmtk_julia-b69acf5af7a7dd97c1cc6fd99f7c2d51b477f214.tar.gz/md5/1911cf084d26c48e2ed58af3d268b4b6
22
mmtk_julia-b69acf5af7a7dd97c1cc6fd99f7c2d51b477f214.tar.gz/sha512/75beab54398989c46b62e714b242cf6705d88d220f40c21e494e0f29161437f5fbe9ba05b543d2353a1ad76f4239ac4025b476be0be864649f310f14935289fe
33
mmtk_julia-f07d66aafc86af84ea988b35335acc9bbc770fa1.tar.gz/md5/38afb5db6d8c55413a4ec96aefa2ebb4
4-
mmtk_julia-f07d66aafc86af84ea988b35335acc9bbc770fa1.tar.gz/sha512/78525582a46a6baf8d33df7b622e55cf244439afcd7192ba55489c1bc18393d1237d2903d517c610484bf9e2a7338ad31435a9cbf70889d6bcf87c40cec829e5
4+
mmtk_julia-f07d66aafc86af84ea988b35335acc9bbc770fa1.tar.gz/sha512/78525582a46a6baf8d33df7b622e55cf244439afcd7192ba55489c1bc18393d1237d2903d517c610484bf9e2a7338ad31435a9cbf70889d6bcf87c40cec829e5
5+
mmtk_julia.v0.30.3+1.x86_64-linux-gnu.tar.gz/md5/631b204574da7062802dac501a4b711f
6+
mmtk_julia.v0.30.3+1.x86_64-linux-gnu.tar.gz/sha512/daaed59d08fc49621479ed638dea0aac0cba123986e486571447e8e21e9a098776ce2e87fbd92ddea276782fc44621f23d40fa213296b28e1d4480553c7de4f7

deps/mmtk_julia.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
MMTK_MOVING := 0
77
MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING=$(MMTK_MOVING)
88

9+
ifneq ($(USE_BINARYBUILDER_MMTK_JULIA),1)
910
$(eval $(call git-external,mmtk_julia,MMTK_JULIA,,,$(BUILDDIR)))
1011
get-mmtk_julia: $(MMTK_JULIA_SRC_FILE)
1112

@@ -70,3 +71,10 @@ $(build_prefix)/manifest/mmtk_julia: $(BUILDROOT)/usr/lib/libmmtk_julia.so
7071
@echo $(UNINSTALL_mmtk_julia) > $@
7172

7273
endif # MMTK_JULIA_DIR
74+
75+
else
76+
# We are building using the BinaryBuilder version of the binding
77+
78+
$(eval $(call bb-install,mmtk_julia,MMTK_JULIA,false))
79+
80+
endif # USE_BINARYBUILDER_MMTK_JULIA

deps/mmtk_julia.version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ MMTK_JULIA_BRANCH = master
22
MMTK_JULIA_SHA1 = f07d66aafc86af84ea988b35335acc9bbc770fa1
33
MMTK_JULIA_GIT_URL := https://github.com/mmtk/mmtk-julia.git
44
MMTK_JULIA_TAR_URL = https://github.com/mmtk/mmtk-julia/archive/refs/tags/v0.30.3.tar.gz
5+
MMTK_JULIA_JLL_VER := 0.30.3+1
6+
MMTK_JULIA_JLL_NAME := mmtk_julia

0 commit comments

Comments
 (0)