From 5fb612e7a9ed8f3fd164dbc5dc9979269ee4b8df Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 12 Aug 2023 14:09:44 +0000
Subject: [PATCH] feat: dd4hep-1.26
---
containers/jug/setup_detectors.py | 2 +-
eic-spack.sh | 2 +-
spack-environment/packages.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/containers/jug/setup_detectors.py b/containers/jug/setup_detectors.py
index f7ba8717b..ee0399f3b 100755
--- a/containers/jug/setup_detectors.py
+++ b/containers/jug/setup_detectors.py
@@ -105,7 +105,7 @@ if __name__ == '__main__':
subprocess.check_call(' '.join(cmd), shell=True)
## build
cxxflags = ''
- if os.environ['CXXFLAGS']:
+ if 'CXXFLAGS' in os.environ:
cxxflags = os.environ['CXXFLAGS']
if cfg.get('cxxflags'):
cxxflags = cfg['cxxflags']
diff --git a/eic-spack.sh b/eic-spack.sh
index d0f164b3c..18b1c2cc5 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack"
## EIC spack github version, e.g. v0.19.7 or commit hash
## note: nightly builds will use e.g. releases/v0.19
-EICSPACK_VERSION="v0.20.12"
+EICSPACK_VERSION="dd4hep-1.26"
## Space-separated list of eic-spack cherry-picks
read -r -d '' EICSPACK_CHERRYPICKS <<- \
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 97eaeffbd..3e9daec21 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -68,7 +68,7 @@ packages:
- '@1_54a'
dd4hep:
require:
- - '@1.25.1'
+ - '@1.26'
- +ddg4 +ddcad +hepmc3 +lcio +xercesc
dpmjet:
require:
--
GitLab