diff --git a/binutils-2.22.52.0.1-export-demangle.h.patch b/binutils-2.22.52.0.1-export-demangle.h.patch new file mode 100644 index 0000000..9a9f3fa --- /dev/null +++ b/binutils-2.22.52.0.1-export-demangle.h.patch @@ -0,0 +1,57 @@ +*** ../binutils-2.22.52.0.1.orig/bfd/Makefile.am 2012-03-06 14:00:33.229957572 +0000 +--- bfd/Makefile.am 2012-04-27 16:46:05.410974817 +0100 +*************** if INSTALL_LIBBFD +*** 18,24 **** + bfdlibdir = @bfdlibdir@ + bfdincludedir = @bfdincludedir@ + bfdlib_LTLIBRARIES = libbfd.la +! bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h + else !INSTALL_LIBBFD + # Empty these so that the respective installation directories will not be created. + bfdlibdir = +--- 18,24 ---- + bfdlibdir = @bfdlibdir@ + bfdincludedir = @bfdincludedir@ + bfdlib_LTLIBRARIES = libbfd.la +! bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h + else !INSTALL_LIBBFD + # Empty these so that the respective installation directories will not be created. + bfdlibdir = +*** ../binutils-2.22.52.0.1.orig/bfd/Makefile.in 2012-03-06 14:00:32.952957600 +0000 +--- bfd/Makefile.in 2012-04-27 16:46:19.718975214 +0100 +*************** RECURSIVE_TARGETS = all-recursive check- +*** 138,144 **** + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive + am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \ +! $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h + HEADERS = $(bfdinclude_HEADERS) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +--- 138,145 ---- + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive + am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \ +! $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h \ +! $(INCDIR)/demangle.h + HEADERS = $(bfdinclude_HEADERS) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +*************** libbfd_la_LDFLAGS = $(am__append_1) -rel +*** 331,337 **** + @INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2) + @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \ + @INSTALL_LIBBFD_TRUE@ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ +! @INSTALL_LIBBFD_TRUE@ $(INCDIR)/bfdlink.h $(am__append_2) + @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@ + @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la + AM_CFLAGS = $(WARN_CFLAGS) +--- 332,339 ---- + @INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2) + @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \ + @INSTALL_LIBBFD_TRUE@ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ +! @INSTALL_LIBBFD_TRUE@ $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h \ +! @INSTALL_LIBBFD_TRUE@ $(am__append_2) + @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@ + @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la + AM_CFLAGS = $(WARN_CFLAGS) diff --git a/binutils.spec b/binutils.spec index 1131968..8229d43 100644 --- a/binutils.spec +++ b/binutils.spec @@ -17,7 +17,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.22.52.0.1 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -49,6 +49,8 @@ Patch12: binutils-2.22.52.0.1-x86_64-hidden-ifunc.patch Patch13: binutils-2.22.52.0.1-tsx.patch # From upstream Patch14: binutils-2.22.52.0.1-hidden-ifunc.patch +# Soon to be from upstream +Patch15: binutils-2.22.52.0.1-export-demangle.h.patch %define gold_arches %ix86 x86_64 @@ -155,6 +157,7 @@ using libelf instead of BFD. %patch12 -p0 -b .x86_64-hidden-ifunc~ %patch13 -p0 -b .tsx~ %patch14 -p0 -b .hidden-ifunc~ +%patch15 -p0 -b .export-demangle-h~ # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -449,6 +452,9 @@ exit 0 %endif # %{isnative} %changelog +* Fri Apr 27 2012 Nick Clifton - 2.22.52.0.1-12 +- Include demangle.h in the devel rpm. + %if 0%{?rhel} >= 7 * Tue Apr 03 2012 Nick Clifton - 2.22.52.0.1-11 - Enable -zrelro by default for RHEL 7+. (#807831)