Skip to content

Commit beae662

Browse files
Barthelemyktfsawenzel
authored
ROOT 6.32.00 prerequisites (#5502)
* Bump JAliEn-ROOT to 0.7.12 * Update vgm.sh * Update hepmc3.sh * Update AEGIS/MCStepLogger to compile with new ROOT * Enable TPythia8 in ROOT (#5518) * Fix minuit option name in ROOT * Fix typo introduced by the pythia6 --------- Co-authored-by: Giulio Eulisse <[email protected]> Co-authored-by: Sandro Wenzel <[email protected]>
1 parent 6d4a053 commit beae662

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

aegis.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: AEGIS
22
version: "%(tag_basename)s"
3-
tag: v1.5.3
3+
tag: v1.5.3-alice2
44
requires:
55
- ROOT
66
- VMC
@@ -24,7 +24,8 @@ fi
2424
cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
2525
${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \
2626
-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
27-
-DCMAKE_SKIP_RPATH=TRUE \
27+
-DCMAKE_SKIP_RPATH=TRUE \
28+
-DPYTHIA6_DIR=${PYTHIA6_ROOT} \
2829
${SPECIALFFLAGS:+-DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch"}
2930
cmake --build . -- ${JOBS:+-j$JOBS} install
3031

hepmc3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: HepMC3
22
version: "%(tag_basename)s"
3-
tag: 3.2.5
3+
tag: 3.3.0
44
source: https://gitlab.cern.ch/hepmc/HepMC3.git
55
requires:
66
- GCC-Toolchain:(?!osx.*)

jalien-root.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: JAliEn-ROOT
22
version: "%(tag_basename)s"
3-
tag: "0.7.10"
3+
tag: "0.7.12"
44
source: https://gitlab.cern.ch/jalien/jalien-root.git
55
requires:
66
- ROOT

mcsteplogger.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: MCStepLogger
22
version: "%(tag_basename)s"
3-
tag: "v0.6.0"
3+
tag: "v0.6.1"
44
source: https://github.com/AliceO2Group/VMCStepLogger.git
55
requires:
66
- "GCC-Toolchain:(?!osx)"

root.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ requires:
2121
- protobuf
2222
- FFTW3
2323
- Vc
24+
- pythia
2425
build_requires:
2526
- CMake
2627
- "Xcode:(osx.*)"
@@ -158,9 +159,7 @@ cmake $SOURCEDIR
158159
${FFTW3_ROOT:+-DFFTW_DIR=${FFTW3_ROOT}} \
159160
-Dfftw3=ON \
160161
-Dpgsql=OFF \
161-
-Dminuit2=ON \
162-
-Dpythia6=ON \
163-
-Dpythia6_nolink=ON \
162+
-Dminuit=ON \
164163
-Dmathmore=ON \
165164
-Droofit=ON \
166165
-Dhttp=ON \
@@ -179,6 +178,7 @@ cmake $SOURCEDIR
179178
-Dtmva-gpu=OFF \
180179
-Ddavix=OFF \
181180
-Dunfold=ON \
181+
-Dpythia8=ON \
182182
${USE_BUILTIN_GLEW:+-Dbuiltin_glew=ON} \
183183
${DISABLE_MYSQL:+-Dmysql=OFF} \
184184
${ROOT_HAS_PYTHON:+-DPYTHON_PREFER_VERSION=3} \

vgm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: vgm
22
version: "%(tag_basename)s"
3-
tag: "v5-2"
3+
tag: "v5-3"
44
source: https://github.com/vmc-project/vgm
55
requires:
66
- ROOT

0 commit comments

Comments
 (0)