From bd27e81f1fa49e2770da9a4a65a83e9d4c3a0dd0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 24 Aug 2012 14:10:59 +0000 Subject: gcc-4.7: Add fix for libtool rpath problems This avoids problems with libstdc++ having bad rpaths (/usr/lib/../.lib) in its .la file. See the patch for more information. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.7/libtool.patch | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.7/libtool.patch (limited to 'meta/recipes-devtools/gcc/gcc-4.7/libtool.patch') diff --git a/meta/recipes-devtools/gcc/gcc-4.7/libtool.patch b/meta/recipes-devtools/gcc/gcc-4.7/libtool.patch new file mode 100644 index 0000000000..9580b23d8e --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.7/libtool.patch @@ -0,0 +1,29 @@ +libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64 +when running on am x86_64 build host. + +This patch stops this speading to libdir in the libstdc++.la file within libtool. +Aguably, it shouldn't be passing this into libtool in the first place but +for now this resolves the nastiest problems this causes. + +func_normal_abspath would resolve an empty path to `pwd` so we need +to filter the zero case. + +RP 2012/8/24 + +Upstream-Status: Pending + +Index: git/ltmain.sh +=================================================================== +--- git.orig/ltmain.sh 2012-08-24 11:45:58.597087961 +0000 ++++ git/ltmain.sh 2012-08-24 12:18:37.961042581 +0000 +@@ -6359,6 +6359,10 @@ + func_warning "ignoring multiple \`-rpath's for a libtool library" + + install_libdir="$1" ++ if test -n "$install_libdir"; then ++ func_normal_abspath "$install_libdir" ++ install_libdir=$func_normal_abspath_result ++ fi + + oldlibs= + if test -z "$rpath"; then -- cgit v1.2.3