Merge branch IB/CMSSW_16_0_X/g13 into IB/CMSSW_16_0_X/master

Author: iarspider

autotools.spec

@@ -1,27 +1,25 @@
 ### RPM external autotools 1.5
 ## INITENV SET M4 %{i}/bin/m4
 # We keep all of them together to simplify the "requires" statements.
-%define autoconf_version 2.71
-%define automake_version 1.16.3
+%define autoconf_version 2.72
+%define automake_version 1.16.5
 %define automake_maj %(echo %{automake_version} | cut -f1,2 -d.)
-%define libtool_version 2.4.6
-%define m4_version 1.4.18
-%define gettext_version 0.21
+%define libtool_version 2.5.4
+%define m4_version 1.4.19
+%define gettext_version 0.22
 %define pkgconfig_version 0.29.2
 Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{autoconf_version}.tar.gz
 Source1: http://ftp.gnu.org/gnu/automake/automake-%{automake_version}.tar.gz
 Source2: http://ftp.gnu.org/gnu/libtool/libtool-%{libtool_version}.tar.gz
-Source3: http://ftp.gnu.org/gnu/m4/m4-%{m4_version}.tar.bz2
+Source3: http://ftp.gnu.org/gnu/m4/m4-%{m4_version}.tar.gz
 Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{gettext_version}.tar.gz
 Source5: http://pkgconfig.freedesktop.org/releases/pkg-config-%{pkgconfig_version}.tar.gz
-Patch0: m4-centos8
 
 %prep
 %setup -D -T -b 0 -n autoconf-%{autoconf_version}
 %setup -D -T -b 1 -n automake-%{automake_version}
 %setup -D -T -b 2 -n libtool-%{libtool_version}
 %setup -D -T -b 3 -n m4-%{m4_version}
-%patch0 -p1
 %setup -D -T -b 4 -n gettext-%{gettext_version}
 %setup -D -T -b 5 -n pkg-config-%{pkgconfig_version}
 

bazel-gcc14.patch

