diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2022-03-28 10:34:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 02:34:27 -0600 |
| commit | 3f41f8d093356cd70f7946d1e2a809f8403c0587 (patch) | |
| tree | a3c1d2c432ad4c5810a3a26263b889b1529635da | |
| parent | 1ac7f2b02b42967ffcfa2dcf3bcc831aa6fe970d (diff) | |
| download | spack-3f41f8d093356cd70f7946d1e2a809f8403c0587.tar.gz spack-3f41f8d093356cd70f7946d1e2a809f8403c0587.tar.bz2 spack-3f41f8d093356cd70f7946d1e2a809f8403c0587.tar.xz spack-3f41f8d093356cd70f7946d1e2a809f8403c0587.zip | |
julia: add patch reverting llvm rpath changes (#29731)
| -rw-r--r-- | var/spack/repos/builtin/packages/julia/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/julia/revert-fix-rpath-of-libllvm.patch | 31 |
2 files changed, 35 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index 72fc0423f7..b8bda7e535 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -125,6 +125,10 @@ class Julia(MakefilePackage): # Fix gfortran abi detection https://github.com/JuliaLang/julia/pull/44026 patch('fix-gfortran.patch', when='@1.7.0:1.7.2') + # Don't make julia run patchelf --set-rpath on llvm (presumably this should've + # only applied to libllvm when it's vendored by julia). + patch('revert-fix-rpath-of-libllvm.patch', when='@1.7.0:1.7') + def patch(self): # The system-libwhich-libblastrampoline.patch causes a rebuild of docs as it # touches the main Makefile, so we reset the a/m-time to doc/_build's. diff --git a/var/spack/repos/builtin/packages/julia/revert-fix-rpath-of-libllvm.patch b/var/spack/repos/builtin/packages/julia/revert-fix-rpath-of-libllvm.patch new file mode 100644 index 0000000000..5920bfff11 --- /dev/null +++ b/var/spack/repos/builtin/packages/julia/revert-fix-rpath-of-libllvm.patch @@ -0,0 +1,31 @@ +From 34b177cef31f8e6cd9e5251f7b0a8ea07a0fa328 Mon Sep 17 00:00:00 2001 +From: Harmen Stoppels <harmenstoppels@gmail.com> +Date: Sat, 26 Mar 2022 10:51:55 +0100 +Subject: [PATCH] Revert "Merge pull request #42788 from + JuliaLang/vc/freebsd_fix" + +This reverts commit 57f6f27e07258c8dccd06b405259ebfe448c16e7, reversing +changes made to 13310eb4f0e40b8b2e7d77749fbf262f8029cf0f. +--- + Makefile | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/Makefile b/Makefile +index ec308a74f6..7cbb77ea06 100644 +--- a/Makefile ++++ b/Makefile +@@ -369,11 +369,6 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1) + endif + endif + +- # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD +-ifneq (,$(findstring $(OS),Linux FreeBSD)) +- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT) +-endif +- + + ifneq ($(LOADER_BUILD_DEP_LIBS),$(LOADER_INSTALL_DEP_LIBS)) + # Next, overwrite relative path to libjulia-internal in our loader if $$(LOADER_BUILD_DEP_LIBS) != $$(LOADER_INSTALL_DEP_LIBS) +-- +2.25.1 + |