Merge e58d93c into sapling-pr-archive-ktf

.github/workflows/clean-pr-checks.yml

@@ -22,10 +22,6 @@ name: Clean PR checks
         description: build/AliRoot/alidist
         type: boolean
         default: true
-      'check_build/O2/alidist':
-        description: build/O2/alidist
-        type: boolean
-        default: true
       'check_build/O2/alidist-cs8':
         description: build/O2/alidist-cs8
         type: boolean

aligeno2.sh

@@ -0,0 +1,23 @@
+package: AliGenO2
+version: "v%(year)s%(month)s%(day)s"
+requires:
+  - DPMJET
+  - POWHEG
+  - pythia
+  - SHERPA
+  - ThePEG
+  - Rivet
+  - lhapdf-pdfsets
+  - JETSCAPE
+  - CRMC
+  - EPOS4
+  - STARlight
+build_requires:
+  - alibuild-recipe-tools
+---
+#!/bin/bash -ex
+
+# Modulefile
+moduledir="$INSTALLROOT/etc/modulefiles"
+mkdir -p "$moduledir"
+alibuild-generate-module > "$moduledir/$PKGNAME"

coconut.sh

@@ -1,6 +1,6 @@
 package: coconut
 version: "%(tag_basename)s"
-tag: "v1.18.0"
+tag: "v1.19.1"
 build_requires:
   - golang
   - protobuf

control-core.sh

@@ -1,6 +1,6 @@
 package: Control-Core
 version: "%(tag_basename)s"
-tag: "v1.18.0"
+tag: "v1.19.1"
 build_requires:
   - "GCC-Toolchain:(?!osx)"
   - golang

control-occplugin.sh

@@ -1,6 +1,6 @@
 package: Control-OCCPlugin
 version: "%(tag_basename)s"
-tag: "v1.18.0"
+tag: "v1.19.1"
 requires:
   - FairMQ
   - FairLogger

control.sh

@@ -1,5 +1,5 @@
 package: Control
-version: "v1.18.0"
+version: "v1.19.1"
 requires:
   - Control-Core
   - Control-OCCPlugin

defaults-ali.sh

@@ -26,9 +26,6 @@ overrides:
       - JAliEn-ROOT
   vgm:
     tag: "v5-2"
-  GCC-Toolchain:
-    version: v12.2.0-alice1
-    tag: v12.2.0-alice1
   cgal:
     version: 4.12.2
   fastjet:

defaults-generators.sh

@@ -7,9 +7,6 @@ env:
   CMAKE_BUILD_TYPE: RELWITHDEBINFO
   CXXFLAGS: -fPIC -g -O2 -std=c++17
 overrides:
-  GCC-Toolchain:
-    version: v12.2.0-alice1
-    tag: v12.2.0-alice1
   boost:
     requires:
       - GCC-Toolchain:(?!osx)

defaults-o2-dataflow.sh

@@ -35,9 +35,6 @@ disable:
   - OpenSSL
   - curl:(?!osx.*)
 overrides:
-  GCC-Toolchain:
-    version: "v12.2.0-alice1"
-    tag: "v12.2.0-alice1"
   O2-customization:
     env:
       ENABLE_UPGRADES: "OFF"  # Disable detector upgrades in O2

epos4.sh

@@ -1,6 +1,6 @@
 package: EPOS4
 version: "%(tag_basename)s"
-tag: "v4.0.0-alice3"
+tag: "v4.0.0-alice4"
 source: https://github.com/alisw/EPOS4.git
 requires:
   - ROOT

moderncppkafka.sh

@@ -7,13 +7,16 @@ source: https://github.com/morganstanley/modern-cpp-kafka.git
 ---
 #!/bin/bash -e                                                                                                                                                                                           
 
-# this is header only library, so we can just copy it                                                                                                                                                    
+# this is header only library, so we can just copy it
 mkdir -p "$INSTALLROOT"
 cp -r "$SOURCEDIR/include" "$INSTALLROOT/include"
 rm "$INSTALLROOT/include/CMakeLists.txt" # for some reason it is there                                                                                                                                   
 
-# Modulefile                                                                                                                                                                                             
+# Modulefile
 mkdir -p "etc/modulefiles"
 alibuild-generate-module --lib > "etc/modulefiles/$PKGNAME"
 mkdir -p "$INSTALLROOT/etc/modulefiles" && rsync -a --delete etc/modulefiles/ "$INSTALLROOT/etc/modulefiles"
-
+# Our environment
+cat >> etc/modulefiles/$PKGNAME <<EoF
+setenv MODERNCPPKAFKA_ROOT \$PKG_ROOT
+EoF

o2.sh

@@ -1,6 +1,6 @@
 package: O2
 version: "%(tag_basename)s"
-tag: "daily-20240917-0840"
+tag: "daily-20240924-0200"
 requires:
   - abseil
   - arrow

o2dpg.sh

@@ -1,6 +1,6 @@
 package: O2DPG
 version: "%(tag_basename)s"
-tag: "daily-20240917-0840"
+tag: "daily-20240924-0200"
 source: https://github.com/AliceO2Group/O2DPG.git
 build_requires:
   - alibuild-recipe-tools

o2pdpsuite.sh

@@ -1,6 +1,6 @@
 package: O2PDPSuite
 version: "%(tag_basename)s"
-tag: "daily-20240917-0840"
+tag: "daily-20240924-0200"
 requires:
   # List important packages separately, even though they're also
   # pulled in by O2sim, so they show up in the dependency list on Monalisa.

o2physics.sh

@@ -1,6 +1,6 @@
 package: O2Physics
 version: "%(tag_basename)s"
-tag: "daily-20240917-0840"
+tag: "daily-20240924-0200"
 requires:
   - O2
   - ONNXRuntime

o2sim.sh

@@ -5,6 +5,7 @@ requires:
   - O2DPG
   - QualityControl
   - AEGIS
+  - AliGenO2:(?!osx|.*aarch64)
   - EVTGEN:(?!osx)
   - STARlight:(?!osx)
   - jq

python.sh

@@ -61,11 +61,16 @@ SSL=$OPENSSL_ROOT
 _ssl _ssl.c \
         -DUSE_SSL -I\$(SSL)/include -I\$(SSL)/include/openssl \
         -L\$(SSL)/lib -lssl -lcrypto
-EOF
 
+# Get rid of the dependency on libcrypt (which is going away in any case in python 3.13)
+_crypt _cryptmodule.c # -lcrypt        # crypt(3); needs -lcrypt on some systems
+
+*disabled*
+_crypt
+EOF
 fi
 
-./configure --prefix="$INSTALLROOT"  \
+LIBCRYPT_CFLAGS=-lunknown ac_cv_search_crypt=no ac_cv_search_crypt_r=no ./configure --prefix="$INSTALLROOT"  \
             ${OPENSSL_ROOT:+--with-openssl=$OPENSSL_ROOT} ${OPENSSL_ROOT:+--with-openssl-rpath=no} \
             --enable-shared          \
             --with-system-expat      \

qualitycontrol.sh

@@ -1,6 +1,6 @@
 package: QualityControl
 version: "%(tag_basename)s"
-tag: v1.158.2
+tag: v1.159.1
 requires:
   - boost
   - "GCC-Toolchain:(?!osx)"