Skip to content

Commit 6ac5df0

Browse files
trostendahlerlend
authored andcommitted
Bug#36086236 Enable and use correct toolset for rpm builds on el* platforms
Bug#36054662 With PGO enabled, build fails to produce commercial-debuginfo RPM on EL8 Bug#36072667 EL8 RPM "libmysqlclient.a" exports no symbols strip and dwz from /usr/bin used by rpmbuild might break object files and binaries produced by GCC Toolset on el* platforms. See for example: https://sourceware.org/bugzilla/show_bug.cgi?id=24195 Point to newer strip and make sure corresponding dwz tool is available (set $PATH correctly to let script use it). Post processing in rpmbuild by brp_strip_static_archive runs "strip -g" which breaks static archive on el8 even if newer strip is used, disable this processing completely. Change-Id: I681fd2bc3a7556d09fdc9e77357d779fc8c7d336
1 parent 170ff58 commit 6ac5df0

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

packaging/rpm-oel/mysql.spec.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@
100100
%{?el9: %global with_debuginfo 1}
101101
%{!?with_debuginfo: %global without_debuginfo 1}
102102

103+
%{?el8:%global __strip /opt/rh/gcc-toolset-12/root/usr/bin/strip}
104+
%{?el8:%global __brp_strip_static_archive %{nil}}
105+
103106
%{!?product_suffix: %global product_suffix community}
104107
%{!?feature_set: %global feature_set community}
105108
%{!?compilation_comment_release: %global compilation_comment_release MySQL Community - GPL}
@@ -181,6 +184,7 @@ BuildRequires: cmake3 >= 3.6.1
181184
%{?el8:BuildRequires: gcc-toolset-12-annobin-annocheck}
182185
%{?el8:BuildRequires: gcc-toolset-12-annobin-plugin-gcc}
183186
%{?el8:BuildRequires: gcc-toolset-12-binutils}
187+
%{?el8:BuildRequires: gcc-toolset-12-dwz}
184188
%{?el8:BuildRequires: gcc-toolset-12-gcc-c++}
185189
%{?el8:BuildRequires: gcc-toolset-12-gcc}
186190
%{?el9:BuildRequires: gcc-toolset-12-annobin-annocheck}

0 commit comments

Comments
 (0)