Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
containers
eic_container
Commits
82daebd0
Commit
82daebd0
authored
3 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
use today's master for dd4hep
parent
a875ed22
No related branches found
No related tags found
1 merge request
!111
Backported patches to DD4hep master
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
containers/jug/dev.Dockerfile
+2
-2
2 additions, 2 deletions
containers/jug/dev.Dockerfile
spack.yaml
+1
-1
1 addition, 1 deletion
spack.yaml
spack/packages/dd4hep/package.py
+2
-6
2 additions, 6 deletions
spack/packages/dd4hep/package.py
with
5 additions
and
9 deletions
containers/jug/dev.Dockerfile
+
2
−
2
View file @
82daebd0
...
@@ -82,8 +82,8 @@ RUN echo "repos:" > $SPACK_ROOT/etc/spack/repos.yaml \
...
@@ -82,8 +82,8 @@ RUN echo "repos:" > $SPACK_ROOT/etc/spack/repos.yaml \
## Optional, normally commented out:
## Optional, normally commented out:
## Nuke the buildcache
## Nuke the buildcache
RUN
--mount
=
type
=
cache,target
=
/var/cache/spack-mirror
\
#
RUN --mount=type=cache,target=/var/cache/spack-mirror \
rm
-rf
/var/cache/spack-mirror/
*
#
rm -rf /var/cache/spack-mirror/*
## This variable will change whenevery either spack.yaml or our spack package
## This variable will change whenevery either spack.yaml or our spack package
## overrides change, triggering a rebuild
## overrides change, triggering a rebuild
...
...
This diff is collapsed.
Click to expand it.
spack.yaml
+
1
−
1
View file @
82daebd0
...
@@ -24,7 +24,7 @@ spack:
...
@@ -24,7 +24,7 @@ spack:
-
cairo@1.16.0 +fc+ft+X+pdf+gobject
-
cairo@1.16.0 +fc+ft+X+pdf+gobject
-
podio@0.13.1
-
podio@0.13.1
-
geant4@10.7.1 cxxstd=17 +opengl +vecgeom +x11 +qt +threads ^qt +opengl
-
geant4@10.7.1 cxxstd=17 +opengl +vecgeom +x11 +qt +threads ^qt +opengl
-
dd4hep@
1.17.0p
1 +geant4 +assimp +hepmc3 +ipo +lcio
-
dd4hep@
2021-07-2
1 +geant4 +assimp +hepmc3 +ipo +lcio
-
acts@8.03.0p1 +dd4hep +digitization +identification +json +tgeo +ipo
-
acts@8.03.0p1 +dd4hep +digitization +identification +json +tgeo +ipo
-
genfit@2.00.00
-
genfit@2.00.00
-
gaudi@36.0
-
gaudi@36.0
...
...
This diff is collapsed.
Click to expand it.
spack/packages/dd4hep/package.py
+
2
−
6
View file @
82daebd0
...
@@ -24,7 +24,7 @@ class Dd4hep(CMakePackage):
...
@@ -24,7 +24,7 @@ class Dd4hep(CMakePackage):
tags
=
[
'
hep
'
]
tags
=
[
'
hep
'
]
version
(
'
master
'
,
branch
=
'
master
'
)
version
(
'
master
'
,
branch
=
'
master
'
)
version
(
'
1.17.0p1
'
,
sha256
=
'
036a9908aaf1e13eaf5f2f43b6f5f4a8bdda8183ddc5befa77a4448dbb485826
'
)
version
(
'
2021-07-27
'
,
commit
=
'
f2da87ba9366e5ad1a4ff0369788d61e05c62dd0
'
,
sha256
=
'
036a9908aaf1e13eaf5f2f43b6f5f4a8bdda8183ddc5befa77a4448dbb485826
'
)
version
(
'
1.17
'
,
sha256
=
'
036a9908aaf1e13eaf5f2f43b6f5f4a8bdda8183ddc5befa77a4448dbb485826
'
)
version
(
'
1.17
'
,
sha256
=
'
036a9908aaf1e13eaf5f2f43b6f5f4a8bdda8183ddc5befa77a4448dbb485826
'
)
version
(
'
1.16.1
'
,
sha256
=
'
c8b1312aa88283986f89cc008d317b3476027fd146fdb586f9f1fbbb47763f1a
'
)
version
(
'
1.16.1
'
,
sha256
=
'
c8b1312aa88283986f89cc008d317b3476027fd146fdb586f9f1fbbb47763f1a
'
)
version
(
'
1.16
'
,
sha256
=
'
ea9755cd255cf1b058e0e3cd743101ca9ca5ff79f4c60be89f9ba72b1ae5ec69
'
)
version
(
'
1.16
'
,
sha256
=
'
ea9755cd255cf1b058e0e3cd743101ca9ca5ff79f4c60be89f9ba72b1ae5ec69
'
)
...
@@ -49,11 +49,7 @@ class Dd4hep(CMakePackage):
...
@@ -49,11 +49,7 @@ class Dd4hep(CMakePackage):
# Workaround for failing build file generation in some cases
# Workaround for failing build file generation in some cases
# See https://github.com/spack/spack/issues/24232
# See https://github.com/spack/spack/issues/24232
patch
(
'
cmake_language.patch
'
,
when
=
'
@:1.17
'
)
patch
(
'
cmake_language.patch
'
,
when
=
'
@:1.17
'
)
patch
(
'
cmake_language.patch
'
,
when
=
'
@2021-07-27
'
)
# Patch to incorporate Whit's recent PRs merged into the DD4hep master
# https://github.com/AIDASoft/DD4hep/pull/849
# https://github.com/AIDASoft/DD4hep/pull/851
patch
(
'
backport.patch
'
,
when
=
'
@1.17.0p1
'
)
variant
(
'
xercesc
'
,
default
=
False
,
description
=
"
Enable
'
Detector Builders
'
based on XercesC
"
)
variant
(
'
xercesc
'
,
default
=
False
,
description
=
"
Enable
'
Detector Builders
'
based on XercesC
"
)
variant
(
'
geant4
'
,
default
=
False
,
description
=
"
Enable the simulation part based on Geant4
"
)
variant
(
'
geant4
'
,
default
=
False
,
description
=
"
Enable the simulation part based on Geant4
"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment