From 885935ba893c651f0a2504df7458f7ceadffbe41 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Fri, 9 Mar 2012 16:09:12 +0000 Subject: [PATCH] binutils: pull a patch from Yocto to fix path issue of libiberty without the fix, following error appears when build native packages which require libierty.a: /usr/bin/ld: cannot find -liberty Signed-off-by: Zhenhua Luo --- .../binutils/binutils-fsl.inc | 3 ++- .../binutils/files/libiberty_path_fix.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 meta-fsl-ppc/recipes-devtools/binutils/files/libiberty_path_fix.patch diff --git a/meta-fsl-ppc/recipes-devtools/binutils/binutils-fsl.inc b/meta-fsl-ppc/recipes-devtools/binutils/binutils-fsl.inc index e425d42a..88b5eac5 100644 --- a/meta-fsl-ppc/recipes-devtools/binutils/binutils-fsl.inc +++ b/meta-fsl-ppc/recipes-devtools/binutils/binutils-fsl.inc @@ -3,8 +3,9 @@ SRC_URI = "\ file://bin.e5500.patch \ file://bin.e6500-2.patch \ file://bin.e500mc_nop.patch \ + file://libiberty_path_fix.patch \ " FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -PR .= "+${DISTRO}.0" +PR .= "+${DISTRO}.1" diff --git a/meta-fsl-ppc/recipes-devtools/binutils/files/libiberty_path_fix.patch b/meta-fsl-ppc/recipes-devtools/binutils/files/libiberty_path_fix.patch new file mode 100644 index 00000000..3772dfbe --- /dev/null +++ b/meta-fsl-ppc/recipes-devtools/binutils/files/libiberty_path_fix.patch @@ -0,0 +1,22 @@ +Upstream-Status: Inappropriate [embedded specific] + +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 +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 -- 2.40.1