@@ -0,0 +1,12 @@
+diff --git a/third_party/zlib/BUILD b/third_party/zlib/BUILD
+index f1aa936..7317aff 100755
+--- a/third_party/zlib/BUILD
++++ b/third_party/zlib/BUILD
+@@ -29,6 +29,7 @@ distrib_cc_library(
+     # Use -Dverbose=-1 to turn off zlib's trace logging. (#3280)
+     copts = [
+         "-w",
++	"-Wno-error=implicit-function-declaration",
+         "-Dverbose=-1",
+     ],
+     includes = ["."],

bazel.spec

@@ -19,12 +19,14 @@ BuildRequires: java-env python3 python-python3
 # https://github.com/bazelbuild/bazel/issues/9392
 Patch0: bazel-3.7.0-patches
 Patch1: bazel-absl
+Patch2: bazel-gcc14
 
 %prep
 %setup -q -c -n bazel-%{realversion}
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 

bootstrap-bundle.spec

@@ -1,9 +1,10 @@
-### RPM external bootstrap-bundle 3.0
+### RPM external bootstrap-bundle 4.0
 ## NO_AUTO_DEPENDENCY
 ## NOCOMPILER
+AutoReqProv: no
 BuildRequires: gcc
-BuildRequires: db6-bootstrap lua-bootstrap file-bootstrap
-BuildRequires: xz-bootstrap libarchive-bootstrap
+BuildRequires: lua-bootstrap file-bootstrap zstd-bootstrap
+BuildRequires: xz-bootstrap libarchive-bootstrap sqlite-bootstrap
 
 %define keep_archives true
 
@@ -52,7 +53,7 @@ find %{i}/lib -type f ! -name '*.a' -writable -exec %{strip} {} \;
 # RPM requires it to generate requires/provides also (otherwise it ignores the files)
 find %{i}/lib -type f | xargs chmod 0755
 
-mv %{i}/lib/lib{lua,archive}.a %{i}/tmp
+mv %{i}/lib/lib{lua,archive,zstd}.a %{i}/tmp
 rm -f %{i}/lib/*.{l,}a
 mv %{i}/tmp/lib* %{i}/lib/
 rm -rf %{i}/tmp

bootstrap-driver.spec

@@ -1,4 +1,4 @@
-### RPM external bootstrap-driver 40.0
+### RPM external bootstrap-driver 42.0
 ## NOCOMPILER
 Requires: rpm
 BuildRequires: cms-common fakesystem
@@ -9,50 +9,66 @@ BuildRequires: cms-common fakesystem
 %build
 %install
 packageList=""
-echo requiredtools `echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'`
-for tool in `echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'`
-do
-    case X$tool in
-        Xdistcc|Xccache )
-        ;;
-        * )
-            toolcap=`echo $tool | tr a-z- A-Z_`
-            toolversion=$(eval echo $`echo ${toolcap}_VERSION`)
-            toolrevision=$(eval echo $`echo ${toolcap}_REVISION`)
-            echo $toolversion $toolrevision
-            packageList="$packageList external+${tool}+${toolversion}-1-${toolrevision}.%cmsplatf.rpm"
-        ;;
-    esac
+for tool in $(echo %{directpkgreqs} | tr '/' '+') ; do
+  packageList="$packageList ${tool}-1-1.%{cmsplatf}.rpm"
 done
 
 additionalProvides=""
 ##############################
 # Packages to seed for runtime
 ##############################
-platformSeeds="bash tcsh perl bzip2-libs glibc nspr nss nss-util popt zlib glibc-devel openssl openssl-devel openssl-libs krb5-libs
-               libcom_err libX11 libXext libXft libXpm libglvnd-glx libglvnd-opengl mesa-libGLU"
+platformSeeds="  bash glibc glibc-headers openssl-libs"
+platformSeeds+=" libX11 libxcrypt"
+
 # Needed by python runtime
 platformSeeds+=" readline ncurses-libs tcl tk"
+
+# Needed by root runtime
+platformSeeds+=" mesa-libGLU libglvnd-glx libglvnd-opengl libXext libXft libXpm"
+
+#Various packages perl dependencies
+platformSeeds+=" perl perl-libs"
+%if "%{rhel}" == "9"
+platformSeeds+=" libbrotli python3"
+platformSeeds+=" perl-base perl-lib perl-filetest perl-overload perl-vars"
+%endif
+
+#Various packages required by xrootd with krb5 enabled
+platformSeeds+=" libcom_err krb5-libs"
+
 # Seed packages which provides these
-packagesWithProvides="/usr/bin/python3 /usr/bin/perl /usr/bin/env /usr/bin/uname"
+packagesWithProvides=" /usr/bin/python3 /usr/bin/env /usr/bin/uname /bin/sh /usr/bin/perl"
 
 ##############################
 #Packages to seed for build
 ##############################
-platformBuildSeeds="git patch make zip unzip bzip2 java-1.8.0-openjdk-devel libcom_err-devel which libXpm-devel libXft-devel mesa-libGLU-devel rsync"
-#Needed by autotools,go and lcov
-#platformBuildSeeds+=" perl-Carp perl-Data-Dumper perl-Digest-MD5 perl-Exporter perl-File-Path perl-File-Temp perl-Getopt-Long perl-PathTools perl-Text-ParseWords perl-constant"
+platformBuildSeeds="  git patch make zip unzip bzip2 which rsync"
+platformBuildSeeds+=" openssl-devel libxcrypt-devel"
+platformBuildSeeds+=" libX11-devel libXpm-devel libXft-devel mesa-libGLU-devel"
+platformBuildSeeds+=" java-1.8.0-openjdk-devel"
+
+%if "%{rhel}" == "9"
+platformBuildSeeds+=" brotli-devel"
+%endif
+
+#Various packages required by xrootd with krb5 enabled
+platformBuildSeeds+=" libcom_err-devel krb5-devel"
+
 #needed by python build
 platformBuildSeeds+=" readline-devel ncurses-devel tcl-devel tk-devel"
+
+##############################
+#Packages which provides a definition
+##############################
 packagesWithBuildProvides=""
 
 %ifnarch aarch64
 # Needed by oracle
 platformSeeds+=" libaio"
 %endif
 
-%if "%{rhel}" != "7"
-  platformSeeds+=" libxcrypt perl-libs"
+%if "%{rhel}" == "9"
+platformSeeds+=" libgcc"
 %endif
 
 platformSeeds+=" %{?rhel:libgcc}"

clue-gcc14.patch

@@ -0,0 +1,27 @@
+diff --git a/clueLib/include/TilesAlpaka.h b/clueLib/include/TilesAlpaka.h
+index b6ba9e50006616adcb2fee8642420a14fc698aba..0e7bcfd15f867a04c9e25e3534cfc199a01ece94 100644
+--- a/clueLib/include/TilesAlpaka.h
++++ b/clueLib/include/TilesAlpaka.h
+@@ -30,13 +30,20 @@ class TilesAlpaka {
+ 
+   ALPAKA_FN_HOST_ACC int getDim1Bin(float x) const {
+     int dim1Bin = (x - T::minDim1) * T::invDim1BinSize;
+-    dim1Bin = std::clamp(dim1Bin, 0, T::nColumns - 1);
++    // Equivalent of std::clamp(dim1Bin, 0, T::nColumns - 1);
++    // which doesn't compile with gcc14 due to reference to __glibcxx_assert
++    // See https://github.com/llvm/llvm-project/issues/95183
++    // and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115740
++    int new_max = std::max(dim1Bin, 0);
++    dim1Bin = std::min(T::nColumns - 1, new_max);
+     return dim1Bin;
+   }
+ 
+   ALPAKA_FN_HOST_ACC int getDim2Bin(float y) const {
+     int dim2Bin = (y - T::minDim2) * T::invDim2BinSize;
+-    dim2Bin = std::clamp(dim2Bin, 0, T::nRows - 1);
++    // See comment in getDim1Bin
++    int new_max = std::max(dim2Bin, 0);
++    dim2Bin = std::min(T::nRows - 1, new_max);
+     return dim2Bin;
+   }
+ 

clue.spec

@@ -4,10 +4,12 @@
 %define git_commit V_%(echo %{realversion} | tr '.' '_')
 
 Source: https://gitlab.cern.ch/kalos/%{n}/-/archive/%{git_commit}/%{n}-%{git_commit}.tar.gz
+Patch0: clue-gcc14
 Requires: alpaka
 
 %prep
 %setup -n %{n}-%{git_commit}
+%patch0 -p1
 
 %build
 

cmake.spec

@@ -1,4 +1,4 @@
-### RPM external cmake 3.28.3
+### RPM external cmake 3.31.7
 %define downloaddir %(echo %realversion | cut -d. -f1,2)
 Source: http://www.cmake.org/files/v%{downloaddir}/%n-%realversion.tar.gz
 Requires: bz2lib curl expat zlib

curl.spec

@@ -1,5 +1,10 @@
-### RPM external curl 7.79.0
-Source: http://curl.haxx.se/download/%{n}-%{realversion}.tar.gz
+%if 0%{?rhel} > 9
+%define curl_version 8.13.0
+%else
+%define curl_version 7.79.0
+%endif
+### RPM external curl %{curl_version}
+Source: https://curl.se/download/%{n}-%{realversion}.tar.gz
 Requires: zlib
 
 %prep
@@ -23,6 +28,7 @@ Requires: zlib
   --without-nss \
   --without-libssh2 \
   --with-gssapi=${KERBEROS_ROOT} \
+  --without-libpsl \
   --with-openssl
 
 make %{makeprocesses}

davix.spec

@@ -1,4 +1,4 @@
-### RPM external davix 0.8.7
+### RPM external davix 0.8.9
 
 %define tag %(echo R_%{realversion} | tr . _)
 %define branch master