LCG105 changes

cgal.sh

@@ -6,7 +6,6 @@ build_requires:
   - GMP
   - MPFR
   - CMake
-  - curl
 ---
 #!/bin/bash -e
 case $ARCHITECTURE in

configuration.sh

@@ -1,6 +1,5 @@
 package: Configuration
 requires:
-  - curl
   - boost
   - "GCC-Toolchain:(?!osx)"
   - protobuf

curl.sh

@@ -1,10 +1,29 @@
 package: curl
-version: "1.0"
-system_requirement_missing: |
-  curl and its development package are missing from your system.
-   * RHEL-compatible systems: you will probably need "curl" and "curl-devel" packages.
-   * Ubuntu-compatible systems: you will probably need "curl" and "libcurl4-openssl-dev" (or "libcurl4-gnutls-dev").
-system_requirement: ".*"
-system_requirement_check: |
-  curl --version > /dev/null; if test $? = 127; then exit 1; else printf "#include <curl/curl.h>\nint main() {}\n" | cc -xc -lcurl - -o /dev/null || exit 2; fi; exit 0
+version: "7.76.1"
+tag: curl-7_76_1
+source: https://github.com/curl/curl.git
+build_requires:
+  - "OpenSSL:(?!osx)"
+  - alibuild-recipe-tools
 ---
+#!/bin/bash -e
+
+if [[ $ARCHITECTURE = osx* ]]; then
+  OPENSSL_ROOT=$(brew --prefix openssl@3)
+else
+  ${OPENSSL_ROOT:+env LDFLAGS=-Wl,-R$OPENSSL_ROOT/lib}
+fi
+rsync -a --chmod=ug=rwX  --delete --exclude="**/.git" --delete-excluded $SOURCEDIR/ .
+
+sed -i.deleteme 's/CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"/CPPFLAGS="$SSL_CPPFLAGS $CPPFLAGS"/' configure.ac
+sed -i.deleteme 's/LDFLAGS="$LDFLAGS $SSL_LDFLAGS"/LDFLAGS="$SSL_LDFLAGS $LDFLAGS"/' configure.ac
+
+./buildconf
+./configure --prefix=$INSTALLROOT --disable-ldap ${OPENSSL_ROOT:+--with-ssl=$OPENSSL_ROOT} --disable-static
+make ${JOBS:+-j$JOBS}
+make install
+
+# Modulefile
+mkdir -p etc/modulefiles
+alibuild-generate-module --bin --lib > etc/modulefiles/$PKGNAME
+mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

defaults-release.sh

@@ -19,7 +19,7 @@ overrides:
     tag: "v1.70.0"
     requires:
       - "GCC-Toolchain:(?!osx)"
-      - Python
+      - Pytho64n
     prefer_system_check: |
      printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106400)\n#error \"Cannot use system's boost. Boost > 1.64.00 required.\"\n#endif\nint main(){}" \
      | gcc -I$BOOST_ROOT/include -xc++ - -o /dev/null
@@ -31,18 +31,19 @@ overrides:
       which cc && test -f $(dirname $(which cc))/c++ && printf "#define GCCVER ((__GNUC__ << 16)+(__GNUC_MINOR__ << 8)+(__GNUC_PATCHLEVEL__))\n#if (GCCVER < 0x060000 || GCCVER > 0x100000)\n#error \"System's GCC cannot be used: we need GCC 6.X. We are going to compile our own version.\"\n#endif\n" | cc -xc++ - -c -o /dev/null
   ROOT:
     prefer_system_check: |
