GCC: bump to 15.3.0-alice1

dim.sh

@@ -1,6 +1,6 @@
 package: dim
 version: "%(tag_basename)s"
-tag: v20r30
+tag: v20r30-alice1
 source: https://github.com/alisw/dim
 requires:
   - "GCC-Toolchain:(?!osx)"

gcc-toolchain.sh

@@ -1,6 +1,6 @@
 package: GCC-Toolchain
 version: "%(tag_basename)s"
-tag: v14.2.0-alice2
+tag: v15.3.0-alice2
 license: GPL-3.0
 source: https://github.com/alisw/gcc-toolchain
 prepend_path:
@@ -15,6 +15,7 @@ prefer_system_check: |
   set -e
   which gfortran || { echo "gfortran missing"; exit 1; }
   case $REQUESTED_VERSION in
+    v15*) MIN_GCC_VERSION=150300 ;;
     v14*) MIN_GCC_VERSION=140200 ;;
     v13*) MIN_GCC_VERSION=130200 ;;
     v12*) MIN_GCC_VERSION=120100 ;;
@@ -96,6 +97,17 @@ rsync -a gcc/gmp/ gmp
 rsync -a gcc/isl/ isl
 rsync -a gcc/mpc/ mpc
 
+# isl 0.27 ships C++17 self-tests (isl_test_cpp17, isl_test_cpp17-checked) that
+# break the in-tree GCC build: AX_CXX_COMPILE_STDCXX_17 sets HAVE_CXX17=1 when
+# the host compiler accepts C++17 "by default" but adds no -std switch, then the
+# TUs get compiled with __cplusplus < 201703L so the C++17-only members
+# (id::try_user, the std::any ctor) are invisible. These tests are not needed to
+# build libisl for GCC, so drop them from both isl copies before autoreconf
+# regenerates the Makefiles.
+for islmf in gcc/isl/Makefile.am isl/Makefile.am; do
+  [ -f "$islmf" ] && perl -ni -e 'print unless /^if HAVE_CXX17$/ .. /^endif$/' "$islmf"
+done
+
 pushd gcc
   [ -d mpfr ] && (cd mpfr && autoreconf -ivf)
   [ -d mpc ] && (cd mpc && autoreconf -ivf)
@@ -215,6 +227,7 @@ mkdir -p build-isl
 mkdir -p build-mpc
 
 pushd build-gmp
+  CFLAGS="-O2 -pedantic -fomit-frame-pointer -std=gnu17"  \
   ../gmp/configure --prefix="$INSTALLROOT/libexec/extra"  \
                    --disable-shared                       \
                    --enable-static

libxml2.sh

@@ -1,44 +1,31 @@
 package: libxml2
 version: "%(tag_basename)s"
-tag: v2.9.3
+tag: v2.15.3
 license: MIT
 build_requires:
   - "autotools:(slc6|slc7)"
   - zlib
   - "GCC-Toolchain:(?!osx)"
-source: https://github.com/alisw/libxml2.git
+  - ninja
+  - CMake
+  - alibuild-recipe-tools
+source: https://gitlab.gnome.org/GNOME/libxml2
 prefer_system: "(?!slc5)"
 prefer_system_check: |
   xml2-config --version;
   if [ $? -ne 0 ]; then printf "libxml2 not found.\n * On RHEL-compatible systems you probably need: libxml2 libxml2-devel\n * On Ubuntu-compatible systems you probably need: libxml2 libxml2-dev"; exit 1; fi
 ---
 #!/bin/sh
-echo "Building ALICE libxml. To avoid this install libxml development package."
-rsync -a --chmod=ug=rwX --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR"/ .
-autoreconf -i
-./configure --disable-static \
-            --prefix=$INSTALLROOT \
-            --with-zlib="${ZLIB_ROOT}" --without-python
-
-make ${JOBS+-j $JOBS}
-make install
+cmake "$SOURCEDIR" "-DCMAKE_INSTALL_PREFIX=$INSTALLROOT" \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DLIBXML2_WITH_ZLIB=ON \
+    ${ZLIB_REVISION:+-DZLIB_ROOT=$ZLIB_ROOT}
+cmake --build . -- ${JOBS:+-j$JOBS} install
 # Modulefile
 mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${ZLIB_REVISION:+zlib/$ZLIB_VERSION-$ZLIB_REVISION}
-# Our environment
-setenv LIBXML2_VERSION \$version
-set LIBXML2_ROOT \$::env(BASEDIR)/$PKGNAME/\$::env(LIBXML2_VERSION)
-setenv LIBXML2_ROOT \$LIBXML2_ROOT
-prepend-path PATH \$LIBXML2_ROOT/bin
-prepend-path LD_LIBRARY_PATH \$LIBXML2_ROOT/lib
+cat > "etc/modulefiles/$PKGNAME" <<EoF
+$(alibuild-generate-module --bin --lib)
+# Compatibility, just in case
+setenv LIBXML2_ROOT \$PKG_ROOT
 EoF
 mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

ucx.sh

@@ -1,6 +1,6 @@
 package: ucx
 version: "%(tag_basename)s"
-tag: v1.13.1-alice2
+tag: v1.21.0
 requires:
   - "GCC-Toolchain:(?!osx)"
   - rdma-core
@@ -9,7 +9,7 @@ build_requires:
   - "autotools:(slc6|slc7)"
   - alibuild-recipe-tools
   - "GCC-Toolchain:(?!osx)"
-source: https://github.com/alisw/ucx
+source: https://github.com/openucx/ucx
 ---
 #!/bin/bash -e
 
@@ -21,7 +21,7 @@ rsync -a --delete --exclude "**/.git" "${SOURCEDIR}"/ .
                                --with-verbs                \
                                --with-rdmacm               \
                                --with-ib-hw-tm             \
-                               --with-mlx5-dv              \
+                               --with-mlx5                 \
                                --with-rc                   \
                                --with-ud                   \
                                --with-dc                   \

vecgeom.sh

@@ -1,10 +1,11 @@
 package: VecGeom
 version: "%(tag_basename)s"
-tag: v1.2.6
+tag: v2.1.0
 source: https://gitlab.cern.ch/VecGeom/VecGeom.git
 requires:
   - "GCC-Toolchain:(?!osx)"
   - "Vc"
+  - xercesc
 license: Apache-2.0
 build_requires:
   - CMake
@@ -22,6 +23,7 @@ case $ARCHITECTURE in
             -DBUILD_TESTING=OFF                            \
             -DVECGEOM_BUILTIN_VECCORE=ON                   \
             ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD}        \
+            ${XERCESC_ROOT:+-DXercesC_ROOT=$XERCESC_ROOT}  \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
   ;;
     *_aarch64)
@@ -32,6 +34,7 @@ case $ARCHITECTURE in
             -DBUILD_TESTING=OFF                            \
             -DVECGEOM_BUILTIN_VECCORE=ON                   \
             ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD}        \
+            ${XERCESC_ROOT:+-DXercesC_ROOT=$XERCESC_ROOT}  \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
   ;;
     *)
@@ -43,6 +46,7 @@ case $ARCHITECTURE in
             -DVECGEOM_BUILTIN_VECCORE=ON                   \
             -GNinja                                        \
             ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD}        \
+            ${XERCESC_ROOT:+-DXercesC_ROOT=$XERCESC_ROOT}  \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
   ;;
 esac