diff --git a/autotools.spec b/autotools.spec index 908f0210221..5b0a82dfd16 100644 --- a/autotools.spec +++ b/autotools.spec @@ -5,23 +5,21 @@ %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 m4_version 1.4.19 %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 +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} diff --git a/bootstrap-bundle.spec b/bootstrap-bundle.spec index 39b293aa611..dbdb1f9ff80 100644 --- a/bootstrap-bundle.spec +++ b/bootstrap-bundle.spec @@ -1,10 +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 @@ -51,7 +51,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 diff --git a/bootstrap-driver.spec b/bootstrap-driver.spec index 35cb6776a59..35b02f934ff 100644 --- a/bootstrap-driver.spec +++ b/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,41 +9,49 @@ 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 python3 openssl-libs" +platformSeeds+=" libbrotli 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-base perl-filetest perl-lib perl-libs perl-overload perl-vars" + +#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 brotli-devel libxcrypt-devel" +platformBuildSeeds+=" libX11-devel libXpm-devel libXft-devel mesa-libGLU-devel" +platformBuildSeeds+=" java-1.8.0-openjdk-devel" + +#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 @@ -51,8 +59,8 @@ packagesWithBuildProvides="" platformSeeds+=" libaio" %endif -%if "%{rhel}" != "7" - platformSeeds+=" libxcrypt perl-libs" +%if "%{rhel}" == "9" +platformSeeds+=" libgcc" %endif defaultPkgs="cms+cms-common+1.0 cms+fakesystem+1.0" diff --git a/cepgen-gcc12.patch b/cepgen-gcc12.patch new file mode 100644 index 00000000000..bd26beefc25 --- /dev/null +++ b/cepgen-gcc12.patch @@ -0,0 +1,10 @@ +--- a/CepGen/Utils/Drawer.h.orig 2023-06-05 11:45:35.916095554 +0200 ++++ b/CepGen/Utils/Drawer.h 2023-06-05 11:46:11.721935669 +0200 +@@ -20,6 +20,7 @@ + #define CepGen_Utils_Drawer_h + + #include "CepGen/Modules/NamedModule.h" ++#include + + namespace cepgen { + namespace utils { diff --git a/cepgen.spec b/cepgen.spec index 6900b76a28a..a5f8afc4512 100644 --- a/cepgen.spec +++ b/cepgen.spec @@ -4,9 +4,11 @@ Source: https://github.com/cepgen/cepgen/archive/refs/tags/%{realversion}.tar.gz BuildRequires: cmake ninja Requires: gsl OpenBLAS hepmc hepmc3 lhapdf pythia6 root bz2lib zlib xz +Patch0: cepgen-gcc12 %prep %setup -n %{n}-%{realversion} +%patch0 -p1 %build rm -rf ../build diff --git a/db6-bootstrap.spec b/db6-bootstrap.spec deleted file mode 100644 index bd8cdc2d024..00000000000 --- a/db6-bootstrap.spec +++ /dev/null @@ -1,18 +0,0 @@ -### RPM external db6-bootstrap 6.0.30 -Source: http://davidlt.web.cern.ch/davidlt/sources/db-%{realversion}.tar.gz -%define drop_files %{i}/docs -%define strip_files %{i}/lib - -%prep -%setup -n db-%{realversion} - -%build -mkdir ./obj -cd ./obj -../dist/configure --prefix=%{i} --build="%{_build}" --host="%{_host}" \ - --disable-java --disable-tcl --disable-static -make %{makeprocesses} - -%install -cd ./obj -make install diff --git a/dd4hep.spec b/dd4hep.spec index 93409449f9c..4f997abbb9b 100644 --- a/dd4hep.spec +++ b/dd4hep.spec @@ -1,9 +1,9 @@ -### RPM external dd4hep v01-25x +### RPM external dd4hep v01-26x ## INCLUDE compilation_flags ## INCLUDE compilation_flags_lto ## INCLUDE cpp-standard -%define tag b07fa115c59d80d37154cf205cf00dff8137ee36 +%define tag 8715c52c1c8b3c714d80896cb8540f3f8f888786 %define branch master %define github_user AIDASoft %define keep_archives true diff --git a/file-bootstrap.spec b/file-bootstrap.spec index 99ca6320f92..ebc71a38387 100644 --- a/file-bootstrap.spec +++ b/file-bootstrap.spec @@ -1,5 +1,6 @@ ### RPM external file-bootstrap 5.33 %define file_tag %(echo FILE%{realversion} | tr . _) +AutoReqProv: no Source: https://github.com/file/file/archive/%{file_tag}.tar.gz %prep diff --git a/gbl.spec b/gbl.spec index 9ed66f7a299..6bb71a279b3 100644 --- a/gbl.spec +++ b/gbl.spec @@ -1,4 +1,4 @@ -### RPM external gbl V02-04-01 +### RPM external gbl V03-00-00 ## INCLUDE cpp-standard %define tag 31e726d777fe93cdbed0c363dc15f803f7767f40 diff --git a/gcc.spec b/gcc.spec index 813f07efdb0..4f822ea7612 100644 --- a/gcc.spec +++ b/gcc.spec @@ -4,7 +4,7 @@ # Use the git repository for fetching the sources. This gives us more control while developing # a new platform so that we can compile yet to be released versions of the compiler. # See: https://gcc.gnu.org/viewcvs/gcc/branches/gcc-8-branch/?view=log -%define gccTag 10ebb8b9db2ec7ad53e4fc1f2900d9a8c8ddeaea +%define gccTag b76c4656631977ccf5119bd326df5e03d26f66ac %define gccBranch releases/gcc-12 %define moduleName %{n}-%{realversion} diff --git a/giflib.spec b/giflib.spec index cde8b8a8414..24874ac087a 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,4 +1,4 @@ -### RPM external giflib 5.2.0 +### RPM external giflib 5.2.1 Source: https://sourceforge.net/projects/giflib/files/giflib-%{realversion}.tar.gz BuildRequires: autotools diff --git a/grpc-gcc11.patch b/grpc-gcc11.patch new file mode 100644 index 00000000000..d0a374308e4 --- /dev/null +++ b/grpc-gcc11.patch @@ -0,0 +1,31 @@ +--- grpc/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc.orig 2023-06-12 13:50:04.615712549 +0200 ++++ grpc/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc 2023-06-12 13:50:21.878566886 +0200 +@@ -37,6 +37,7 @@ + + #include + #include ++#include + #include "absl/base/internal/hide_ptr.h" + #include "absl/base/internal/raw_logging.h" + #include "absl/base/internal/spinlock.h" +--- grpc/third_party/abseil-cpp/absl/copts/GENERATED_AbseilCopts.cmake.orig 2023-06-12 13:50:35.303453601 +0200 ++++ grpc/third_party/abseil-cpp/absl/copts/GENERATED_AbseilCopts.cmake 2023-06-12 13:51:05.358200009 +0200 +@@ -202,6 +202,7 @@ + + list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS + "-march=armv8-a+crypto" ++ "-mno-outline-atomics" + ) + + list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS +--- grpc/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.orig 2023-06-12 13:51:27.063016878 +0200 ++++ grpc/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2023-06-12 13:52:05.133695671 +0200 +@@ -125,7 +125,7 @@ + #else + const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; + #endif +- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; ++ size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; + #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \ + defined(THREAD_SANITIZER) + // Account for sanitizer instrumentation requiring additional stack space. diff --git a/igprof.spec b/igprof.spec index a78eb4f2f10..0e9452afb65 100644 --- a/igprof.spec +++ b/igprof.spec @@ -17,9 +17,9 @@ rm -rf ../build; mkdir ../build; cd ../build cmake ../igprof-%{git_commit} \ -DCMAKE_INSTALL_PREFIX=%i -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-g -O3" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-g -O3 -Wno-error=deprecated-declarations" \ -DCMAKE_PREFIX_PATH="$LIBUNWIND_ROOT;$PCRE_ROOT" -make DEBUG=1 VERBOSE=1 %makeprocesses +make DEBUG=1 VERBOSE=1 %makeprocesses %install cd ../build diff --git a/java-env.spec b/java-env.spec index 822bfbbfd62..2a4143fa9c5 100644 --- a/java-env.spec +++ b/java-env.spec @@ -1,4 +1,4 @@ -### RPM external java-env 1.1 +### RPM external java-env 11.0 ## INITENV SET JAVA_HOME %{java_home} ## INITENV +PATH PATH %{java_home}/bin ## INITENV +PATH LD_LIBRARY_PATH %{java_home}/lib diff --git a/libarchive-bootstrap.spec b/libarchive-bootstrap.spec index 8c13fb48b3b..80ebd021c65 100644 --- a/libarchive-bootstrap.spec +++ b/libarchive-bootstrap.spec @@ -1,6 +1,6 @@ ### RPM external libarchive-bootstrap 3.5.1 Source0: http://www.libarchive.org/downloads/libarchive-%{realversion}.tar.gz - +AutoReqProv: no Requires: xz-bootstrap %define keep_archives true diff --git a/pip/cryptography.file b/pip/cryptography.file index 30ac4ec3409..7bf8289a8d0 100644 --- a/pip/cryptography.file +++ b/pip/cryptography.file @@ -1,3 +1,3 @@ -%define PipPreBuild export CARGO_HOME=%{_tmppath}/cargo_home +%define PipPreBuild export CARGO_HOME=%{_tmppath}/cargo_home; export CARGO_HTTP_CAINFO=/etc/ssl/cert.pem BuildRequires: rust Requires: py3-setuptools-rust py3-cffi diff --git a/professor2.spec b/professor2.spec index 12e76113378..afc4291fd5c 100644 --- a/professor2.spec +++ b/professor2.spec @@ -23,7 +23,7 @@ sed -i -e 's|-std=c[+][+]11|-std=c++%{cms_cxx_standard}|' pyext/setup.py grep -q 'CXXSTD := c[+][+]11' Makefile sed -i -e 's|CXXSTD := c[+][+]11|CXXSTD := c++%{cms_cxx_standard}|' Makefile -%define build_flags CPPFLAGS=-I${EIGEN_ROOT}/include/eigen3 PYTHON=$(which python3) PROF_VERSION=%{realversion} PYTHONPATH=./${PYTHON3_LIB_SITE_PACKAGES} +%define build_flags CPPFLAGS=-I${EIGEN_ROOT}/include/eigen3 PYTHON=$(which python3) PROF_VERSION=%{realversion} PYTHONPATH=./${PYTHON3_LIB_SITE_PACKAGES}:./pyext/professor2 %build make %{build_flags} diff --git a/protobuf-std_iterator-8741.patch b/protobuf-std_iterator-8741.patch new file mode 100644 index 00000000000..7bd093e7ebc --- /dev/null +++ b/protobuf-std_iterator-8741.patch @@ -0,0 +1,107 @@ +From e3675f9c8dc3b35caeadc087fa7653ffefc3e0e9 Mon Sep 17 00:00:00 2001 +From: Arthur O'Dwyer +Date: Thu, 17 Jun 2021 11:02:09 -0400 +Subject: [PATCH] Stop using std::iterator (deprecated in C++17). + +--- + src/google/protobuf/reflection.h | 9 +++++-- + src/google/protobuf/repeated_field.h | 36 +++++++++++++++++++++------- + 2 files changed, 35 insertions(+), 10 deletions(-) + +diff --git a/src/google/protobuf/reflection.h b/src/google/protobuf/reflection.h +index af8eb00ef84..bb41fbaeb52 100644 +--- a/src/google/protobuf/reflection.h ++++ b/src/google/protobuf/reflection.h +@@ -392,13 +392,18 @@ class PROTOBUF_EXPORT RepeatedFieldAccessor { + + // Implement (Mutable)RepeatedFieldRef::iterator + template +-class RepeatedFieldRefIterator +- : public std::iterator { ++class RepeatedFieldRefIterator { + typedef typename RefTypeTraits::AccessorValueType AccessorValueType; + typedef typename RefTypeTraits::IteratorValueType IteratorValueType; + typedef typename RefTypeTraits::IteratorPointerType IteratorPointerType; + + public: ++ using iterator_category = std::forward_iterator_tag; ++ using value_type = T; ++ using pointer = T*; ++ using reference = T&; ++ using difference_type = std::ptrdiff_t; ++ + // Constructor for non-message fields. + RepeatedFieldRefIterator(const void* data, + const RepeatedFieldAccessor* accessor, bool begin) +diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h +index 3e3f601d7eb..c8fe9333dee 100644 +--- a/src/google/protobuf/repeated_field.h ++++ b/src/google/protobuf/repeated_field.h +@@ -2740,9 +2740,14 @@ RepeatedPtrField::pointer_end() const { + namespace internal { + // A back inserter for RepeatedField objects. + template +-class RepeatedFieldBackInsertIterator +- : public std::iterator { ++class RepeatedFieldBackInsertIterator { + public: ++ using iterator_category = std::output_iterator_tag; ++ using value_type = T; ++ using pointer = void; ++ using reference = void; ++ using difference_type = std::ptrdiff_t; ++ + explicit RepeatedFieldBackInsertIterator( + RepeatedField* const mutable_field) + : field_(mutable_field) {} +@@ -2762,9 +2767,14 @@ class RepeatedFieldBackInsertIterator + + // A back inserter for RepeatedPtrField objects. + template +-class RepeatedPtrFieldBackInsertIterator +- : public std::iterator { ++class RepeatedPtrFieldBackInsertIterator { + public: ++ using iterator_category = std::output_iterator_tag; ++ using value_type = T; ++ using pointer = void; ++ using reference = void; ++ using difference_type = std::ptrdiff_t; ++ + RepeatedPtrFieldBackInsertIterator(RepeatedPtrField* const mutable_field) + : field_(mutable_field) {} + RepeatedPtrFieldBackInsertIterator& operator=(const T& value) { +@@ -2793,9 +2803,14 @@ class RepeatedPtrFieldBackInsertIterator + // A back inserter for RepeatedPtrFields that inserts by transferring ownership + // of a pointer. + template +-class AllocatedRepeatedPtrFieldBackInsertIterator +- : public std::iterator { ++class AllocatedRepeatedPtrFieldBackInsertIterator { + public: ++ using iterator_category = std::output_iterator_tag; ++ using value_type = T; ++ using pointer = void; ++ using reference = void; ++ using difference_type = std::ptrdiff_t; ++ + explicit AllocatedRepeatedPtrFieldBackInsertIterator( + RepeatedPtrField* const mutable_field) + : field_(mutable_field) {} +@@ -2817,9 +2832,14 @@ class AllocatedRepeatedPtrFieldBackInsertIterator + // Almost identical to AllocatedRepeatedPtrFieldBackInsertIterator. This one + // uses the UnsafeArenaAddAllocated instead. + template +-class UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator +- : public std::iterator { ++class UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator { + public: ++ using iterator_category = std::output_iterator_tag; ++ using value_type = T; ++ using pointer = void; ++ using reference = void; ++ using difference_type = std::ptrdiff_t; ++ + explicit UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator( + RepeatedPtrField* const mutable_field) + : field_(mutable_field) {} diff --git a/protobuf.spec b/protobuf.spec index 29467042de0..e0a0984b90e 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -46,4 +46,3 @@ ninja -v %{makeprocesses} cd ../build ninja -v %{makeprocesses} install rm -rf %{i}/lib/pkgconfig - diff --git a/rpm.spec b/rpm.spec index 3201dda6098..12edca08a05 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,11 +1,11 @@ -### RPM external rpm 4.15.0 +### RPM external rpm 4.18.0 ## INITENV SET RPM_CONFIGDIR %{i}/libx/rpm ## INITENV SET RPM_POPTEXEC_PATH %{i}/bin ## INITENV SET MAGIC %{i}/share/misc/magic.mgc ## NOCOMPILER ## NO_AUTO_DEPENDENCY - -%define tag 48c04ee8077fbba1a0001968f2794cbaeb54f15c +AutoReqProv: no +%define tag 10c1f38c4c5e4c62a879801e34a0aa042207cd53 %define branch cms/rpm-%{realversion}-release %define github_user cms-externals %define github_repo rpm-upstream @@ -52,19 +52,21 @@ perl -p -i -e's|-O2|-O0|' ./configure # Notice that libelf is now in $GCC_ROOT because also gcc LTO requires it. ./configure --prefix %{i} --build="%{_build}" --host="%{_host}" \ - --with-external-db --disable-python --disable-nls --with-archive \ - --disable-rpath --with-lua --localstatedir=%{i}/var \ + --enable-ndb=yes --enable-sqlite=yes --disable-python --disable-nls --with-archive \ + --disable-rpath --with-crypto=openssl --enable-zstd --localstatedir=%{i}/var \ CXXFLAGS="$USER_CXXFLAGS $OS_CXXFLAGS" \ + ZSTD_CFLAGS="-I$BOOTSTRAP_BUNDLE_ROOT/include" \ + ZSTD_LIBS="-lzstd" \ CFLAGS="$CFLAGS_PLATF $USER_CFLAGS -I$BOOTSTRAP_BUNDLE_ROOT/include \ $OS_CFLAGS -I/usr/include/nspr4 -I/usr/include/nss3" \ LDFLAGS="-L$BOOTSTRAP_BUNDLE_ROOT/lib $OS_LDFLAGS" \ CPPFLAGS="-I$BOOTSTRAP_BUNDLE_ROOT/include \ $OS_CPPFLAGS -I/usr/include/nspr4 -I/usr/include/nss3" \ LIBS="-lnspr4 -lnss3 -lnssutil3 -lplds4 -lbz2 -lplc4 -lz -lpopt -llzma \ - -ldb -llua -larchive $LIBS_PLATF" + -llua -larchive -lsqlite3 $LIBS_PLATF" -perl -p -i -e "s|#\!.*perl(.*)|#!/usr/bin/env perl$1|" $(grep -R '#! */usr/bin/perl' . | sed 's|:.*||' | sort | uniq) -perl -p -i -e "s|#\!.*python(.*)|#!/usr/bin/env python$1|" $(grep -R '#! */usr/bin/python' . | sed 's|:.*||' | sort | uniq) +grep -R '#! */usr/bin/perl' . | sed 's|:.*||' | sort | uniq | xargs --no-run-if-empty perl -p -i -e "s|#\!.*perl(.*)|#!/usr/bin/env perl$1|" +grep -R '#! */usr/bin/python' . | sed 's|:.*||' | sort | uniq | xargs --no-run-if-empty perl -p -i -e "s|#\!.*python(.*)|#!/usr/bin/env python$1|" %install make install diff --git a/sqlite-bootstrap.spec b/sqlite-bootstrap.spec new file mode 100644 index 00000000000..46650c94e79 --- /dev/null +++ b/sqlite-bootstrap.spec @@ -0,0 +1,16 @@ +### RPM external sqlite-bootstrap 3.36.0 +AutoReqProv: no +Source: https://www.sqlite.org/2021/sqlite-autoconf-3360000.tar.gz + +%prep +%setup -n sqlite-autoconf-3360000 + +%build +./configure --build="%{_build}" --host="%{_host}" --prefix=%{i} \ + --disable-static --disable-dependency-tracking +make %{makeprocesses} + +%install +make install +rm -rf %{i}/lib/pkgconfig +%define strip_files %{i}/lib diff --git a/tbb-gcc13.patch b/tbb-gcc13.patch new file mode 100644 index 00000000000..b8ae7fce481 --- /dev/null +++ b/tbb-gcc13.patch @@ -0,0 +1,10 @@ +--- a/test/common/utils_assert.h.orig 2023-05-26 14:40:58.707932592 +0200 ++++ b/test/common/utils_assert.h 2023-05-26 14:41:17.954766142 +0200 +@@ -19,6 +19,7 @@ + + #include "config.h" + #include "utils_report.h" ++#include + + #define REPORT_FATAL_ERROR REPORT + diff --git a/tbb.spec b/tbb.spec index 3340a5b622f..9f4b12685d4 100644 --- a/tbb.spec +++ b/tbb.spec @@ -25,7 +25,8 @@ cmake ../%{n}-%{realversion} \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_HWLOC_2_5_INCLUDE_PATH=$HWLOC_ROOT/include \ -DCMAKE_HWLOC_2_5_LIBRARY_PATH=$HWLOC_ROOT/lib/libhwloc.so \ - -DTBB_CPF=ON + -DTBB_CPF=ON \ + -DTBB_TEST=OFF make %{makeprocesses} diff --git a/tensorflow-requires.file b/tensorflow-requires.file index e51d91e6e41..20c19bc7cbc 100644 --- a/tensorflow-requires.file +++ b/tensorflow-requires.file @@ -1,8 +1,8 @@ Requires: python3 py3-numpy py3-mock py3-typing-extensions Requires: py3-keras-applications py3-keras-preprocessing py3-future py3-wrapt py3-gast py3-setuptools -Requires: py3-cython py3-protobuf py3-astor py3-six py3-termcolor py3-absl-py +Requires: py3-cython py3-astor py3-six py3-termcolor py3-absl-py py3-protobuf py3-absl-py Requires: py3-opt-einsum py3-flatbuffers -Requires: eigen protobuf zlib libpng libjpeg-turbo curl giflib sqlite grpc flatbuffers py3-pybind11 +Requires: eigen zlib libpng libjpeg-turbo curl giflib sqlite grpc flatbuffers py3-pybind11 protobuf BuildRequires: py3-wheel %define enable_gpu 0 %if %{enable_gpu} diff --git a/triton-inference-client.spec b/triton-inference-client.spec index 2692763c69d..d0c5f631f70 100644 --- a/triton-inference-client.spec +++ b/triton-inference-client.spec @@ -54,7 +54,7 @@ cmake ${PROJ_DIR} \ -DTRITON_COMMON_REPO_TAG=${common_tag} \ -DTRITON_ENABLE_GPU=${TRITON_ENABLE_GPU_VALUE} \ -DTRITON_VERSION=%{realversion} \ - -DCMAKE_CXX_FLAGS="-Wno-error -fPIC" \ + -DCMAKE_CXX_FLAGS="-Wno-error -Wno-error=sign-compare -Wno-error=deprecated-declarations -fPIC" \ -DFETCHCONTENT_SOURCE_DIR_REPO-COMMON=${COMMON_DIR} \ -DCMAKE_PREFIX_PATH="${GRPC_ROOT};${ABSEIL_CPP_ROOT};${RE2_ROOT}" diff --git a/ucx-gcc13.patch b/ucx-gcc13.patch new file mode 100644 index 00000000000..815f6ce2a51 --- /dev/null +++ b/ucx-gcc13.patch @@ -0,0 +1,11 @@ +--- a/src/uct/base/uct_md.c ++++ b/src/uct/base/uct_md.c +@@ -554,7 +554,7 @@ ucs_status_t uct_md_mem_free(uct_md_h md, uct_mem_h memh) + + ucs_status_t + uct_md_mem_advise(uct_md_h md, uct_mem_h memh, void *addr, size_t length, +- unsigned advice) ++ uct_mem_advice_t advice) + { + if ((length == 0) || (addr == NULL)) { + return UCS_ERR_INVALID_PARAM; diff --git a/ucx.spec b/ucx.spec index 9a4feec5fa5..a668cc76782 100644 --- a/ucx.spec +++ b/ucx.spec @@ -9,9 +9,13 @@ Requires: rocm %endif Requires: xpmem +Patch0: ucx-gcc13 + %prep %setup -q -n %{n}-%{realversion} +%patch0 -p1 + # regenerate the configure files and Makefiles ./autogen.sh diff --git a/zstd-bootstrap.spec b/zstd-bootstrap.spec new file mode 100644 index 00000000000..740df464b1f --- /dev/null +++ b/zstd-bootstrap.spec @@ -0,0 +1,26 @@ +### RPM external zstd-bootstrap 1.5.2 +%define keep_archives true +Source: https://github.com/facebook/zstd/releases/download/v%{realversion}/zstd-%{realversion}.tar.gz + +%prep +%setup -n zstd-%{realversion} + +%build + +cmake build/cmake \ + -DZSTD_BUILD_CONTRIB:BOOL=OFF \ + -DZSTD_BUILD_STATIC:BOOL=ON \ + -DZSTD_BUILD_SHARED:BOOL=OFF \ + -DZSTD_BUILD_TESTS:BOOL=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DZSTD_BUILD_PROGRAMS:BOOL=OFF \ + -DZSTD_LEGACY_SUPPORT:BOOL=OFF \ + -DCMAKE_INSTALL_PREFIX:STRING=%{i} \ + -DCMAKE_INSTALL_LIBDIR:STRING=lib \ + -Dzstd_VERSION:STRING=%{realversion} + +make %{makeprocesses} VERBOSE=1 + +%install + +make install