From ccfe1c015533c5c0467e31c9fd28d10986734515214a621b37da756681b59d93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Li=C5=A1ka?= <martin.liska@suse.com>
Date: Fri, 27 Jan 2023 18:30:55 +0000
Subject: [PATCH] Accepting request 1061532 from home:marxin:branches:devel:gcc

- Rebase binutils-2.40-branch.diff.gz as it includes fix for PR30043.
- Move libgprofng-related libraries to the proper locations (packages).
- Add --without=bootstrap for skipping of bootstrap (faster testing
  of the package).

OBS-URL: https://build.opensuse.org/request/show/1061532
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=431
---
 binutils-2.40-branch.diff.gz |  4 ++--
 binutils.changes             |  8 ++++++++
 binutils.spec                | 21 +++++++++++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/binutils-2.40-branch.diff.gz b/binutils-2.40-branch.diff.gz
index b0293c5..115b7e1 100644
--- a/binutils-2.40-branch.diff.gz
+++ b/binutils-2.40-branch.diff.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1a665aafb3325126cb862188e5463d477739cdd059aba73f3a7bedb8c22a015
-size 554
+oid sha256:27c2c2347d434e5912349e1c4c73db25c7a6ca1399036058b4ac8b20cf2cae74
+size 205870
diff --git a/binutils.changes b/binutils.changes
index c2c5e8f..6a5fea4 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan 27 09:56:13 UTC 2023 - Martin Liška <mliska@suse.cz>
+
+- Rebase binutils-2.40-branch.diff.gz as it includes fix for PR30043.
+- Move libgprofng-related libraries to the proper locations (packages).
+- Add --without=bootstrap for skipping of bootstrap (faster testing
+  of the package).
+
 -------------------------------------------------------------------
 Tue Jan 24 12:52:49 UTC 2023 - Richard Biener <rguenther@suse.com>
 
diff --git a/binutils.spec b/binutils.spec
index c486496..4504c16 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -72,6 +72,8 @@ Release:        0
 %bcond_with libalternatives
 %endif
 
+%bcond_without bootstrap
+
 #
 # RUN_TESTS
 %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?)
@@ -100,6 +102,13 @@ Release:        0
 %define build_multitarget 0
 %endif
 %define target_list aarch64 alpha armv5l armv6l armv7l armv8l avr pru epiphany hppa hppa64 i686 ia64 m68k mips powerpc powerpc64 powerpc64le riscv64 rx s390 s390x sh4 sparc sparc64 x86_64 xtensa
+
+%if %{suse_version} <= 1500
+%define build_gprofng 0
+%else
+%define build_gprofng 1
+%endif
+
 #
 #
 #
@@ -362,10 +371,12 @@ cd build-dir
 %endif
 	--enable-shared \
 %if %{suse_version} > 1500
+%if %{with bootstrap}
 	--enable-pgo-build=lto \
+%endif
 	--enable-colored-disassembly \
 %endif
-%if %{suse_version} <= 1500
+%if ! %build_gprofng
 	--disable-gprofng \
 %endif
 	--enable-obsolete \
@@ -520,6 +531,7 @@ chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
 rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
 rm %{buildroot}%{_libdir}/lib{bfd,opcodes,ctf,ctf-nobfd}.la
+rm -f %{buildroot}%{_libdir}/gprofng/lib*.{l,}a
 # Remove unwanted files to shut up rpm
 rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
 rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
@@ -644,6 +656,9 @@ fi;
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
 %{_libdir}/libsframe.so.*
+%if %build_gprofng
+%{_libdir}/libgprofng.so.*
+%endif
 %dir %{_libdir}/bfd-plugins
 %{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
@@ -687,6 +702,9 @@ fi;
 %{_libdir}/libctf.so
 %{_libdir}/libctf-nobfd.so
 %{_libdir}/libsframe.so
+%if %build_gprofng
+%{_libdir}/libgprofng.so
+%endif
 
 %files -n libctf0
 %defattr(-,root,root)
@@ -702,7 +720,6 @@ fi;
 %defattr(-,root,root)
 %dir %{_libdir}/gprofng/
 %{_libdir}/gprofng/lib*.so
-%{_libdir}/gprofng/lib*.so.*
 %{_distconfdir}/gprofng.rc
 %endif
 %endif