diff options
| author | Laurent Aphecetche <laurent.aphecetche@gmail.com> | 2024-09-03 16:50:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-03 09:50:31 -0500 |
| commit | 9b077a360e73ddeadf473f99530c082d9cb83685 (patch) | |
| tree | b0e72104451bfa490b9ef31f4115e76dc57df2c9 | |
| parent | 5c297d8322590356c927eb22690ec16a2e655a02 (diff) | |
| download | spack-9b077a360e73ddeadf473f99530c082d9cb83685.tar.gz spack-9b077a360e73ddeadf473f99530c082d9cb83685.tar.bz2 spack-9b077a360e73ddeadf473f99530c082d9cb83685.tar.xz spack-9b077a360e73ddeadf473f99530c082d9cb83685.zip | |
root: fix @loader_path on macOS (#44826)
* root: fix @loader_path on macOS
* root: use loader patch from upstream
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
* add missing comma
* root: rm unused patch
* root: conflict on macos 12 for @:6.27 when +python
---------
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index ed834a4c3f..3391279bbd 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -172,6 +172,12 @@ class Root(CMakePackage): sha256="e68be5fe7b1ec873da134bd39c5c72730c4ca06d51b52eb436ae44fe81cd472d", when="@:6.30.04 +x", ) + # Fix rpath for loading cppyy + patch( + "https://github.com/root-project/root/pull/15925.diff?full_index=1", + sha256="1937290a4d54cd2e3e8a8d23d93b8dedaca9ed8dcfdcfa2f0d16629ff53fb3b7", + when="@6.28: +python", + ) # ###################### Variants ########################## # See README.md for specific notes about what ROOT configuration @@ -443,6 +449,10 @@ class Root(CMakePackage): # See https://github.com/root-project/root/issues/11128 conflicts("%clang@16:", when="@:6.26.07", msg="clang 16+ support was added in root 6.26.08") + # See https://github.com/spack/spack/pull/44826 + if sys.platform == "darwin" and macos_version() == Version("12"): + conflicts("@:6.27", when="+python", msg="macOS 12 python support for 6.28: only") + # See https://github.com/root-project/root/issues/11714 if sys.platform == "darwin" and macos_version() >= Version("13"): conflicts("@:6.26.09", msg="macOS 13 support was added in root 6.26.10") |