From: Martin Liska <mliska@suse.cz>
Date: Wed, 10 Jul 2019 13:31:21 +0000 (+0200)
Subject: Fix lto-bytecode errors:
X-Git-Tag: 0.7.6~10^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F336%2Fhead;p=thirdparty%2Flibsolv.git

Fix lto-bytecode errors:

[  250s] libsolv-devel.x86_64: E: lto-bytecode (Badness: 10000) /usr/lib64/libsolv.a
[  250s] libsolv-devel.x86_64: E: lto-bytecode (Badness: 10000) /usr/lib64/libsolvext.a

- Add -ffat-lto-objects to $optflags as the package provides
  static libraries
- Remove NO_BRP_STRIP_DEBUG=true as brp-15-strip-debug will
  not strip debug info for archives
---

diff --git a/package/libsolv.changes b/package/libsolv.changes
index 0e2ad720..ddde8e24 100644
--- a/package/libsolv.changes
+++ b/package/libsolv.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 10 07:48:10 UTC 2019 - Martin Liška <mliska@suse.cz>
+
+- Add -ffat-lto-objects to $optflags as the package provides
+  static libraries
+- Remove NO_BRP_STRIP_DEBUG=true as brp-15-strip-debug will
+  not strip debug info for archives
+
 -------------------------------------------------------------------
 Thu Jun 13 16:15:39 CEST 2019 - mls@suse.de
 
diff --git a/package/libsolv.spec.in b/package/libsolv.spec.in
index 40d266a8..b8985d5e 100644
--- a/package/libsolv.spec.in
+++ b/package/libsolv.spec.in
@@ -207,6 +207,7 @@ Perl bindings for libsolv.
 %setup -q
 
 %build
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 export CFLAGS="%{optflags}"
 export CXXFLAGS="$CFLAGS"
 
@@ -257,10 +258,6 @@ ln -s repo2solv %{buildroot}/%{_bindir}/repo2solv.sh
 %py3_compile %{buildroot}/%{python3_sitearch}
 %endif
 %endif
-%if %{with static}
-# we want to leave the .a file untouched
-export NO_BRP_STRIP_DEBUG=true
-%endif
 
 %check
 make ARGS=--output-on-failure test