-      ls $ROOT_ROOT/bin > /dev/null && \
-      ls $ROOT_ROOT/cmake > /dev/null && \
-      ls $ROOT_ROOT/config > /dev/null && \
-      ls $ROOT_ROOT/etc > /dev/null && \
-      ls $ROOT_ROOT/fonts > /dev/null && \
-      ls $ROOT_ROOT/geom > /dev/null && \
-      ls $ROOT_ROOT/icons > /dev/null && \
-      ls $ROOT_ROOT/include > /dev/null && \
-      ls $ROOT_ROOT/lib > /dev/null && \
-      ls $ROOT_ROOT/macros > /dev/null && \
-      ls $ROOT_ROOT/man > /dev/null && \
-      true
+      VERSION=$(root-config --version)
+      REQUESTED_VERSION=${REQUESTED_VERSION#v}
+      REQUESTED_VERSION=${REQUESTED_VERSION//-/.}
+      if [ "$(printf '%s\n' "$REQUESTED_VERSION" "VERSION" | sort -V | head -n1)" = "$REQUESTED_VERSION" ]; then
+          echo "ROOT version $VERSION sufficient"
+      else
+          echo "ROOT version $VERSION insufficient"
+          exit 1
+      fi
+      FEATURES="builtin_pcre mathmore xml ssl opengl http gdml roofit  vdt xrootd pythia6"
+      for FEATURE in $FEATURES; do
+          root-config --has-$FEATURE | grep -q yes || { echo "$FEATURE missing"; exit 1; }
+      done
   GSL:
     version: "v1.16%(defaults_upper)s"
     source: https://github.com/alisw/gsl
@@ -64,17 +65,17 @@ overrides:
       ls $FAIRROOT_ROOT/ > /dev/null && \
       ls $FAIRROOT_ROOT/lib > /dev/null && \
       ls $FAIRROOT_ROOT/include > /dev/null && \
-      grep v18.6.10 $FAIRROOT_ROOT/include/FairVersion.h
+      grep v19.0.0 $FAIRROOT_ROOT/include/FairVersion.h
   FairMQ:
     version: "%(tag_basename)s"
-    tag: "v1.4.38"
+    tag: "v1.10.0"
     prefer_system_check: |
       ls $FAIRMQ_ROOT/ > /dev/null && \
       ls $FAIRMQ_ROOT/lib > /dev/null && \
       ls $FAIRMQ_ROOT/include > /dev/null && \
   FairLogger:
     version: "%(tag_basename)s"
-    tag: "v1.9.0"
+    tag: "v2.2.0"
     prefer_system_check: |
       ls $FAIRLOGGER_ROOT/ > /dev/null && \
       ls $FAIRLOGGER_ROOT/lib > /dev/null && \
@@ -85,14 +86,20 @@ overrides:
     tag: v10.7.3
     source: https://github.com/geant4/geant4.git
     prefer_system_check: |
-      ls $GEANT4_ROOT/bin > /dev/null && \
-      ls $GEANT4_ROOT/bin/geant4-config > /dev/null && \
-      ls $GEANT4_ROOT/bin/geant4.csh > /dev/null && \
-      ls $GEANT4_ROOT/bin/geant4.sh > /dev/null && \
-      ls $GEANT4_ROOT/include > /dev/null && \
-      ls $GEANT4_ROOT/include/Geant4 > /dev/null && \
-      ls $GEANT4_ROOT/lib/ > /dev/null && \
-      true
+      VERSION=$(geant4-config --version)
+      REQUESTED_VERSION=${REQUESTED_VERSION#v}
+      verlte() {
+          printf '%s\n' "$1" "$2" | sort -C -V
+      }
+      verlt() {
+          ! verlte "$2" "$1"
+      }
+      if ! verlt $VERSION $REQUESTED_VERSION; then
+        echo "GEANT4 version $VERSION sufficient"
+      else
+        echo "GEANT4 version $VERSION insufficient"
+        exit 1
+      fi
     requires:
       - "GCC-Toolchain:(?!osx)"
       - opengl
@@ -114,7 +121,7 @@ overrides:
      G4SAIDXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT  '*data*G4SAIDDATA*'`"
   GEANT4_VMC:
     version: "%(tag_basename)s"
-    tag: v5-4
+    tag: v6-6-p3
     prefer_system_check: |
       ls $GEANT4_VMC_ROOT/bin > /dev/null && \
       ls $GEANT4_VMC_ROOT/lib/libg4root.so > /dev/null && \
@@ -126,7 +133,7 @@ overrides:
       true
   VMC:
     version: "%(tag_basename)s"
-    tag: v1-1-p1
+    tag: v2-0
     prefer_system_check: |
       ls $VMC_ROOT/include > /dev/null && \
       true
@@ -149,10 +156,19 @@ overrides:
   apfel:
     tag: 3.0.6
     prefer_system_check: |
-      ls $APFEL_ROOT/bin > /dev/null && \
-      ls $APFEL_ROOT/lib > /dev/null && \
-      ls $APFEL_ROOT/include > /dev/null && \
-      true
+      VERSION=$(apfel-config --version)
+      verlte() {
+          printf '%s\n' "$1" "$2" | sort -C -V
+      }
+      verlt() {
+          ! verlte "$2" "$1"
+      }
+      if ! verlt $VERSION $REQUESTED_VERSION; then
+        echo "apfel version $VERSION sufficient"
+      else
+        echo "apfel version $VERSION insufficient"
+        exit 1
+      fi
   pythia:
     version: "%(tag_basename)s"
     source: https://github.com/ShipSoft/pythia8
@@ -162,27 +178,34 @@ overrides:
       - HepMC
       - boost
     prefer_system_check: |
-      ls $PYTHIA_ROOT/bin > /dev/null && \
-      ls $PYTHIA_ROOT/bin/pythia8-config > /dev/null && \
-      ls $PYTHIA_ROOT/include/ > /dev/null && \
-      ls $PYTHIA_ROOT/include/Pythia8 > /dev/null && \
-      ls $PYTHIA_ROOT/include/Pythia8Plugins > /dev/null && \
-      ls $PYTHIA_ROOT/lib/libpythia8.a > /dev/null && \
-      ls $PYTHIA_ROOT/lib/libpythia8lhapdf6.so > /dev/null && \
-      ls $PYTHIA_ROOT/lib/libpythia8.so > /dev/null && \
-      true
+      VERSION=$(pythia8-config --version)
+      REQUESTED_VERSION=${REQUESTED_VERSION#v}
+      VERSION=${VERSION//.}
+      verlte() {
+          printf '%s\n' "$1" "$2" | sort -C -V
+      }
+      verlt() {
+          ! verlte "$2" "$1"
+      }
+      if ! verlt $VERSION $REQUESTED_VERSION; then
+        echo "pythia8 version $VERSION sufficient"
+      else
+        echo "pythia8 version $VERSION insufficient"
+        exit 1
+      fi
+      pythia8-config --with-lhapdf6 || { echo "lhapdf6 support missing."; exit 1; }
   vgm:
     version: "%(tag_basename)s"
     tag: "4.4"
   evtGen:
     version: "%(tag_basename)s"
-    source: https://github.com/ShipSoft/evtgen
-    tag: R01-06-00-ship
+    source:  https://github.com/alisw/EVTGEN # https://github.com/ShipSoft/evtgen
+    tag: R02-02-00-alice2
     prefer_system_check: |
       ls $EVTGEN_ROOT/include > /dev/null && \
-      ls $EVTGEN_ROOT/lib > /dev/null && \
-      ls $EVTGEN_ROOT/lib/libEvtGenExternal.so > /dev/null && \
-      ls $EVTGEN_ROOT/lib/libEvtGen.so > /dev/null && \
+      ls $EVTGEN_ROOT/lib64 > /dev/null && \
+      ls $EVTGEN_ROOT/lib64/libEvtGenExternal.so > /dev/null && \
+      ls $EVTGEN_ROOT/lib64/libEvtGen.so > /dev/null && \
       ls $EVTGEN_ROOT/include/EvtGen > /dev/null && \
       ls $EVTGEN_ROOT/include/EvtGenBase > /dev/null && \
       ls $EVTGEN_ROOT/include/EvtGenExternal > /dev/null && \
@@ -194,12 +217,12 @@ overrides:
       ls $PHOTOSPP_ROOT/lib > /dev/null && \
       ls $PHOTOSPP_ROOT/lib/libPhotospp.a > /dev/null && \
       ls $PHOTOSPP_ROOT/lib/libPhotosppHEPEVT.so > /dev/null && \
-      ls $PHOTOSPP_ROOT/lib/libPhotosppHepMC.so > /dev/null && \
+      ls $PHOTOSPP_ROOT/lib/libPhotosppHepMC3.so > /dev/null && \
       ls $PHOTOSPP_ROOT/lib/libPhotospp.so > /dev/null
   Tauolapp:
     version: "%(tag_basename)s"
     source: https://github.com/ShipSoft/Tauolapp
-    tag: v1.1.5-ship
+    tag: 1.1.8.atlas1
     prefer_system_check: |
       ls "$TAUOLAPP_ROOT"/lib > /dev/null && \
       ls "$TAUOLAPP_ROOT"/etc > /dev/null && \
@@ -226,12 +249,20 @@ overrides:
       grep "2.06" $HEPMC_ROOT/include/HepMC/HepMCDefs.h > /dev/null
   lhapdf:
     prefer_system_check: |
-      ls $LHAPDF_ROOT/ > /dev/null && \
-      ls $LHAPDF_ROOT/bin > /dev/null && \
-      ls $LHAPDF_ROOT/include > /dev/null && \
-      ls $LHAPDF_ROOT/include/LHAPDF > /dev/null && \
-      ls $LHAPDF_ROOT/lib > /dev/null && \
-      ls $LHAPDF_ROOT/share/LHAPDF > /dev/null
+      VERSION=$(lhapdf-config --version)
+      REQUESTED_VERSION=${REQUESTED_VERSION#lhapdf-}
+      verlte() {
+          printf '%s\n' "$1" "$2" | sort -C -V
+      }
+      verlt() {
+          ! verlte "$2" "$1"
+      }
+      if ! verlt $VERSION $REQUESTED_VERSION; then
+        echo "lhapdf version $VERSION sufficient"
+      else
+        echo "lhapdf version $VERSION insufficient"
+        exit 1
+      fi
   lhapdf5:
     prefer_system_check: |
       ls $LHAPDF5_ROOT/ > /dev/null && \
@@ -263,26 +294,36 @@ overrides:
       ls $VGM_ROOT/lib/libXmlVGM.a > /dev/null
   XercesC:
     prefer_system_check: |
-      ls $XERCESC_ROOT/ > /dev/null && \
-      ls $XERCESC_ROOT/bin > /dev/null && \
-      ls $XERCESC_ROOT/include > /dev/null && \
-      ls $XERCESC_ROOT/include/xercesc/ > /dev/null && \
-      ls $XERCESC_ROOT/lib > /dev/null && \
-      ls $XERCESC_ROOT/lib/libxerces-c-3.1.so > /dev/null && \
-      ls $XERCESC_ROOT/lib/libxerces-c.a > /dev/null && \
-      ls $XERCESC_ROOT/lib/libxerces-c.la > /dev/null && \
-      ls $XERCESC_ROOT/lib/libxerces-c.so > /dev/null
+      VERSION=$(pkg-config xerces-c --modversion)
+      REQUESTED_VERSION=${REQUESTED_VERSION#v}
+      verlte() {
+          printf '%s\n' "$1" "$2" | sort -C -V
+      }
+      verlt() {
+          ! verlte "$2" "$1"
+      }
+      if ! verlt $VERSION $REQUESTED_VERSION; then
+        echo "xerces-c version $VERSION sufficient"
+      else
+        echo "xerces-c version $VERSION insufficient"
+        exit 1
+      fi
   googletest:
     prefer_system_check: |
-      ls $GOOGLETEST_ROOT/ > /dev/null && \
-      ls $GOOGLETEST_ROOT/include > /dev/null && \
-      ls $GOOGLETEST_ROOT/include/gmock > /dev/null && \
-      ls $GOOGLETEST_ROOT/include/gtest > /dev/null && \
-      ls $GOOGLETEST_ROOT/lib/libgmock.a > /dev/null && \
-      ls $GOOGLETEST_ROOT/lib/libgmock_main.a > /dev/null && \
-      ls $GOOGLETEST_ROOT/lib/libgtest.a > /dev/null && \
-      ls $GOOGLETEST_ROOT/lib/libgtest_main.a > /dev/null && \
-      true
+      VERSION=$(pkg-config gtest --modversion)
+      REQUESTED_VERSION=${REQUESTED_VERSION#v}
+      verlte() {
+          printf '%s\n' "$1" "$2" | sort -C -V
+      }
+      verlt() {
+          ! verlte "$2" "$1"
+      }
+      if ! verlt $VERSION $REQUESTED_VERSION; then
+        echo "googletest version $VERSION sufficient"
+      else
+        echo "googletest version $VERSION insufficient"
+        exit 1
+      fi
 ---
 # This file is included in any build recipe and it's only used to set
 # environment variables. Which file to actually include can be defined by the

dim.sh

@@ -1,7 +1,6 @@
 package: dim
 version: "v20r20"
 build_requires:
-  - curl
   - "GCC-Toolchain:(?!osx)"
   - motif
 ---

evtgen.sh

@@ -1,7 +1,7 @@
 package: EvtGen
 version: "%(tag_basename)s-ship%(defaults_upper)s"
-source: https://github.com/ShipSoft/evtgen
-tag: fairshipdev
+source: https://github.com/alisw/EVTGEN/ # https://github.com/ShipSoft/evtgen
+tag: R02-02-00-alice2
 requires:
   - HepMC
   - pythia
@@ -16,10 +16,17 @@ export  HEPMCLOCATION="$HEPMC_ROOT"
 
 rsync -a $SOURCEDIR/* .
 
-./configure --hepmcdir=$HEPMC_ROOT --pythiadir=$PYTHIA_ROOT --tauoladir=$TAUOLAPP_ROOT --photosdir=$PHOTOSPP_ROOT --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" 
-
-make 
-make install
+cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
+      -DCMAKE_INSTALL_LIBDIR=lib \
+      -DEVTGEN_HEPMC3=OFF \
+      -DHEPMC2_ROOT_DIR=$HEPMC_ROOT \
+      -DEVTGEN_PYTHIA=ON \
+      -DPYTHIA8_ROOT_DIR=$PYTHIA_ROOT \
+      -DEVTGEN_PHOTOS=ON \
+      -DPHOTOSPP_ROOT_DIR=$PHOTOS_ROOT \
+      -DEVTGEN_TAUOLA=ON \
+      -DTAUOLAPP_ROOT_DIR=$TAUOLA_ROOT
+make ${JOBS:+-j$JOBS} install
 
 # Modulefile
 MODULEDIR="$INSTALLROOT/etc/modulefiles"

fairlogger.sh

@@ -1,6 +1,6 @@
 package: FairLogger
 version: "%(tag_basename)s"
-tag: v1.9.0
+tag: v2.2.0
 source: https://github.com/FairRootGroup/FairLogger
 requires:
  - fmt

fairmq.sh

@@ -1,6 +1,6 @@
 package: FairMQ
 version: "%(tag_basename)s"
-tag: v1.4.49
+tag: v1.10.0
 source: https://github.com/FairRootGroup/FairMQ
 requires:
  - boost
@@ -31,7 +31,7 @@ case $ARCHITECTURE in
   ;;
   *)
     BUILD_OFI=ON
-    if [[ $(printf '%s\n' "1.4.2" "${PKGVERSION:1}" | sort -V | head -n1) != "1.4.2" ]]; then
+    if [[ $(printf '%s\n' "1.10.0" "${PKGVERSION:1}" | sort -V | head -n1) != "1.10.0" ]]; then
       BUILD_OFI=OFF
     fi
   ;;