hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

root: apply 6.26 COMPILE_DEFINITIONS patch unconditionally (#32472)

Browse source 
This bug isn't per-se tied to the root7 variant and should
be applied always for these ROOT releases
This commit is contained in:
Graeme A Stewart 2022-09-01 17:57:50 +02:00 committed by GitHub
parent 3d67c58436
commit 92b72f186e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
var/spack/repos/builtin/packages/root/package.py
View file

@ -82,11 +82,12 @@ class Root(CMakePackage):
# 6.16.00 fails to handle particular build option combinations, _cf_ # 6.16.00 fails to handle particular build option combinations, _cf_
# https://github.com/root-project/ROOT/commit/e0ae0483985d90a71a6cabd10d3622dfd1c15611. # https://github.com/root-project/ROOT/commit/e0ae0483985d90a71a6cabd10d3622dfd1c15611.
patch("root7-webgui.patch", level=1, when="@6.16.00") 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( patch(
"https://github.com/root-project/root/pull/11111.patch?full_index=1", "https://github.com/root-project/root/pull/11111.patch?full_index=1",
sha256="3115be912bd948979c9c2a3d89ffe6437fe17bd3b81396958c6cb6f51f64ae62", 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 # 6.26.00:6.26.06 fails for recent nlohmann-json single headers versions
patch( patch(