Consolidate patches

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

1 files changed, 0 insertions, 141 deletions

diff --git a/9999/0011-Gentoo-add-with-extra-soversion-suffix-option.patch b/9999/0011-Gentoo-add-with-extra-soversion-suffix-option.patch
deleted file mode 100644
index cc9f0cc..0000000
--- a/9999/0011-Gentoo-add-with-extra-soversion-suffix-option.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From f1d34965ce140071bb77313bbca01914ace59e27 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Wed, 12 Sep 2018 23:44:29 +0100
-Subject: [PATCH 11/16] Gentoo: add --with-extra-soversion-suffix= option
-
---with-extra-soversion-suffix= will allow Gentoo to
-distinct libbfd.so and libopcodes.so to have more precise
-SONAME.
-
-Today --enable-targets=all and --enable-64-bit-bfd change
-libbfd.so ABI:
---enable-targets=all adds new symbols to the library
---enable-64-bit-bfd modifies BFD_ARCH_SIZE default and
-changes sizes of integer parameters and fields to most
-APIs.
-
---with-extra-soversion-suffix= will allow Gentoo to inject
-additional keys into SONAME to indicate ABI change and avoid
-hard to diagnose crashes when user reinstalls libbfd.so
-built with different flags (see https://bugs.gentoo.org/663690).
-
-Bug: https://bugs.gentoo.org/666100
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- bfd/Makefile.am  |  5 +++++
- bfd/Makefile.in  |  4 ++++
- bfd/configure    | 13 +++++++++++++
- bfd/configure.ac |  7 +++++++
- 4 files changed, 29 insertions(+)
-
-diff --git a/bfd/Makefile.am b/bfd/Makefile.am
-index b6088a3c4a..3f5cf81ca4 100644
---- a/bfd/Makefile.am
-+++ b/bfd/Makefile.am
-@@ -59,6 +59,8 @@ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h
- LIBDL = @lt_cv_dlopen_libs@
- endif
- 
-+EXTRA_SOVERSION_SUFFIX = @EXTRA_SOVERSION_SUFFIX@
-+
- # bfd.h goes here, for now
- BFD_H = bfd.h
- 
-@@ -958,6 +960,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
- 	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
- 	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
- 	fi ;\
-+	if test x"$(EXTRA_SOVERSION_SUFFIX)" != x ; then \
-+	  bfd_soversion="$${bfd_soversion}.$(EXTRA_SOVERSION_SUFFIX)" ;\
-+	fi ;\
- 	$(SED) -e "s,@bfd_version@,$$bfd_version," \
- 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
- 	    -e "s,@bfd_version_package@,$$bfd_version_package," \
-diff --git a/bfd/Makefile.in b/bfd/Makefile.in
-index dd3474d92b..911232212b 100644
---- a/bfd/Makefile.in
-+++ b/bfd/Makefile.in
-@@ -318,6 +318,7 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
-+EXTRA_SOVERSION_SUFFIX = @EXTRA_SOVERSION_SUFFIX@
- FGREP = @FGREP@
- GENCAT = @GENCAT@
- GMSGFMT = @GMSGFMT@
-@@ -2071,6 +2072,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
- 	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
- 	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
- 	fi ;\
-+	if test x"$(EXTRA_SOVERSION_SUFFIX)" != x ; then \
-+	  bfd_soversion="$${bfd_soversion}.$(EXTRA_SOVERSION_SUFFIX)" ;\
-+	fi ;\
- 	$(SED) -e "s,@bfd_version@,$$bfd_version," \
- 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
- 	    -e "s,@bfd_version_package@,$$bfd_version_package," \
-diff --git a/bfd/configure b/bfd/configure
-index 59b867bbbf..fa34069f2a 100755
---- a/bfd/configure
-+++ b/bfd/configure
-@@ -696,6 +696,7 @@ WARN_CFLAGS
- REPORT_BUGS_TEXI
- REPORT_BUGS_TO
- PKGVERSION
-+EXTRA_SOVERSION_SUFFIX
- DEBUGDIR
- PLUGINS_FALSE
- PLUGINS_TRUE
-@@ -833,6 +834,7 @@ enable_secureplt
- enable_separate_code
- enable_leading_mingw64_underscores
- with_separate_debug_dir
-+with_extra_soversion_suffix
- with_pkgversion
- with_bugurl
- enable_werror
-@@ -1508,6 +1510,8 @@ Optional Packages:
-   --with-separate-debug-dir=DIR
-                           Look for global separate debug info in DIR
-                           [[default=LIBDIR/debug]]
-+  --with-extra-soversion-suffix=SUFFIX
-+                          Append '.SUFFIX' to SONAME [default=]
-   --with-pkgversion=PKG   Use PKG in the version string in place of "GNU
-                           Binutils"
-   --with-bugurl=URL       Direct users to URL to report a bug
-@@ -12516,6 +12520,15 @@ fi
- 
- 
- 
-+EXTRA_SOVERSION_SUFFIX=
-+
-+# Check whether --with-extra-soversion-suffix was given.
-+if test "${with_extra_soversion_suffix+set}" = set; then :
-+  withval=$with_extra_soversion_suffix; EXTRA_SOVERSION_SUFFIX="${withval}"
-+fi
-+
-+
-+
- 
- 
- # Check whether --with-pkgversion was given.
-diff --git a/bfd/configure.ac b/bfd/configure.ac
-index 0528e54c3b..50b2b4e06e 100644
---- a/bfd/configure.ac
-+++ b/bfd/configure.ac
-@@ -133,6 +133,13 @@ AC_ARG_WITH(separate-debug-dir,
- [DEBUGDIR="${withval}"])
- AC_SUBST(DEBUGDIR)
- 
-+EXTRA_SOVERSION_SUFFIX=
-+AC_ARG_WITH(extra-soversion-suffix,
-+  AS_HELP_STRING([--with-extra-soversion-suffix=SUFFIX],
-+                 [Append '.SUFFIX' to SONAME [[default=]]]),
-+[EXTRA_SOVERSION_SUFFIX="${withval}"])
-+AC_SUBST(EXTRA_SOVERSION_SUFFIX)
-+
- ACX_PKGVERSION([GNU Binutils])
- ACX_BUGURL([http://www.sourceware.org/bugzilla/])
- 
--- 
-2.26.2
-