binutils: Update the poison patch

[BUGID #374]

Previously the poison directories patch was present, but not enabled due
to the lack of the configure option being set, and also the fact configure
itself was not being patched.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

2 files changed, 86 insertions, 45 deletions

diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch
index aefd3c3727..c2f19276f8 100644
--- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch
@@ -4,50 +4,50 @@ purpose:  warn for uses of system directories when cross linking
 
 Signed-Off-By: Mark Hatle <mark.hatle@windriver.com>
 
-Code Merged from Sourcery G++ binutils 2.19 - 4.4-277

-

-2008-07-02  Joseph Myers  <joseph@codesourcery.com>

-

-        ld/

-        * ld.h (args_type): Add error_poison_system_directories.

-        * ld.texinfo (--error-poison-system-directories): Document.

-        * ldfile.c (ldfile_add_library_path): Check

-        command_line.error_poison_system_directories.

-        * ldmain.c (main): Initialize

-        command_line.error_poison_system_directories.

-        * lexsup.c (enum option_values): Add

-        OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.

-        (ld_options): Add --error-poison-system-directories.

-        (parse_args): Handle new option.        

-

-2007-06-13  Joseph Myers  <joseph@codesourcery.com>

-

-        ld/

-        * config.in: Regenerate.

-        * ld.h (args_type): Add poison_system_directories.

-        * ld.texinfo (--no-poison-system-directories): Document.

-        * ldfile.c (ldfile_add_library_path): Check

-        command_line.poison_system_directories.

-        * ldmain.c (main): Initialize

-        command_line.poison_system_directories.

-        * lexsup.c (enum option_values): Add

-        OPTION_NO_POISON_SYSTEM_DIRECTORIES.

-        (ld_options): Add --no-poison-system-directories.

-        (parse_args): Handle new option.

-

-2007-04-20  Joseph Myers  <joseph@codesourcery.com>

-

-        Merge from Sourcery G++ binutils 2.17:

-

-        2007-03-20  Joseph Myers  <joseph@codesourcery.com>

-        Based on patch by Mark Hatle <mark.hatle@windriver.com>.

-        ld/

-        * configure.in (--enable-poison-system-directories): New option.

-        * configure, config.in: Regenerate.

-        * ldfile.c (ldfile_add_library_path): If

-        ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,

-        /usr/lib, /usr/local/lib or /usr/X11R6/lib.

-

+Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
+
+2008-07-02  Joseph Myers  <joseph@codesourcery.com>
+
+        ld/
+        * ld.h (args_type): Add error_poison_system_directories.
+        * ld.texinfo (--error-poison-system-directories): Document.
+        * ldfile.c (ldfile_add_library_path): Check
+        command_line.error_poison_system_directories.
+        * ldmain.c (main): Initialize
+        command_line.error_poison_system_directories.
+        * lexsup.c (enum option_values): Add
+        OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
+        (ld_options): Add --error-poison-system-directories.
+        (parse_args): Handle new option.        
+
+2007-06-13  Joseph Myers  <joseph@codesourcery.com>
+
+        ld/
+        * config.in: Regenerate.
+        * ld.h (args_type): Add poison_system_directories.
+        * ld.texinfo (--no-poison-system-directories): Document.
+        * ldfile.c (ldfile_add_library_path): Check
+        command_line.poison_system_directories.
+        * ldmain.c (main): Initialize
+        command_line.poison_system_directories.
+        * lexsup.c (enum option_values): Add
+        OPTION_NO_POISON_SYSTEM_DIRECTORIES.
+        (ld_options): Add --no-poison-system-directories.
+        (parse_args): Handle new option.
+
+2007-04-20  Joseph Myers  <joseph@codesourcery.com>
+
+        Merge from Sourcery G++ binutils 2.17:
+
+        2007-03-20  Joseph Myers  <joseph@codesourcery.com>
+        Based on patch by Mark Hatle <mark.hatle@windriver.com>.
+        ld/
+        * configure.in (--enable-poison-system-directories): New option.
+        * configure, config.in: Regenerate.
+        * ldfile.c (ldfile_add_library_path): If
+        ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
+        /usr/lib, /usr/local/lib or /usr/X11R6/lib.
+
 Index: binutils-2.20.1/ld/config.in
 ===================================================================
 --- binutils-2.20.1.orig/ld/config.in
@@ -211,3 +211,43 @@ Index: binutils-2.20.1/ld/lexsup.c
         }
      }
  
+diff -ur binutils-2.20.1.orig/ld/configure binutils-2.20.1/ld/configure
+--- binutils-2.20.1.orig/ld/configure   2010-03-03 08:06:22.000000000 -0600
++++ binutils-2.20.1/ld/configure        2010-09-30 11:19:35.776990594 -0500
+@@ -901,6 +904,7 @@
+ enable_targets
+ enable_64_bit_bfd
+ with_sysroot
++enable_poison_system_directories
+ enable_got
+ enable_werror
+ enable_build_warnings
+@@ -1548,6 +1552,8 @@
+                          (and sometimes confusing) to the casual installer
+   --enable-targets        alternative target configurations
+   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
++  --enable-poison-system-directories
++                          warn for use of native system library directories
+   --enable-got=<type>     GOT handling scheme (target, single, negative,
+                           multigot)
+   --enable-werror         treat compile warnings as errors
+@@ -4302,6 +4334,19 @@
+ 
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" = "xyes"; then
++
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++
++fi
++
+ # Check whether --enable-got was given.
+ if test "${enable_got+set}" = set; then :
+   enableval=$enable_got; case "${enableval}" in
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc
index 4eeb6584c9..8c75e4ffe7 100644
--- a/meta/recipes-devtools/binutils/binutils-cross.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross.inc
@@ -4,7 +4,8 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
                 --program-prefix=${TARGET_PREFIX} \
                 --disable-install-libbfd \
-                --disable-werror"
+                --disable-werror \
+                --enable-poison-system-directories"
 
 do_install () {
         oe_runmake 'DESTDIR=${D}' install