From c28e89c8473644f189a94bdf7c6483c41b8b7107 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 27 Nov 2023 09:41:03 +0000 Subject: [PATCH] Rebuild all packages with latest gcc 13 compiler. --- boost/.copr/Makefile | 2 +- boost/vespa-boost.spec.tmpl | 6 +++--- cmake/.copr/Makefile | 2 +- cmake/vespa-cmake.spec.tmpl | 4 ++-- gtest/.copr/Makefile | 2 +- gtest/vespa-gtest.spec.tmpl | 4 ++-- icu/.copr/Makefile | 2 +- icu/vespa-icu.spec.tmpl | 4 ++-- lz4/.copr/Makefile | 2 +- lz4/vespa-lz4.spec.tmpl | 4 ++-- onnxruntime/.copr/Makefile | 2 +- onnxruntime/vespa-onnxruntime.spec.tmpl | 4 ++-- openblas/.copr/Makefile | 2 +- openblas/vespa-openblas.spec.tmpl | 12 ++++++------ openssl/.copr/Makefile | 2 +- openssl/vespa-openssl.spec.tmpl | 4 ++-- protobuf/.copr/Makefile | 2 +- protobuf/vespa-protobuf.spec.tmpl | 4 ++-- pybind11/.copr/Makefile | 2 +- pybind11/vespa-pybind11.spec.tmpl | 6 +++--- re2/.copr/Makefile | 2 +- re2/vespa-re2.spec.tmpl | 6 +++--- valgrind/.copr/Makefile | 2 +- valgrind/vespa-valgrind.spec.tmpl | 8 ++++---- xxhash/.copr/Makefile | 2 +- xxhash/vespa-xxhash.spec.tmpl | 4 ++-- zstd/.copr/Makefile | 2 +- zstd/vespa-zstd.spec.tmpl | 4 ++-- 28 files changed, 51 insertions(+), 51 deletions(-) diff --git a/boost/.copr/Makefile b/boost/.copr/Makefile index 1161165..ebc6b53 100644 --- a/boost/.copr/Makefile +++ b/boost/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=1 MINOR=76 PATCH=0 -RELEASE=3 +RELEASE=4 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/boost/vespa-boost.spec.tmpl b/boost/vespa-boost.spec.tmpl index 4912eaf..2aec18c 100644 --- a/boost/vespa-boost.spec.tmpl +++ b/boost/vespa-boost.spec.tmpl @@ -30,9 +30,9 @@ Source: https://boostorg.jfrog.io/artifactory/main/release/%{dotted_version}/sou BuildRequires: m4 %if 0%{?el8} -BuildRequires: gcc-toolset-12-gcc-c++ -BuildRequires: gcc-toolset-12-binutils -%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: gcc-toolset-13-binutils +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable BuildRequires: make %endif diff --git a/cmake/.copr/Makefile b/cmake/.copr/Makefile index 88c5f78..edbd10f 100644 --- a/cmake/.copr/Makefile +++ b/cmake/.copr/Makefile @@ -6,7 +6,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=3 MINOR=26 PATCH=4 -RELEASE=1 +RELEASE=2 PKGNAME=vespa-cmake # https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4.tar.gz diff --git a/cmake/vespa-cmake.spec.tmpl b/cmake/vespa-cmake.spec.tmpl index c1e4a3c..b855e9c 100644 --- a/cmake/vespa-cmake.spec.tmpl +++ b/cmake/vespa-cmake.spec.tmpl @@ -23,8 +23,8 @@ URL: http://www.cmake.org Source0: https://github.com/Kitware/CMake/releases/download/v%{version}/cmake-%{version}.tar.gz %if 0%{?el8}%{?el9} -BuildRequires: gcc-toolset-12-gcc-c++ -%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable +BuildRequires: gcc-toolset-13-gcc-c++ +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable %endif %if 0%{?fedora} BuildRequires: gcc-c++ diff --git a/gtest/.copr/Makefile b/gtest/.copr/Makefile index 2f2c602..9a0157b 100644 --- a/gtest/.copr/Makefile +++ b/gtest/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=1 MINOR=13 PATCH=0 -RELEASE=1 +RELEASE=2 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/gtest/vespa-gtest.spec.tmpl b/gtest/vespa-gtest.spec.tmpl index 40b7700..618e03a 100644 --- a/gtest/vespa-gtest.spec.tmpl +++ b/gtest/vespa-gtest.spec.tmpl @@ -32,8 +32,8 @@ Source0: https://github.com/google/googletest/archive/refs/tags/v%{versio BuildRequires: python3-devel %if 0%{?el8} %global _centos_stream %(grep -qs '^NAME="CentOS Stream"' /etc/os-release && echo 1 || echo 0) -BuildRequires: vespa-toolset-11-meta -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable +BuildRequires: vespa-toolset-13-meta +%define _devtoolset_enable /opt/rh/gcc-toolset/enable BuildRequires: cmake %endif %if 0%{?fedora} diff --git a/icu/.copr/Makefile b/icu/.copr/Makefile index f07ea73..8765aec 100644 --- a/icu/.copr/Makefile +++ b/icu/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=65 MINOR=1 PATCH=0 -RELEASE=4 +RELEASE=5 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/icu/vespa-icu.spec.tmpl b/icu/vespa-icu.spec.tmpl index 71f3ccb..075061f 100644 --- a/icu/vespa-icu.spec.tmpl +++ b/icu/vespa-icu.spec.tmpl @@ -31,8 +31,8 @@ Source0: https://github.com/unicode-org/icu/releases/download/release-%{v %if 0%{?el8} -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable -BuildRequires: gcc-toolset-11-gcc-c++ +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable +BuildRequires: gcc-toolset-13-gcc-c++ %endif %if 0%{?fedora} BuildRequires: gcc-c++ diff --git a/lz4/.copr/Makefile b/lz4/.copr/Makefile index b2e771a..b4a19b0 100644 --- a/lz4/.copr/Makefile +++ b/lz4/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=1 MINOR=9 PATCH=4 -RELEASE=2 +RELEASE=3 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/lz4/vespa-lz4.spec.tmpl b/lz4/vespa-lz4.spec.tmpl index ed9806b..6d690d2 100644 --- a/lz4/vespa-lz4.spec.tmpl +++ b/lz4/vespa-lz4.spec.tmpl @@ -30,8 +30,8 @@ URL: https://lz4.github.io/lz4/ Source0: https://github.com/lz4/lz4/archive/v%{version}/lz4-%{version}.tar.gz %if 0%{?el8} -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable -BuildRequires: gcc-toolset-11-gcc +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable +BuildRequires: gcc-toolset-13-gcc %endif %if 0%{?el9} BuildRequires: gcc diff --git a/onnxruntime/.copr/Makefile b/onnxruntime/.copr/Makefile index 5ce101a..1026100 100644 --- a/onnxruntime/.copr/Makefile +++ b/onnxruntime/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=1 MINOR=16 PATCH=3 -RELEASE=1 +RELEASE=2 PKGNAME=vespa-onnxruntime RPMTOPDIR=$(TOP)/rpmbuild diff --git a/onnxruntime/vespa-onnxruntime.spec.tmpl b/onnxruntime/vespa-onnxruntime.spec.tmpl index e4d8d78..5fa303c 100644 --- a/onnxruntime/vespa-onnxruntime.spec.tmpl +++ b/onnxruntime/vespa-onnxruntime.spec.tmpl @@ -43,8 +43,8 @@ BuildRequires: ccache BuildRequires: vespa-gradle BuildRequires: which %if 0%{?el8} -%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable -BuildRequires: vespa-toolset-12-meta +%define _devtoolset_enable /opt/rh/gcc-toolset/enable +BuildRequires: vespa-toolset-13-meta BuildRequires: vespa-gtest BuildRequires: make BuildRequires: glibc-langpack-en diff --git a/openblas/.copr/Makefile b/openblas/.copr/Makefile index 18fb0c9..05d4ec6 100644 --- a/openblas/.copr/Makefile +++ b/openblas/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=0 MINOR=3 PATCH=25 -RELEASE=1 +RELEASE=2 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/openblas/vespa-openblas.spec.tmpl b/openblas/vespa-openblas.spec.tmpl index e79e657..9fc95bd 100644 --- a/openblas/vespa-openblas.spec.tmpl +++ b/openblas/vespa-openblas.spec.tmpl @@ -30,15 +30,15 @@ Source0: https://github.com/xianyi/OpenBLAS/archive/v%{version}/openblas- Patch0: patches.driver-others-dynamic-arm64.diff %if 0%{?el8} -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable -BuildRequires: vespa-toolset-11-meta -BuildRequires: gcc-toolset-11-gcc-gfortran +%define _devtoolset_enable /opt/rh/gcc-toolset/enable +BuildRequires: vespa-toolset-13-meta +BuildRequires: gcc-toolset-13-gcc-gfortran BuildRequires: perl-devel %endif %if 0%{?el9} -%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable -BuildRequires: vespa-toolset-12-meta -BuildRequires: gcc-toolset-12-gcc-gfortran +%define _devtoolset_enable /opt/rh/gcc-toolset/enable +BuildRequires: vespa-toolset-13-meta +BuildRequires: gcc-toolset-13-gcc-gfortran BuildRequires: perl-devel %endif %if 0%{?fedora} diff --git a/openssl/.copr/Makefile b/openssl/.copr/Makefile index 3b50e25..fb971f2 100644 --- a/openssl/.copr/Makefile +++ b/openssl/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=3 MINOR=1 PATCH=4 -RELEASE=1 +RELEASE=2 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/openssl/vespa-openssl.spec.tmpl b/openssl/vespa-openssl.spec.tmpl index 00b2ef6..0077f64 100644 --- a/openssl/vespa-openssl.spec.tmpl +++ b/openssl/vespa-openssl.spec.tmpl @@ -34,8 +34,8 @@ Source0: https://www.openssl.org/source/openssl-%{version}.tar.gz %if 0%{?el8}%{?el9} -%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable -BuildRequires: gcc-toolset-12-gcc-c++ +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable +BuildRequires: gcc-toolset-13-gcc-c++ BuildRequires: make BuildRequires: perl %endif diff --git a/protobuf/.copr/Makefile b/protobuf/.copr/Makefile index cad268d..91d0cf6 100644 --- a/protobuf/.copr/Makefile +++ b/protobuf/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=3 MINOR=21 PATCH=12 -RELEASE=1 +RELEASE=2 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/protobuf/vespa-protobuf.spec.tmpl b/protobuf/vespa-protobuf.spec.tmpl index c4f386a..81197a2 100644 --- a/protobuf/vespa-protobuf.spec.tmpl +++ b/protobuf/vespa-protobuf.spec.tmpl @@ -31,8 +31,8 @@ Source0: https://github.com/protocolbuffers/protobuf/releases/download/v% Patch0: patches.protobuf-linker-maps.diff %if 0%{?el8} || 0%{?el9} -%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable -BuildRequires: gcc-toolset-12-gcc-c++ +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable +BuildRequires: gcc-toolset-13-gcc-c++ BuildRequires: make %endif %if 0%{?fedora} diff --git a/pybind11/.copr/Makefile b/pybind11/.copr/Makefile index ee68e10..1e7d87d 100644 --- a/pybind11/.copr/Makefile +++ b/pybind11/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=2 MINOR=10 PATCH=4 -RELEASE=1 +RELEASE=2 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/pybind11/vespa-pybind11.spec.tmpl b/pybind11/vespa-pybind11.spec.tmpl index ed3aab1..1eea865 100644 --- a/pybind11/vespa-pybind11.spec.tmpl +++ b/pybind11/vespa-pybind11.spec.tmpl @@ -24,9 +24,9 @@ URL: https://github.com/pybind/pybind11 Source0: https://github.com/pybind/pybind11/archive/refs/tags/v%{version}.tar.gz %if 0%{?el8} -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable -BuildRequires: gcc-toolset-11-gcc-c++ -BuildRequires: gcc-toolset-11-binutils +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: gcc-toolset-13-binutils BuildRequires: make BuildRequires: cmake BuildRequires: boost-devel diff --git a/re2/.copr/Makefile b/re2/.copr/Makefile index d09f521..4c37b4a 100644 --- a/re2/.copr/Makefile +++ b/re2/.copr/Makefile @@ -4,7 +4,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) # Version MAJOR=20210801 MAJOR_LONG=2021-08-01 -RELEASE=3 +RELEASE=4 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/re2/vespa-re2.spec.tmpl b/re2/vespa-re2.spec.tmpl index 92871a3..a05de29 100644 --- a/re2/vespa-re2.spec.tmpl +++ b/re2/vespa-re2.spec.tmpl @@ -28,9 +28,9 @@ URL: https://github.com/google/re2/ Source0: https://github.com/google/re2/archive/%{ver_major_long}.tar.gz %if 0%{?el8} -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable -BuildRequires: gcc-toolset-11-gcc -BuildRequires: gcc-toolset-11-gcc-c++ +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable +BuildRequires: gcc-toolset-13-gcc +BuildRequires: gcc-toolset-13-gcc-c++ %endif %if 0%{?el9} BuildRequires: gcc diff --git a/valgrind/.copr/Makefile b/valgrind/.copr/Makefile index 2578dd3..2c0387a 100644 --- a/valgrind/.copr/Makefile +++ b/valgrind/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=3 MINOR=22 PATCH=0 -RELEASE=1 +RELEASE=2 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/valgrind/vespa-valgrind.spec.tmpl b/valgrind/vespa-valgrind.spec.tmpl index 808f051..45d438b 100644 --- a/valgrind/vespa-valgrind.spec.tmpl +++ b/valgrind/vespa-valgrind.spec.tmpl @@ -21,11 +21,11 @@ URL: http://www.valgrind.org/ Source0: https://sourceware.org/pub/valgrind/valgrind-%{version}.tar.bz2 %if 0%{?el8} -%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable -%define _devtoolset_gdb /opt/rh/gcc-toolset-12/root/usr/bin/gdb -BuildRequires: vespa-toolset-12-meta +%define _devtoolset_enable /opt/rh/gcc-toolset/enable +%define _devtoolset_gdb /opt/rh/gcc-toolset-13/root/usr/bin/gdb +BuildRequires: vespa-toolset-13-meta BuildRequires: glibc-devel -BuildRequires: gcc-toolset-12-gdb +BuildRequires: gcc-toolset-13-gdb BuildRequires: procps BuildRequires: perl-generators BuildRequires: perl(Getopt::Long) diff --git a/xxhash/.copr/Makefile b/xxhash/.copr/Makefile index 173fbdc..9a06505 100644 --- a/xxhash/.copr/Makefile +++ b/xxhash/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=0 MINOR=8 PATCH=1 -RELEASE=2 +RELEASE=3 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/xxhash/vespa-xxhash.spec.tmpl b/xxhash/vespa-xxhash.spec.tmpl index 3f6e68e..b2acd9f 100644 --- a/xxhash/vespa-xxhash.spec.tmpl +++ b/xxhash/vespa-xxhash.spec.tmpl @@ -30,8 +30,8 @@ URL: http://www.xxhash.com/ Source0: https://github.com/Cyan4973/xxHash/archive/v%{version}/%{name}-%{version}.tar.gz %if 0%{?el8} -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable -BuildRequires: gcc-toolset-11-gcc +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable +BuildRequires: gcc-toolset-13-gcc %endif %if 0%{?el9} BuildRequires: gcc diff --git a/zstd/.copr/Makefile b/zstd/.copr/Makefile index 8b10f95..c5fae3d 100644 --- a/zstd/.copr/Makefile +++ b/zstd/.copr/Makefile @@ -5,7 +5,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) MAJOR=1 MINOR=5 PATCH=5 -RELEASE=1 +RELEASE=2 RPMTOPDIR=$(TOP)/rpmbuild SOURCEDIR=$(RPMTOPDIR)/SOURCES diff --git a/zstd/vespa-zstd.spec.tmpl b/zstd/vespa-zstd.spec.tmpl index d2bc245..0d075ee 100644 --- a/zstd/vespa-zstd.spec.tmpl +++ b/zstd/vespa-zstd.spec.tmpl @@ -30,8 +30,8 @@ URL: https://github.com/facebook/zstd Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/zstd-%{version}.tar.gz %if 0%{?el8} -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable -BuildRequires: gcc-toolset-11-gcc +%define _devtoolset_enable /opt/rh/gcc-toolset-13/enable +BuildRequires: gcc-toolset-13-gcc %endif %if 0%{?el9} BuildRequires: gcc