From 134e8e0bbd44d05b5f3cb3cfe95832f229aa34730883767783c727457d5fd0cb Mon Sep 17 00:00:00 2001 From: David Anes Date: Wed, 14 Sep 2022 09:18:25 +0000 Subject: [PATCH] Accepting request 1002273 from home:bmwiedemann:branches:network Build SLE version with g++-11 to work around nondeterministic g++-7 (boo#1193895) For the SLE-12 builds, you would need to `osc branch Archiving/lz4 network` and same for `zstd` and configure them to only build for SLE-12 in the project. And add a line to prjconf: `Prefer: gzip` OBS-URL: https://build.opensuse.org/request/show/1002273 OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=97 --- rsync.changes | 6 ++++++ rsync.spec | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/rsync.changes b/rsync.changes index 44ce0a9..8da154d 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 9 08:32:28 UTC 2022 - Bernhard Wiedemann + +- Build SLE version with g++-11 + to work around nondeterministic g++-7 (boo#1193895) + ------------------------------------------------------------------- Thu Sep 1 13:11:01 UTC 2022 - Stefan Schubert diff --git a/rsync.spec b/rsync.spec index 19b1af5..27060b4 100644 --- a/rsync.spec +++ b/rsync.spec @@ -22,6 +22,12 @@ %bcond_with xxhash %endif +%if 0%{?suse_version} < 1550 +%bcond_without gcc11 +%else +%bcond_with gcc11 +%endif + Name: rsync Version: 3.2.5 Release: 0 @@ -60,6 +66,9 @@ BuildRequires: zlib-devel %if %{with xxhash} BuildRequires: pkgconfig(libxxhash) >= 0.8.0 %endif +%if %{with gcc11} +BuildRequires: gcc11-c++ +%endif BuildRequires: pkgconfig(openssl) Requires(post): grep Requires(post): sed @@ -89,7 +98,12 @@ rm -f zlib/*.h %build autoreconf -fiv +%if %{with gcc11} +export CC=gcc-11 +export CXX=g++-11 +%endif export CFLAGS="%{optflags} -fPIC -DPIC -fPIE" +export CXXFLAGS="$CFLAGS" export LDFLAGS="-Wl,-z,relro,-z,now -fPIE -pie" %configure \ --with-included-popt=no \