diff --git a/boost.sh b/boost.sh index d58f1caf97..6b4132cce2 100644 --- a/boost.sh +++ b/boost.sh @@ -1,6 +1,6 @@ package: boost -version: v1.83.0-alice2 -tag: v1.83.0-alice2 +version: v1.90.0-alice1 +tag: v1.90.0-alice1 source: https://github.com/alisw/boost.git requires: - "GCC-Toolchain:(?!osx)" diff --git a/c-ares.sh b/c-ares.sh index 0f6bf64631..f12277edb2 100644 --- a/c-ares.sh +++ b/c-ares.sh @@ -14,7 +14,7 @@ prepend_path: --- #!/bin/bash -e -cmake $SOURCEDIR -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALLROOT -DCMAKE_INSTALL_LIBDIR=lib +cmake $SOURCEDIR -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALLROOT -DCMAKE_INSTALL_LIBDIR=lib make ${JOBS:+-j$JOBS} install case $ARCHITECTURE in diff --git a/cgal.sh b/cgal.sh index ffe3b83f5c..46be622585 100644 --- a/cgal.sh +++ b/cgal.sh @@ -1,5 +1,5 @@ package: cgal -version: "4.6.3" +version: "6.1.1" requires: - boost license: GPL-3.0 @@ -16,7 +16,7 @@ case $ARCHITECTURE in [[ ! $BOOST_ROOT ]] && BOOST_ROOT=`brew --prefix boost` ;; esac -URL="https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-$PKGVERSION/CGAL-$PKGVERSION.tar.xz" +URL="https://github.com/CGAL/cgal/releases/download/v$PKGVERSION/CGAL-$PKGVERSION.tar.xz" curl -kLo cgal.tar.xz "$URL" tar xJf cgal.tar.xz @@ -75,6 +75,12 @@ find $INSTALLROOT/lib/ -name "*.dylib" -exec install_name_tool -add_rpath @loade find $INSTALLROOT/lib/ -name "*.dylib" -exec install_name_tool -add_rpath ${INSTALLROOT}/lib {} \; find $INSTALLROOT/lib/ -name "*.dylib" -exec install_name_tool -id {} {} \; +if [[ ${ALIBUILD_ARCHITECTURE} = osx* ]]; then + echo "" | cc -o $INSTALLROOT/lib/libCGAL.dylib -dynamiclib -x c++ - +else + echo "" | gcc -o $INSTALLROOT/lib/libCGAL.so -shared -x c++ - +fi + # Modulefile MODULEDIR="$INSTALLROOT/etc/modulefiles" MODULEFILE="$MODULEDIR/$PKGNAME" diff --git a/cmake.sh b/cmake.sh index 41cd95a263..17adf6c5e7 100644 --- a/cmake.sh +++ b/cmake.sh @@ -1,12 +1,12 @@ package: CMake version: "%(tag_basename)s" -tag: "v3.31.6" +tag: "v4.1.4" source: https://github.com/Kitware/CMake requires: - "OpenSSL:(?!osx)" - "GCC-Toolchain:(?!osx)" - zlib - - curl + - "curl:(?!osx)" license: BSD-3-Clause build_requires: - make diff --git a/crmc.sh b/crmc.sh index 70c6a59834..9834b97513 100644 --- a/crmc.sh +++ b/crmc.sh @@ -1,6 +1,6 @@ package: CRMC version: "%(tag_basename)s-correctHepMC" -tag: v1.7.0 +tag: v1.7.0-alice1 source: https://github.com/alisw/crmc.git requires: - boost diff --git a/datadistribution.sh b/datadistribution.sh index 6684ffd3df..8e70c4a9e2 100644 --- a/datadistribution.sh +++ b/datadistribution.sh @@ -1,6 +1,6 @@ package: DataDistribution version: "%(tag_basename)s" -tag: v1.6.9 +tag: v1.6.10 source: https://github.com/AliceO2Group/DataDistribution requires: - "GCC-Toolchain:(?!osx)" diff --git a/dds.sh b/dds.sh index 5942d20df4..53072722e3 100644 --- a/dds.sh +++ b/dds.sh @@ -1,6 +1,6 @@ package: DDS version: "%(tag_basename)s" -tag: "3.16" +tag: "3.18" source: https://github.com/FairRootGroup/DDS requires: - boost diff --git a/defaults-ali.sh b/defaults-ali.sh index 308956580e..06ddf2a22d 100644 --- a/defaults-ali.sh +++ b/defaults-ali.sh @@ -26,8 +26,6 @@ overrides: - JAliEn-ROOT vgm: tag: "v5-2" - cgal: - version: 4.12.2 fastjet: tag: v3.4.1_1.052-alice2 ROOT: diff --git a/defaults-o2-epn.sh b/defaults-o2-epn.sh index b516ea3900..af87b1e43d 100644 --- a/defaults-o2-epn.sh +++ b/defaults-o2-epn.sh @@ -28,8 +28,6 @@ overrides: - Vc - ZeroMQ - JAliEn-ROOT - cgal: - version: 4.12.2 fastjet: tag: v3.4.0_1.045-alice1 DataDistribution: diff --git a/defaults-o2.sh b/defaults-o2.sh index 9fe97ea474..1021d341ce 100644 --- a/defaults-o2.sh +++ b/defaults-o2.sh @@ -25,8 +25,6 @@ overrides: - Vc - ZeroMQ - JAliEn-ROOT - cgal: - version: 4.12.2 --- # 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 diff --git a/double-conversion.sh b/double-conversion.sh index d1f5e6a6bf..fdeae627b1 100644 --- a/double-conversion.sh +++ b/double-conversion.sh @@ -1,5 +1,5 @@ package: double-conversion -version: v3.1.5 +version: v3.4.0 license: MIT source: https://github.com/google/double-conversion build_requires: diff --git a/dpmjet.sh b/dpmjet.sh index 8ea4621325..8f6f4b1075 100644 --- a/dpmjet.sh +++ b/dpmjet.sh @@ -18,6 +18,7 @@ if [ $FVERSION -ge 10 ]; then fi cmake $SOURCEDIR \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ ${SPECIALFFLAGS:+-DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch"} diff --git a/fastjet.sh b/fastjet.sh index a833a9fcfc..ad3f9612e8 100644 --- a/fastjet.sh +++ b/fastjet.sh @@ -28,7 +28,7 @@ pushd fastjet FJTAG=${GIT_TAG#alice-} if [[ $FJTAG < "v3.3.3" ]] then - ADDITIONAL_FLAGS="${GMP_ROOT:+-L$GMP_ROOT/lib -lgmp} ${MPFR_ROOT:+-L$MPFR_ROOT/lib -lmpfr} $BOOST_LIBS ${CGAL_ROOT:+-L$CGAL_ROOT/lib -lCGAL -I$CGAL_ROOT/include} ${BOOST_ROOT:+-I$BOOST_ROOT/include} ${GMP_ROOT:+-I$GMP_ROOT/include} ${MPFR_ROOT:+-I$MPFR_ROOT/include} ${CGAL_ROOT:+-DCGAL_DO_NOT_USE_MPZF} -O2 -g" + ADDITIONAL_FLAGS="${GMP_ROOT:+-L$GMP_ROOT/lib -lgmp} ${MPFR_ROOT:+-L$MPFR_ROOT/lib -lmpfr} $BOOST_LIBS ${CGAL_ROOT:+-L$CGAL_ROOT/lib -I$CGAL_ROOT/include} ${BOOST_ROOT:+-I$BOOST_ROOT/include} ${GMP_ROOT:+-I$GMP_ROOT/include} ${MPFR_ROOT:+-I$MPFR_ROOT/include} ${CGAL_ROOT:+-DCGAL_DO_NOT_USE_MPZF} -O2 -g" export CXXFLAGS="$CXXFLAGS $ARCH_FLAGS $ADDITIONAL_FLAGS" export CFLAGS="$CFLAGS $ARCH_FLAGS $ADDITIONAL_FLAGS" export CPATH="${BOOST_INC}${CGAL_ROOT:+$CGAL_ROOT/include:}${GMP_ROOT:+$GMP_ROOT/include:}${MPFR_ROOT:+$MPFR_ROOT/include}" diff --git a/gbl.sh b/gbl.sh index 18d7a31e57..19210dcd37 100644 --- a/gbl.sh +++ b/gbl.sh @@ -15,6 +15,7 @@ build_requires: cmake -S "${SOURCEDIR}/cpp/" -B "$BUILDDIR" \ -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \ -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DEIGEN3_INCLUDE_DIR="$EIGEN3_ROOT/include/eigen3" \ -DSUPPORT_ROOT=ON cmake --build . -- ${JOBS:+-j$JOBS} diff --git a/glfw.sh b/glfw.sh index 7f2922cf4b..55942fc108 100644 --- a/glfw.sh +++ b/glfw.sh @@ -1,6 +1,6 @@ package: GLFW -version: "3.3.2" -tag: 3.3.2 +version: "3.4" +tag: "3.4" license: Zlib source: https://github.com/glfw/glfw.git build_requires: @@ -20,6 +20,7 @@ cmake --debug-output $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ -DGLFW_BUILD_EXAMPLES=OFF \ -DCMAKE_INSTALL_LIBDIR=lib \ -DGLFW_BUILD_TESTS=OFF \ + -DGLFW_BUILD_WAYLAND=OFF \ -DGLFW_BUILD_DOCS=OFF cmake --build . -- ${JOBS+-j $JOBS} install diff --git a/jetscape.sh b/jetscape.sh index ff58973777..29cf2ead2f 100644 --- a/jetscape.sh +++ b/jetscape.sh @@ -1,6 +1,6 @@ package: JETSCAPE version: "%(tag_basename)s" -tag: "v3.1.1-alice6" +tag: "v3.1.1-alice7" source: https://github.com/alisw/JETSCAPE requires: - boost diff --git a/json-c.sh b/json-c.sh index b5e3d31a85..579fae79f7 100644 --- a/json-c.sh +++ b/json-c.sh @@ -1,6 +1,6 @@ package: json-c -version: "v0.17.0" -tag: "json-c-0.17-20230812" +version: "v0.18.0" +tag: "json-c-0.18-20240915" license: MIT source: https://github.com/json-c/json-c build_requires: @@ -12,6 +12,7 @@ build_requires: cmake "$SOURCEDIR" \ -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DBUILD_SHARED_LIBS=OFF \ ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE} diff --git a/libuv.sh b/libuv.sh index 7113220b85..923eca30d6 100644 --- a/libuv.sh +++ b/libuv.sh @@ -1,5 +1,5 @@ package: libuv -version: v1.40.0 +version: v1.52.0 source: https://github.com/libuv/libuv requires: - "GCC-Toolchain:(?!osx)" diff --git a/libwebsockets.sh b/libwebsockets.sh index 9bb43cdbb6..878fc1b20c 100644 --- a/libwebsockets.sh +++ b/libwebsockets.sh @@ -1,6 +1,6 @@ package: libwebsockets version: "%(tag_basename)s" -tag: "v4.3.2" +tag: "v4.5.2" source: https://github.com/warmcat/libwebsockets requires: - libuv @@ -35,7 +35,16 @@ case $ARCHITECTURE in : "${OPENSSL_ROOT:=$(brew --prefix openssl@3)}" ;; esac -cmake $SOURCEDIR \ +if [[ "${ARCHITECTURE}" =~ ^slc7 ]]; then + mkdir -p srcdir + rsync -a --delete --exclude '**/.git' $SOURCEDIR/ ./srcdir/ + sed -i 's/^.*LWS_HAVE_LINUX_IPV6_H.*$/set(LWS_HAVE_LINUX_IPV6_H 0)/' ./srcdir/CMakeLists.txt + SOURCEDIR2="./srcdir/" +else + SOURCEDIR2="$SOURCEDIR" +fi + +cmake $SOURCEDIR2 \ -GNinja \ -DCMAKE_C_FLAGS_RELEASE="-Wno-error" \ -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ diff --git a/lz4.sh b/lz4.sh index 9e7c94b6a1..8284b92a34 100644 --- a/lz4.sh +++ b/lz4.sh @@ -1,6 +1,6 @@ package: lz4 version: "%(tag_basename)s" -tag: v1.9.3 +tag: v1.10.0 license: BSD-2-Clause source: https://github.com/lz4/lz4 build_requires: diff --git a/python-modules-list.sh b/python-modules-list.sh index 197df5bad6..d04e4a8754 100644 --- a/python-modules-list.sh +++ b/python-modules-list.sh @@ -80,8 +80,8 @@ env: xgboost == 0.82; python_version < '3.8' xgboost == 1.3.3; python_version == '3.8' - xgboost == 1.2.0; python_version >= '3.9' and python_version < '3.11' - xgboost == 1.7.5; python_version >= '3.11' + xgboost == 1.2.0; python_version == '3.9' + xgboost == 1.7.5; python_version >= '3.10' dryable == 1.0.3; python_version < '3.9' dryable == 1.0.5; python_version >= '3.9' diff --git a/rapidjson.sh b/rapidjson.sh index 924d68a6d2..0d73846ff4 100644 --- a/rapidjson.sh +++ b/rapidjson.sh @@ -13,6 +13,7 @@ prepend_path: --- cmake $SOURCEDIR \ -G Ninja \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \ -DRAPIDJSON_BUILD_TESTS=OFF \ diff --git a/roounfold.sh b/roounfold.sh index 5091aaf39f..436cfb845d 100644 --- a/roounfold.sh +++ b/roounfold.sh @@ -12,6 +12,7 @@ cmake $SOURCEDIR \ ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD} \ ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"} \ -DROOT_DIR=$ROOT_ROOT \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_LIBDIR=lib make ${JOBS:+-j$JOBS} install #make test diff --git a/treelite.sh b/treelite.sh index cce777a1ed..8a8314e4ad 100644 --- a/treelite.sh +++ b/treelite.sh @@ -1,9 +1,11 @@ package: treelite version: "%(tag_basename)s" -tag: "8498081" +tag: "df6a892b7faf532aea13bacc0f30b8a4743f82cf" source: https://github.com/dmlc/treelite requires: - "GCC-Toolchain:(?!osx)" + - fmt + - RapidJSON license: Apache-2.0 build_requires: - CMake @@ -11,18 +13,29 @@ build_requires: --- #!/bin/bash -e +case $ARCHITECTURE in + osx*) + # If we preferred system tools, we need to make sure we can pick them up. + [[ ! $FMT_ROOT ]] && FMT_ROOT=`brew --prefix fmt` + ;; + *) ;; +esac + rsync -a $SOURCEDIR/ src/ pushd src - git submodule update --init --recursive + sed -i.deleteme "s/RAPIDJSON_INCLUDE_DIRS/RapidJSON_INCLUDE_DIRS/g" cmake/ExternalLibs.cmake popd cmake src \ ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.27 \ -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ -DUSE_OPENMP=OFF cmake --build . -- ${JOBS:+-j$JOBS} install +[[ -d $INSTALLROOT/lib64 ]] && [[ ! -d $INSTALLROOT/lib ]] && ln -sf ${INSTALLROOT}/lib64 $INSTALLROOT/lib + # Modulefile MODULEDIR="$INSTALLROOT/etc/modulefiles" MODULEFILE="$MODULEDIR/$PKGNAME" diff --git a/upcgen.sh b/upcgen.sh index 5f8ab17b28..b00171d8f1 100644 --- a/upcgen.sh +++ b/upcgen.sh @@ -1,6 +1,6 @@ package: Upcgen version: "%(tag_basename)s" -tag: upcgen-o2-25-12-24-1 +tag: upcgen-o2-26-03-02-1 source: https://github.com/alisw/upcgen requires: - ROOT diff --git a/utf8proc.sh b/utf8proc.sh index 16f1dbd873..0a314785b0 100644 --- a/utf8proc.sh +++ b/utf8proc.sh @@ -1,6 +1,6 @@ package: utf8proc -version: "v2.6.1" -tag: v2.6.1 +version: "v2.11.2" +tag: v2.11.2 license: MIT source: https://github.com/JuliaStrings/utf8proc build_requires: @@ -12,7 +12,7 @@ prefer_system_check: | printf "#include \n" | c++ -c -I$(brew --prefix utf8proc)/include -xc++ - -o /dev/null 2>&1; if [ $? -ne 0 ]; then printf "Use brew install utf8proc"; exit 1; fi --- -cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT -DBUILD_SHARED_LIBS=ON +cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_LIBDIR=lib make ${JOBS+-j $JOBS} install mkdir -p etc/modulefiles diff --git a/zeromq.sh b/zeromq.sh index 5924449b92..90c6945197 100644 --- a/zeromq.sh +++ b/zeromq.sh @@ -14,6 +14,7 @@ cmake $SOURCEDIR \ -G Ninja \ -DENABLE_WS=OFF \ -DBUILD_TESTS=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=$INSTALLROOT