Support for LCG109

alibuild-recipe-tools.sh

@@ -2,6 +2,8 @@ package: alibuild-recipe-tools
 version: "0.2.5"
 tag: "v0.2.5"
 source: https://github.com/alisw/alibuild-recipe-tools
+prefer_system_check: |
+  which alibuild-generate-module
 ---
 mkdir -p $INSTALLROOT/bin
 install $SOURCEDIR/alibuild-generate-module $INSTALLROOT/bin

alibuild.sh

@@ -1,6 +1,6 @@
 package: alibuild
 version: "%(tag_basename)s"
-tag: "v1.9.9"
+tag: "v1.17.41"
 source: https://github.com/alisw/alibuild
 requires:
   - "Python:(slc|ubuntu)"
@@ -32,7 +32,7 @@ ln -snf "python$pyver" "$INSTALLROOT/lib/python"
 
 # Move scripts installed into the target to the bin directory
 mkdir -p "$INSTALLROOT/bin"
-mv "$TARGET/../../../bin"/* "$INSTALLROOT/bin/"
+mv "$TARGET/bin"/* "$INSTALLROOT/bin/"
 
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"

apfel.sh

@@ -10,10 +10,8 @@ env:
   LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$APFEL_ROOT/lib"
 prefer_system_check: |
   #!/bin/bash -e
-  ls $APFEL_ROOT/bin > /dev/null && \
-  ls $APFEL_ROOT/lib > /dev/null && \
-  ls $APFEL_ROOT/include > /dev/null && \
-  true
+  apfel-config --version > /dev/null
+  printf '#include "APFEL/APFEL.h"\nint main(){}' | c++ -xc++ - -c -o /dev/null
 ---
 #!/bin/bash -ex
 

eigen3.sh

@@ -6,7 +6,16 @@
   - CMake
   - alibuild-recipe-tools
 prefer_system_check: |
-  ls $EIGEN3_ROOT/include/eigen3/Eigen/Dense
+  #!/bin/bash -e
+  if [ -z "$EIGEN3_ROOT" ]; then
+    for d in $(echo "$CMAKE_PREFIX_PATH" | tr : '\n'); do
+      if [ -d "$d/include/eigen3/Eigen" ]; then
+        export EIGEN3_ROOT="$d"
+        break
+      fi
+    done
+  fi
+  printf "#include <Eigen/Core>\nint main(){}" | c++ -xc++ - -c -o /dev/null -I${EIGEN3_ROOT:+$EIGEN3_ROOT/include/eigen3}
 ---
 #!/bin/bash -e
 MODULEDIR="$INSTALLROOT/etc/modulefiles"

evtgen.sh

@@ -10,10 +10,17 @@
 env:
   EVTGENDATA: "$EVTGEN_ROOT/share/EvtGen"
 prefer_system_check: |
-    if [ ! -z "$EVTGEN_VERSION" ]; then
-        exit 0
-    fi
-    exit 1
+  if [ -z "$EVTGEN_ROOT" ]; then
+    for d in $(echo "$CMAKE_PREFIX_PATH" | tr : '\n'); do
+      if [ -d "$d/include/EvtGen" ]; then
+        export EVTGEN_ROOT="$d"
+        break
+      fi
+    done
+  fi
+  ls "$EVTGEN_ROOT"/include/EvtGen > /dev/null && \
+  (ls "$EVTGEN_ROOT"/lib/libEvtGen.so > /dev/null 2>&1 || \
+   ls "$EVTGEN_ROOT"/lib64/libEvtGen.so > /dev/null)
 ---
 #!/bin/sh
 
@@ -47,7 +54,7 @@
 set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
 module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
 # Dependencies
-module load BASE/1.0 pythia/$PYTHIA_VERSION-$PYTHIA_REVISION ${HEPMC3_VERSION:+HepMC3/$HEPMC3_VERSION-$HEPMC3_REVISION} ${TAUOLAPP_VERSION:+Tauolapp/$TAUOLAPP_VERSION-$TAUOLAPP_REVISION} ${PHOTOSPP_VERSION:+PHOTOSPP/$PHOTOSPP_VERSION-$PHOTOSPP_REVISION}
+module load BASE/1.0 ${PYTHIA_REVISION:+pythia/$PYTHIA_VERSION-$PYTHIA_REVISION} ${HEPMC3_REVISION:+HepMC3/$HEPMC3_VERSION-$HEPMC3_REVISION} ${TAUOLAPP_REVISION:+Tauolapp/$TAUOLAPP_VERSION-$TAUOLAPP_REVISION} ${PHOTOSPP_REVISION:+PHOTOSPP/$PHOTOSPP_VERSION-$PHOTOSPP_REVISION}
 # Our environment
 setenv EVTGEN_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 setenv EVTGENDATA \$::env(EVTGEN_ROOT)/share/EvtGen

fairroot.sh

@@ -38,6 +38,24 @@ prepend_path:
 # maximum safety.
 unset SIMPATH
 
+# Ensure the GCC runtime library is in LD_LIBRARY_PATH. Needed when using a
+# system/LCG GCC so that executables run during the build (e.g. Catch2 test
+# discovery) can find the correct libstdc++.
+if [[ -z "$GCC_TOOLCHAIN_VERSION" ]]; then
+  _libstdcxx=$(c++ -print-file-name=libstdc++.so 2>/dev/null)
+  if [[ "$_libstdcxx" == /* ]]; then
+    _gcc_lib_dir=$(readlink -f "$(dirname "$_libstdcxx")")
+    export LD_LIBRARY_PATH=$_gcc_lib_dir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+  fi
+  unset _libstdcxx _gcc_lib_dir
+fi
+
+# FairRoot v19.0.0 unconditionally includes fairroot/tools/tests which uses
+# catch_discover_tests, but Catch2 is only found when BUILD_TESTING=ON.
+# Guard it so BUILD_TESTING=OFF works.
+sed -i 's/^add_subdirectory(tests)/if(BUILD_TESTING)\n  add_subdirectory(tests)\nendif()/' \
+  "$SOURCEDIR/fairroot/tools/CMakeLists.txt"
+
 case $ARCHITECTURE in
   osx*)
     # If we preferred system tools, we need to make sure we can pick them up.
@@ -80,7 +98,8 @@ cmake $SOURCEDIR
       -DCMAKE_POLICY_DEFAULT_CMP0167=NEW \
       -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
       -DFairCMakeModules_ROOT=$FAIRCMAKEMODULES_ROOT \
-      -DBUILD_BASEMQ=OFF
+      -DBUILD_BASEMQ=OFF \
+      -DBUILD_TESTING=OFF
 
 cmake --build . -- -j$JOBS install
 

fairship.sh

@@ -44,6 +44,7 @@
 append_path:
   ROOT_INCLUDE_PATH: "$GEANT4_ROOT/include:$GEANT4_ROOT/include/Geant4:$PYTHIA_ROOT/include:$PYTHIA_ROOT/include/Pythia8:$GEANT4_VMC_ROOT/include:$GEANT4_VMC_ROOT/include/geant4vmc"
 incremental_recipe: |
+  pushd $SOURCEDIR && git lfs install --local && git lfs pull && popd
   rsync -ar $SOURCEDIR/ $INSTALLROOT/
   cmake --build . ${JOBS+-j$JOBS} --target install
   #Get the current git hash
@@ -65,37 +66,59 @@
   setenv FAIRLIBDIR \$PKG_ROOT/lib
   prepend-path PYTHONPATH \$PKG_ROOT/python
   prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
-  append-path ROOT_INCLUDE_PATH \$::env(GEANT4_ROOT)/include
-  append-path ROOT_INCLUDE_PATH \$::env(GEANT4_ROOT)/include/Geant4
-  append-path ROOT_INCLUDE_PATH \$::env(PYTHIA_ROOT)/include
-  append-path ROOT_INCLUDE_PATH \$::env(PYTHIA_ROOT)/include/Pythia8
-  append-path ROOT_INCLUDE_PATH \$::env(GEANT4_VMC_ROOT)/include
-  append-path ROOT_INCLUDE_PATH \$::env(GEANT4_VMC_ROOT)/include/geant4vmc
+  append-path ROOT_INCLUDE_PATH $GEANT4_ROOT/include
+  append-path ROOT_INCLUDE_PATH $GEANT4_ROOT/include/Geant4
+  append-path ROOT_INCLUDE_PATH $PYTHIA_ROOT/include
+  append-path ROOT_INCLUDE_PATH $PYTHIA_ROOT/include/Pythia8
+  append-path ROOT_INCLUDE_PATH $GEANT4_VMC_ROOT/include
+  append-path ROOT_INCLUDE_PATH $GEANT4_VMC_ROOT/include/geant4vmc
   EoF
 ---
 #!/bin/sh
 
+# When using system/LCG packages, *_ROOT variables may not be set.
+# Detect paths from config tools.
+: ${PYTHIA_ROOT:=$(pythia8-config --prefix 2>/dev/null)}
+: ${GEANT4_ROOT:=$(geant4-config --prefix 2>/dev/null)}
+: ${FMT_ROOT:=$(pkg-config --variable=prefix fmt 2>/dev/null)}
+
+# Fetch Git LFS files (field maps etc.) before copying sources
+pushd $SOURCEDIR
+git lfs install --local
+git lfs pull
+popd
+
+# Clean up any stale CMake artifacts in the source directory
+rm -f $SOURCEDIR/CMakeCache.txt
+rm -rf $SOURCEDIR/CMakeFiles
+
 rsync -a $SOURCEDIR/ $INSTALLROOT/
 
+# Geant4 11+ uses external CLHEP, not bundled libG4clhep
+sed -i 's/ROOT.gSystem.Load("libG4clhep")/ROOT.gSystem.Load("libCLHEP")/' \
+  $INSTALLROOT/python/shipRoot_conf.py
+sed -i 's/ROOT.gSystem.Load("libG4clhep.so")/ROOT.gSystem.Load("libCLHEP")/' \
+  $INSTALLROOT/macro/eventDisplay.py
+
 cmake $SOURCEDIR                                                 \
       -G Ninja \
       -DFAIRBASE="$FAIRROOT_ROOT/share/fairbase"                 \
       -DFAIRROOTPATH="$FAIRROOTPATH"                             \
       -DFAIRROOT_INCLUDE_DIR="$FAIRROOT_ROOT/include"            \
       -DFAIRROOT_LIBRARY_DIR="$FAIRROOT_ROOT/lib"                \
-      -DFMT_INCLUDE_DIR="$FMT_ROOT/include"                      \
+      ${FMT_ROOT:+-DFMT_INCLUDE_DIR="$FMT_ROOT/include"}         \
       -DCMAKE_CXX_FLAGS="$CXXFLAGS"                              \
       -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE                       \
       -DROOT_DIR=$ROOT_ROOT                                      \
       -DROOTEGPythia6_ROOT=$ROOTEGPYTHIA6_ROOT                   \
-      -DHEPMC_DIR=$HEPMC_ROOT                                    \
-      -DHEPMC_INCLUDE_DIR=$HEPMC_ROOT/include/HepMC              \
+      ${HEPMC_ROOT:+-DHEPMC_DIR=$HEPMC_ROOT}                     \
+      ${HEPMC_ROOT:+-DHEPMC_INCLUDE_DIR=$HEPMC_ROOT/include/HepMC} \
       -DEVTGEN_INCLUDE_DIR=$EVTGEN_ROOT/include                  \
       -DEVTGEN_LIBRARY_DIR=$EVTGEN_ROOT/lib                      \
-      -DPYTHIA8_DIR=$PYTHIA_ROOT                                 \
-      -DPYTHIA8_INCLUDE_DIR=$PYTHIA_ROOT/include                 \
-      -DGEANT4_ROOT=$GEANT4_ROOT                                 \
-      -DGEANT4_INCLUDE_DIR=$GEANT4_ROOT/include/Geant4           \
+      ${PYTHIA_ROOT:+-DPYTHIA8_DIR=$PYTHIA_ROOT}                  \
+      ${PYTHIA_ROOT:+-DPYTHIA8_INCLUDE_DIR=$PYTHIA_ROOT/include}  \
+      ${GEANT4_ROOT:+-DGEANT4_ROOT=$GEANT4_ROOT}                  \
+      ${GEANT4_ROOT:+-DGEANT4_INCLUDE_DIR=$GEANT4_ROOT/include/Geant4} \
       -DGEANT4_VMC_INCLUDE_DIR=$GEANT4_VMC_ROOT/include/geant4vmc \
       ${CMAKE_VERBOSE_MAKEFILE:+-DCMAKE_VERBOSE_MAKEFILE=ON}     \
       -DFairCMakeModules_ROOT=$FAIRCMAKEMODULES_ROOT \
@@ -125,10 +148,10 @@
 setenv FAIRLIBDIR \$PKG_ROOT/lib
 prepend-path PYTHONPATH \$PKG_ROOT/python
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
-append-path ROOT_INCLUDE_PATH \$::env(GEANT4_ROOT)/include
-append-path ROOT_INCLUDE_PATH \$::env(GEANT4_ROOT)/include/Geant4
-append-path ROOT_INCLUDE_PATH \$::env(PYTHIA_ROOT)/include
-append-path ROOT_INCLUDE_PATH \$::env(PYTHIA_ROOT)/include/Pythia8
-append-path ROOT_INCLUDE_PATH \$::env(GEANT4_VMC_ROOT)/include
-append-path ROOT_INCLUDE_PATH \$::env(GEANT4_VMC_ROOT)/include/geant4vmc
+append-path ROOT_INCLUDE_PATH $GEANT4_ROOT/include
+append-path ROOT_INCLUDE_PATH $GEANT4_ROOT/include/Geant4
+append-path ROOT_INCLUDE_PATH $PYTHIA_ROOT/include
+append-path ROOT_INCLUDE_PATH $PYTHIA_ROOT/include/Pythia8
+append-path ROOT_INCLUDE_PATH $GEANT4_VMC_ROOT/include
+append-path ROOT_INCLUDE_PATH $GEANT4_VMC_ROOT/include/geant4vmc
 EoF

fmt.sh

@@ -1,6 +1,6 @@
 package: fmt
 version: "%(tag_basename)s"
-tag: 11.2.0
+tag: 10.2.1
 source: https://github.com/fmtlib/fmt
 requires:
   - "GCC-Toolchain:(?!osx)"

geant3.sh

@@ -17,7 +17,7 @@ prefer_system_check: |
   ls $GEANT3_ROOT/include > /dev/null && \
   ls $GEANT3_ROOT/include/TGeant3 > /dev/null && \
   ls $GEANT3_ROOT/include/TGeant3/TGeant3.h > /dev/null && \
-  ls $GEANT3_ROOT/lib64/libgeant321.so > /dev/null && \
+  (ls $GEANT3_ROOT/lib64/libgeant321.so > /dev/null 2>&1 || ls $GEANT3_ROOT/lib/libgeant321.so > /dev/null 2>&1) && \
   true
 ---
 #!/bin/bash -e
@@ -27,12 +27,17 @@ if [ $FVERSION -ge 10 ]; then
    echo "Fortran version $FVERSION"
    SPECIALFFLAGS=1
 fi
+
+# GEANT3's minicern uses K&R-style C declarations (e.g. `char *fchtak()`)
+# that break with GCC 15's default -std=gnu23. Pass -std=gnu11 to restore
+# the old "unspecified arguments" semantics. Harmless on older GCC versions.
 cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT      \
                  -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE     \
                  ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD}  \
                  -DCMAKE_SKIP_RPATH=TRUE \
 		 -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
-                 ${SPECIALFFLAGS:+-DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch -fallow-invalid-boz -fno-tree-loop-distribute-patterns"}
+                 ${SPECIALFFLAGS:+-DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch -fallow-invalid-boz -fno-tree-loop-distribute-patterns"} \
+                 -DCMAKE_C_FLAGS="-std=gnu11"
 make ${JOBS:+-j $JOBS} install
 
 [[ ! -d $INSTALLROOT/lib64 ]] && ln -sf lib $INSTALLROOT/lib64
@@ -50,7 +55,7 @@ proc ModulesHelp { } {
 set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
 module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
 # Dependencies
-module load BASE/1.0 ROOT/$ROOT_VERSION-$ROOT_REVISION VMC/$VMC_VERSION-$VMC_REVISION
+module load BASE/1.0 ${ROOT_REVISION:+ROOT/$ROOT_VERSION-$ROOT_REVISION} ${VMC_REVISION:+VMC/$VMC_VERSION-$VMC_REVISION}
 # Our environment
 set GEANT3_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 setenv GEANT3_ROOT \$GEANT3_ROOT

geant4.sh

@@ -27,14 +27,9 @@
   G4SAIDXSDATA: "`find ${G4INSTALL} $G4DATASEARCHOPT  '*data*G4SAIDDATA*'`"
 prefer_system_check: |
   #!/bin/bash -e
-  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
+  which geant4-config > /dev/null && \
+  geant4-config --version > /dev/null && \
+  printf "#include \"G4RunManager.hh\"\nint main(){}" | c++ -xc++ - -c -o /dev/null $(geant4-config --cflags 2>/dev/null)
 ---
 #!/bin/bash -e
 export G4DEBUG=1

genie.sh

@@ -30,6 +30,46 @@
 #!/bin/bash -ex
 export GENIE="$BUILDDIR"
 
+# When using system/LCG packages, the *_ROOT variables may not be set.
+# Detect lib/include paths from config tools, falling back to $PKG_ROOT/{lib,include}.
+PYTHIA8_LIBDIR=${PYTHIA_ROOT:+$PYTHIA_ROOT/lib}
+PYTHIA8_INCDIR=${PYTHIA_ROOT:+$PYTHIA_ROOT/include}
+: ${PYTHIA8_LIBDIR:=$(pythia8-config --libdir 2>/dev/null)}
+: ${PYTHIA8_INCDIR:=$(pythia8-config --includedir 2>/dev/null)}
+
+LHAPDF_LIBDIR=${LHAPDF_ROOT:+$LHAPDF_ROOT/lib}
+LHAPDF_INCDIR=${LHAPDF_ROOT:+$LHAPDF_ROOT/include}
+: ${LHAPDF_LIBDIR:=$(lhapdf-config --libdir 2>/dev/null)}
+: ${LHAPDF_INCDIR:=$(lhapdf-config --incdir 2>/dev/null)}
+
+APFEL_LIBDIR=${APFEL_ROOT:+$APFEL_ROOT/lib}
+APFEL_INCDIR=${APFEL_ROOT:+$APFEL_ROOT/include}
+: ${APFEL_LIBDIR:=$(apfel-config --libdir 2>/dev/null)}
+: ${APFEL_INCDIR:=$(apfel-config --incdir 2>/dev/null)}
+
+LIBXML2_LIBDIR=${LIBXML2_ROOT:+$LIBXML2_ROOT/lib}
+LIBXML2_INCDIR=${LIBXML2_ROOT:+$LIBXML2_ROOT/include/libxml2}
+: ${LIBXML2_LIBDIR:=$(pkg-config --variable=libdir libxml-2.0 2>/dev/null)}
+if [[ -z "$LIBXML2_INCDIR" ]]; then
+  _xml2_incdir=$(pkg-config --variable=includedir libxml-2.0 2>/dev/null)
+  [[ -n "$_xml2_incdir" ]] && LIBXML2_INCDIR=$_xml2_incdir/libxml2
+  unset _xml2_incdir
+fi
+
+LOG4CPP_LIBDIR=${LOG4CPP_ROOT:+$LOG4CPP_ROOT/lib}
+LOG4CPP_INCDIR=${LOG4CPP_ROOT:+$LOG4CPP_ROOT/include}
+# log4cpp has no config tool; search LD_LIBRARY_PATH
+if [[ -z "$LOG4CPP_LIBDIR" ]]; then
+  for _dir in $(echo "$LD_LIBRARY_PATH" | tr ':' '\n'); do
+    if [[ -f "$_dir/liblog4cpp.so" ]]; then
+      LOG4CPP_LIBDIR=$_dir
+      LOG4CPP_INCDIR=$(dirname "$_dir")/include
+      break
+    fi
+  done
+  unset _dir
+fi
+
 rsync -a $SOURCEDIR/* $BUILDDIR
 ls -alh $BUILDDIR
 sed -i 's/libAPFEL.la/libAPFEL.so/' $BUILDDIR/configure
@@ -46,16 +86,16 @@
 		    --disable-pythia6 \
 		    --enable-pythia8 \
 		    --enable-mathmore \
-      		    --with-pythia8-lib=$PYTHIA_ROOT/lib/ \
-      		    --with-pythia8-inc=$PYTHIA_ROOT/include/ \
-		    --with-lhapdf-lib=$LHAPDF_ROOT/lib/ \
-		    --with-lhapdf-inc=$LHAPDF_ROOT/include/ \
-		    --with-libxml2-lib=$LIBXML2_ROOT/lib/ \
-		    --with-libxml2-inc=$LIBXML2_ROOT/include/libxml2 \
-		    --with-log4cpp-inc=$LOG4CPP_ROOT/include/ \
-		    --with-log4cpp-lib=$LOG4CPP_ROOT/lib/ \
-		    --with-apfel-inc=$APFEL_ROOT/include/ \
-		    --with-apfel-lib=$APFEL_ROOT/lib/
+      		    --with-pythia8-lib=$PYTHIA8_LIBDIR/ \
+      		    --with-pythia8-inc=$PYTHIA8_INCDIR/ \
+		    --with-lhapdf6-lib=$LHAPDF_LIBDIR/ \
+		    --with-lhapdf6-inc=$LHAPDF_INCDIR/ \
+		    --with-libxml2-lib=$LIBXML2_LIBDIR/ \
+		    --with-libxml2-inc=$LIBXML2_INCDIR \
+		    --with-log4cpp-inc=$LOG4CPP_INCDIR/ \
+		    --with-log4cpp-lib=$LOG4CPP_LIBDIR/ \
+		    --with-apfel-inc=$APFEL_INCDIR/ \
+		    --with-apfel-lib=$APFEL_LIBDIR/
 
 
 make CXXFLAGS="-Wall $CXXFLAGS" CFLAGS="-Wall $CFLAGS"
@@ -91,7 +131,7 @@
 set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
 module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
 # Dependencies
-module load BASE/1.0 ROOT/$ROOT_VERSION-$ROOT_REVISION pythia/$PYTHIA_VERSION-$PYTHIA_REVISION lhapdf/$LHAPDF_VERSION-$LHAPDF_REVISION log4cpp/$LOG4CPP_VERSION-$LOG4CPP_REVISION ${LIBXML2:+libxml2/$LIBXML2_VERSION-$LIBXML2_REVISION} ${GSL_VERSION:+GSL/$GSL_VERSION-$GSL_REVISION} apfel/$APFEL_VERSION-$APFEL_REVISION
+module load BASE/1.0 ${ROOT_REVISION:+ROOT/$ROOT_VERSION-$ROOT_REVISION} ${PYTHIA_REVISION:+pythia/$PYTHIA_VERSION-$PYTHIA_REVISION} ${LHAPDF_REVISION:+lhapdf/$LHAPDF_VERSION-$LHAPDF_REVISION} ${LOG4CPP_REVISION:+log4cpp/$LOG4CPP_VERSION-$LOG4CPP_REVISION} ${LIBXML2_REVISION:+libxml2/$LIBXML2_VERSION-$LIBXML2_REVISION} ${GSL_VERSION:+GSL/$GSL_VERSION-$GSL_REVISION} ${APFEL_REVISION:+apfel/$APFEL_VERSION-$APFEL_REVISION}
 # Our environment
 setenv GENIE_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 setenv GENIE \$::env(GENIE_ROOT)/genie

googletest.sh

@@ -7,15 +7,7 @@ build_requires:
  - CMake
 prefer_system_check: |
   #!/bin/bash -e
-  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
+  pkg-config --exists gtest gmock
 ---
 #!/bin/sh
 cmake $SOURCEDIR                           \

gsl.sh

@@ -9,7 +9,11 @@
   - alibuild-recipe-tools
 prefer_system: (?!slc5)
 prefer_system_check: |
-  printf "#include \"gsl/gsl_version.h\"\n#define GSL_V GSL_MAJOR_VERSION * 100 + GSL_MINOR_VERSION\n# if (GSL_V < 116)\n#error \"Cannot use system's gsl. Notice we only support versions from 1.16 (included)\"\n#endif\nint main(){}" | cc -xc - -I$(brew --prefix gsl)/include  -c -o /dev/null
+  case $(uname) in
+    Darwin) GSL_INC="-I$(brew --prefix gsl)/include" ;;
+    *) GSL_INC="${GSL_ROOT:+-I$GSL_ROOT/include}" ;;
+  esac
+  printf "#include \"gsl/gsl_version.h\"\n#define GSL_V GSL_MAJOR_VERSION * 100 + GSL_MINOR_VERSION\n# if (GSL_V < 116)\n#error \"Cannot use system's gsl. Notice we only support versions from 1.16 (included)\"\n#endif\nint main(){}" | cc -xc - $GSL_INC -c -o /dev/null
 ---
 #!/bin/bash -e
 rsync -a --chmod=ug=rwX --exclude .git --delete-excluded $SOURCEDIR/ $BUILDDIR/