[binutils] Disable checks that config.h is included before system headers. Resolves: 845084

[Nicholas Clifton]

commit 900d65c3da881c2ec0037dbe69f0dcd4167c6104
Author: Nick Clifton <nickc at redhat.com>
Date:   Thu Aug 2 11:23:36 2012 +0100

    Disable checks that config.h is included before system headers.
    Resolves: 845084

 .gitignore                                   |   21 +++++++++--------
 binutils-2.22.52.0.4-no-config-h-check.patch |   32 ++++++++++++++++++++++++++
 binutils.spec                                |   10 ++++++-
 3 files changed, 51 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 12124da..5701614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
-binutils-2.20.51.0.7.tar.bz2
-binutils-2.20.51.0.7
-binutils-2.22.52.0.3
+binutils-2.20.51.0.7/
+binutils-2.22.52.0.1/
+binutils-2.22.52.0.3/
+binutils-2.22.52.0.4/
 i386
 i686
-binutils-2.20.51.0.10.tar.bz2
+/binutils-2.20.51.0.7.tar.bz2
+/binutils-2.20.51.0.10.tar.bz2
 /binutils-2.20.51.0.11.tar.bz2
 /binutils-2.20.51.0.12.tar.bz2
 /binutils-2.21.51.0.5.tar.bz2
@@ -12,15 +14,14 @@ binutils-2.20.51.0.10.tar.bz2
 /binutils-2.21.51.0.8.tar.bz2
 /binutils-2.21.51.0.9.tar.bz2
 /binutils-2.21.52.0.1.tar.bz2
+/binutils-2.22.52.0.2.tar.bz2
 /binutils-2.21.53.0.1.tar.bz2
 /binutils-2.21.53.0.2.tar.bz2
-/binutils-2.22.tar.bz2
-/binutils-2.22.52.0.1.tar.bz2
-/binutils-2.22.52.0.2.tar.bz2
 /binutils-2.22.52.0.3.tar.bz2
-*.log
+/binutils-2.22.52.0.4.tar.bz2
+/binutils-2.22.tar.bz2
+.build-*
 *.src.rpm
+*.log
 HOWTO
 build-sources
-/binutils-2.22.52.0.4.tar.bz2
-binutils-2.22.52.0.4/
diff --git a/binutils-2.22.52.0.4-no-config-h-check.patch b/binutils-2.22.52.0.4-no-config-h-check.patch
new file mode 100644
index 0000000..2fc32e3
--- /dev/null
+++ b/binutils-2.22.52.0.4-no-config-h-check.patch
@@ -0,0 +1,32 @@
+*** ../binutils-2.22.52.0.4.orig/bfd/bfd-in.h	2012-08-02 10:56:34.561769686 +0100
+--- bfd/bfd-in.h	2012-08-02 11:13:27.134797755 +0100
+***************
+*** 25,35 ****
+  #ifndef __BFD_H_SEEN__
+  #define __BFD_H_SEEN__
+  
+- /* PR 14072: Ensure that config.h is included first.  */
+- #if !defined PACKAGE && !defined PACKAGE_VERSION
+- #error config.h must be included before this header
+- #endif
+- 
+  #ifdef __cplusplus
+  extern "C" {
+  #endif
+--- 25,30 ----
+*** ../binutils-2.22.52.0.4.orig/bfd/bfd-in2.h	2012-08-02 10:56:34.349769680 +0100
+--- bfd/bfd-in2.h	2012-08-02 11:13:40.015798113 +0100
+***************
+*** 32,42 ****
+  #ifndef __BFD_H_SEEN__
+  #define __BFD_H_SEEN__
+  
+- /* PR 14072: Ensure that config.h is included first.  */
+- #if !defined PACKAGE && !defined PACKAGE_VERSION
+- #error config.h must be included before this header
+- #endif
+- 
+  #ifdef __cplusplus
+  extern "C" {
+  #endif
+--- 32,37 ----
diff --git a/binutils.spec b/binutils.spec
index 0d4ceb8..59dd84a 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.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -44,8 +44,10 @@ Patch10: binutils-2.22.52.0.4-dwz.patch
 Patch11: binutils-2.22.52.0.4-ar-4Gb.patch
 # Import of patch for FSF PR #14189
 Patch12: binutils-2.22.52.0.4-arm-plt-refcount.patch
-# Potential patch to fix BZ835957
+# Use 64-bit symbox index tables in s390 archives.  BZ #835957
 Patch13: binutils-2.22.52.0.4-s390-64bit-archive.patch
+# Disable checks that config.h has been included before system headers.  BZ #845084
+Patch14: binutils-2.22.52.0.4-no-config-h-check.patch
 
 %define gold_arches %ix86 x86_64
 
@@ -151,6 +153,7 @@ using libelf instead of BFD.
 %patch11 -p0 -b .ar4Gb~
 %patch12 -p0 -b .arm-plt-refcount~
 %patch13 -p0 -b .s390-64bit-archive~
+%patch14 -p0 -b .no-config-h-check~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -445,6 +448,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Thu Aug 02 2012 Nick Clifton <nickc at redhat.com> - 2.22.52.0.4-7
+- Disable checks that config.h is included before system headers.  (#845084)
+
 * Tue Jul 17 2012 Nick Clifton <nickc at redhat.com> - 2.22.52.0.4-6
 - Use 64bit indicies in archives for s390 binaries.  (#835957)