Merge branch 'IB/CMSSW_12_3_X/master' into update-xrootd-531

OpenBLAS.spec

@@ -14,16 +14,17 @@ Patch1: OpenBLAS-disable-tests
 %build
 
 # PRESCOTT is a generic x86-64 target https://github.com/xianyi/OpenBLAS/issues/685 
+%define build_opts FC=gfortran BINARY=64 NUM_THREADS=256 DYNAMIC_ARCH=0 MAKE_NB_JOBS=%{compiling_processes}
 %ifarch x86_64
-make FC=gfortran BINARY=64 TARGET=CORE2 NUM_THREADS=256 DYNAMIC_ARCH=0
-%else
+make %{build_opts} TARGET=CORE2
+%endif
 %ifarch aarch64
-make FC=gfortran BINARY=64 TARGET=ARMV8 NUM_THREADS=256 DYNAMIC_ARCH=0
-%else
-make FC=gfortran BINARY=64 NUM_THREADS=256 DYNAMIC_ARCH=0 CFLAGS="%{ppc64le_build_flags}"
-%endif # aarch64
-%endif # x86_64
+make %{build_opts} TARGET=ARMV8
+%endif
+%ifarch ppc64le
+make %{build_opts} CFLAGS="%{ppc64le_build_flags}"
+%endif
 
 %install
-make install PREFIX=%i
+make install PREFIX=%i MAKE_NB_JOBS=%{compiling_processes}
 

SCRAMV1.spec

@@ -1,13 +1,8 @@
-### RPM lcg SCRAMV1 V3_00_31
+### RPM lcg SCRAMV1 V3_00_33
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 
-Provides: perl(BuildSystem::Template::Plugins::PluginCore)
-Provides: perl(BuildSystem::TemplateStash)
-Provides: perl(Cache::CacheUtilities)
-Provides: perl(BuildSystem::ToolManager)
-
-%define tag e61917ac8b26a2fd0d9f67847aa8271ffe871671
+%define tag 4ae4e4cde2026f0b88189e8f748a5fd47f0f44fb
 %define branch SCRAMV3
 %define github_user cms-sw
 Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

graphviz.spec → archive/graphviz.spec

@@ -1,5 +1,5 @@
-### RPM external graphviz 2.38.0
-Source: http://www.graphviz.org/pub/%{n}/ARCHIVE/%{n}-%{realversion}.tar.gz  
+### RPM external graphviz 2.49.0
+Source: https://gitlab.com/api/v4/projects/4207231/packages/generic/%{n}-releases/%{realversion}/%{n}-%{realversion}.tar.gz
 Requires: expat zlib libjpeg-turbo libpng
 BuildRequires: autotools
 %prep
@@ -23,14 +23,11 @@ do
 done
 
 %build
-case %cmsplatf in
-    slc*|fc*|cc*)
+%ifnos darwin
         ADDITIONAL_OPTIONS="--with-freetype2=no --disable-shared --enable-static --disable-ltdl"
-    ;;
-    osx*)
+%else
         ADDITIONAL_OPTIONS="--with-freetype2=no"
-    ;;
-esac
+%endif
 ./configure \
   --disable-silent-rules \
   --with-expatlibdir=$EXPAT_ROOT/lib \
@@ -76,10 +73,8 @@ make install
 rm -rf %{i}/lib/pkgconfig
 
 # To match configure options above
-case %{cmsplatf} in
-    slc*|fc*|cc*)
+%ifnos darwin
         ln -s dot_static %{i}/bin/dot
