diff options
| author | Graeme A Stewart <graeme.andrew.stewart@cern.ch> | 2022-09-01 17:57:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-01 17:57:50 +0200 |
| commit | 92b72f186e3e7e53e133f41c783739cb26bc7e7c (patch) | |
| tree | 9659d06e1676f042066529336cbb945f191a4916 | |
| parent | 3d67c58436dec278abf0e0312d7aba1a83cdc343 (diff) | |
| download | spack-92b72f186e3e7e53e133f41c783739cb26bc7e7c.tar.gz spack-92b72f186e3e7e53e133f41c783739cb26bc7e7c.tar.bz2 spack-92b72f186e3e7e53e133f41c783739cb26bc7e7c.tar.xz spack-92b72f186e3e7e53e133f41c783739cb26bc7e7c.zip | |
root: apply 6.26 COMPILE_DEFINITIONS patch unconditionally (#32472)
This bug isn't per-se tied to the root7 variant and should
be applied always for these ROOT releases
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 2b4cdcfd10..3900dad876 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -82,11 +82,12 @@ class Root(CMakePackage): # 6.16.00 fails to handle particular build option combinations, _cf_ # https://github.com/root-project/ROOT/commit/e0ae0483985d90a71a6cabd10d3622dfd1c15611. patch("root7-webgui.patch", level=1, when="@6.16.00") - # 6.26.00:6.26.06 fails for recent libc versions when ROOT7 is enabled + # 6.26.00:6.26.06 can fail with empty string COMPILE_DEFINITIONS, which this patch + # protects against patch( "https://github.com/root-project/root/pull/11111.patch?full_index=1", sha256="3115be912bd948979c9c2a3d89ffe6437fe17bd3b81396958c6cb6f51f64ae62", - when="@6.26:6.26.06 +root7", + when="@6.26:6.26.06", ) # 6.26.00:6.26.06 fails for recent nlohmann-json single headers versions patch( |