From 1862013fae02c40c100b7e1eb02142a5df294db7 Mon Sep 17 00:00:00 2001 From: Simon J Mudd Date: Sun, 7 Jul 2024 16:09:19 +0200 Subject: [PATCH 1/2] bug#115484: Modify BuildRequires: to include gcc-toolset-12 for compat libraries on 9.0.0 --- packaging/rpm-oel/mysql.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index aea1807b01d3..b8a4f86ddf7f 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -188,6 +188,11 @@ BuildRequires: cmake3 >= 3.14.6 %{?el8:BuildRequires: gcc-toolset-13-dwz} %{?el8:BuildRequires: gcc-toolset-13-gcc-c++} %{?el8:BuildRequires: gcc-toolset-13-gcc} +%{?el9:BuildRequires: gcc-toolset-12-annobin-annocheck} +%{?el9:BuildRequires: gcc-toolset-12-annobin-plugin-gcc} +%{?el9:BuildRequires: gcc-toolset-12-binutils} +%{?el9:BuildRequires: gcc-toolset-12-gcc} +%{?el9:BuildRequires: gcc-toolset-12-gcc-c++} %{?el9:BuildRequires: gcc-toolset-13-annobin-annocheck} %{?el9:BuildRequires: gcc-toolset-13-annobin-plugin-gcc} %{?el9:BuildRequires: gcc-toolset-13-binutils} From ff6ee8ddf99cff4f170b9550c13513e09597a30b Mon Sep 17 00:00:00 2001 From: Simon J Mudd Date: Sun, 7 Jul 2024 16:19:10 +0200 Subject: [PATCH 2/2] Also add for OL8 which I think needs this too --- packaging/rpm-oel/mysql.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index b8a4f86ddf7f..2feb7eb1fdf2 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -182,6 +182,11 @@ BuildRequires: cmake3 >= 3.14.6 %{?el7:BuildRequires: devtoolset-11-binutils} %{?el7:BuildRequires: devtoolset-11-dwz} %endif +%{?el8:BuildRequires: gcc-toolset-12-annobin-annocheck} +%{?el8:BuildRequires: gcc-toolset-12-annobin-plugin-gcc} +%{?el8:BuildRequires: gcc-toolset-12-binutils} +%{?el8:BuildRequires: gcc-toolset-12-gcc} +%{?el8:BuildRequires: gcc-toolset-12-gcc-c++} %{?el8:BuildRequires: gcc-toolset-13-annobin-annocheck} %{?el8:BuildRequires: gcc-toolset-13-annobin-plugin-gcc} %{?el8:BuildRequires: gcc-toolset-13-binutils}