-    ;;
-esac
+%endif
 # Drop static libraries.
 rm -rf %{i}/lib/*.{l,}a

archive/pip/awkward0.file

@@ -0,0 +1 @@
+Requires: py3-numpy py3-pytest-runner

archive/pip/uproot3-methods.file

@@ -0,0 +1,2 @@
+Requires: py3-awkward0
+Requires: py3-numpy

archive/pip/uproot3.file

@@ -0,0 +1,2 @@
+Requires: py3-numpy py3-awkward0 py3-uproot3-methods
+Requires: py3-cachetools

autotools.spec

@@ -1,25 +1,27 @@
-### RPM external autotools 1.4
+### 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.69
-%define automake_version 1.16.1
+%define autoconf_version 2.71
+%define automake_version 1.16.3
 %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.20.1
+%define gettext_version 0.21
 %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
 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-3.7.0-patches.patch

@@ -11,3 +11,15 @@ index 0ea30a9..8df189f 100755
              named = true,
              positional = false,
              doc = "Whether the action should use the built in shell environment or not."),
+diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
+index d48485b..40ca051 100755
+--- a/tools/cpp/unix_cc_configure.bzl
++++ b/tools/cpp/unix_cc_configure.bzl
+@@ -193,6 +193,7 @@ def _find_gold_linker_path(repository_ctx, cc):
+     Returns:
+       String to put as value to -fuse-ld= flag, or None if gold couldn't be found.
+     """
++    return None
+     result = repository_ctx.execute([
+         cc,
+         str(repository_ctx.path("tools/cpp/empty.cc")),

bazel-3.7.2-gcc11.patch

@@ -0,0 +1,24 @@
+diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc
+index 6e3a908..030e9ca 100755
+--- a/third_party/ijar/mapped_file_unix.cc
++++ b/third_party/ijar/mapped_file_unix.cc
+@@ -19,6 +19,7 @@
+ #include <sys/mman.h>
+
+ #include <algorithm>
++#include <limits>
+
+ #include "third_party/ijar/mapped_file.h"
+
+diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h
+index ed66163..c4b051e 100755
+--- a/third_party/ijar/zlib_client.h
++++ b/third_party/ijar/zlib_client.h
+@@ -16,6 +16,7 @@
+ #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
+
+ #include <limits.h>
++#include <limits>
+
+ #include "third_party/ijar/common.h"
+

bazel.spec

@@ -17,6 +17,7 @@ BuildRequires: java-env python3
 # configuration issue
 # https://github.com/bazelbuild/bazel/issues/9392
 Patch0: bazel-3.7.0-patches
+Patch1: bazel-3.7.2-gcc11
 
 %prep
 
@@ -25,6 +26,7 @@ Patch0: bazel-3.7.0-patches
 %setup -q -n bazel-%{realversion}
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 

bison.spec

@@ -1,4 +1,4 @@
-### RPM external bison 3.5
+### RPM external bison 3.7.6
 ## INITENV SET BISON_PKGDATADIR %{i}/share/bison
 
 Source: http://ftp.gnu.org/gnu/%{n}/%{n}-%{realversion}.tar.gz

bootstrap-bundle.spec

@@ -1,29 +1,23 @@
-### RPM external bootstrap-bundle 1.7
-## INITENV +PATH PATH %{i}/bin
+### RPM external bootstrap-bundle 3.0
+## NO_AUTO_DEPENDENCY
 ## NOCOMPILER
 
 BuildRequires: gcc
-BuildRequires: db6-bootstrap lua-bootstrap
-BuildRequires: openssl-bootstrap xz-bootstrap libarchive-bootstrap
+BuildRequires: db6-bootstrap lua-bootstrap file-bootstrap
+BuildRequires: xz-bootstrap libarchive-bootstrap
 
 %define keep_archives true
-%define is64bit %(case %{cmsplatf} in (*_amd64_*|*_mic_*|*_aarch64_*|*_ppc64le_*|*_ppc64_*) echo 1 ;; (*) echo 0 ;; esac)
-%define ismac   %(case %{cmsplatf} in (osx*) echo 1 ;; (*) echo 0 ;; esac)
 
+%define libdir lib64
 %define soname so
-%if %ismac
+%ifos darwin
 %define soname dylib
 %endif
 
-%define libdir lib
-%if %is64bit
-%define libdir lib64
-%endif
-
 %prep
 %build
 %install
-mkdir %{i}/bin %{i}/lib %{i}/include %{i}/share %{i}/tmp
+mkdir -p %{i}/bin %{i}/lib %{i}/include %{i}/share %{i}/tmp %{i}/etc/profile.d
 for tool in `echo %{buildrequiredtools} | tr ' ' '\n' | grep '\-bootstrap$'`; do
   toolcap=`echo $tool | tr a-z- A-Z_`
   toolbase=`eval echo \\$${toolcap}_ROOT`
@@ -32,15 +26,20 @@ for tool in `echo %{buildrequiredtools} | tr ' ' '\n' | grep '\-bootstrap$'`; do
     rsync -r --links --ignore-existing ${toolbase}/${sdir}/ %{i}/${sdir}/
   done
 done
+mkdir %{i}/share/misc
+cp ${FILE_BOOTSTRAP_ROOT}/share/misc/magic.mgc  %{i}/share/misc/magic.mgc
 rm -f %{i}/bin/xml2-config %{i}/lib/xml2Conf.sh
 
 #Bundle libstd and libgcc_s and libelf
-%if %ismac
+%ifos darwin
 cp -P $GCC_ROOT/lib/lib{stdc++,gcc_s}*.%{soname} %{i}/lib
 %else
-cp -P $GCC_ROOT/%{libdir}/lib{stdc++,gcc_s}.%{soname}* %{i}/lib
+cp -P $GCC_ROOT/%{libdir}/lib{stdc++,gcc_s,gomp}.%{soname}* %{i}/lib
 cp -P $GCC_ROOT/lib/libelf.%{soname}* %{i}/lib
 cp -P $GCC_ROOT/lib/libelf-*.%{soname} %{i}/lib
+cp -P $GCC_ROOT/lib/libdw.%{soname}* %{i}/lib
+cp -P $GCC_ROOT/lib/libdw-*.%{soname} %{i}/lib
+cp -P $GCC_ROOT/bin/readelf %{i}/bin
 %endif
 
 find %{i}/bin -type f -writable -exec %{strip} {} \;