From bfaeda03beeaae3ba265632f0bcfa3354e55766a Mon Sep 17 00:00:00 2001
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Fri, 13 Aug 2010 17:08:19 -0700
Subject: binutils: fix the installed location of libiberty.a file

This fixes:
  [BUGID #209]

the libiberty was getting installed in usr/lib/lib64 path which was
leaving prelink-native recipe wondering where to get libiberty.
  Fix the path and prelink-native recipe is building fine now.

Patch added:
 libiberty_path_fix.patch
---
 .../binutils-2.20.1/libiberty_path_fix.patch         | 20 ++++++++++++++++++++
 meta/packages/binutils/binutils_2.20.1.bb            |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 meta/packages/binutils/binutils-2.20.1/libiberty_path_fix.patch

diff --git a/meta/packages/binutils/binutils-2.20.1/libiberty_path_fix.patch b/meta/packages/binutils/binutils-2.20.1/libiberty_path_fix.patch
new file mode 100644
index 000000000..36a14d7a1
--- /dev/null
+++ b/meta/packages/binutils/binutils-2.20.1/libiberty_path_fix.patch
@@ -0,0 +1,20 @@
+don't let the distro compiler point to the wrong installation location
+
+Thanks to RP for helping find the source code causing the issue.
+
+2010/08/13
+Nitin A Kamble <nitin.a.kamble@intel.com>
+Index: binutils-2.20.1/libiberty/Makefile.in
+===================================================================
+--- binutils-2.20.1.orig/libiberty/Makefile.in
++++ binutils-2.20.1/libiberty/Makefile.in
+@@ -327,7 +327,8 @@ install: install_to_$(INSTALL_DEST) inst
+ # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
+ # default multilib, so we have to take CFLAGS into account as well,
+ # since it will be passed the multilib flags.
+-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
++#MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
++MULTIOSDIR = ""
+ install_to_libdir: all
+ 	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
+ 	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
diff --git a/meta/packages/binutils/binutils_2.20.1.bb b/meta/packages/binutils/binutils_2.20.1.bb
index 88a3dec28..d5cd985cc 100644
--- a/meta/packages/binutils/binutils_2.20.1.bb
+++ b/meta/packages/binutils/binutils_2.20.1.bb
@@ -1,6 +1,6 @@
 require binutils.inc
 
-PR = "r1"
+PR = "r2"
 
 LIC_FILES_CHKSUM="\
     file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
@@ -26,6 +26,7 @@ SRC_URI = "\
      file://binutils-x86_64_i386_biarch.patch \
      file://binutils-mips-pie.patch \
      file://binutils-libtool.patch \
+     file://libiberty_path_fix.patch \
      "
 
 # powerpc patches
-- 
cgit v1.2.3