diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-04-02 05:23:53 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-04-04 16:38:59 +0300 |
| commit | 001113296d3300ffaf6b6d1578a4232dbf2695c8 (patch) | |
| tree | 14ddda5f75227063a7dea14becfecda14e67c500 /import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-6.4/0024-libtool.patch | |
| parent | 211ccf33fb57ddede03d26cf7cb05924d039b2df (diff) | |
| download | openbmc-001113296d3300ffaf6b6d1578a4232dbf2695c8.tar.xz | |
Rocko refresh
poky: 0ec241873367e18f5371a3ad9aca1e2801dcd4ee
meta-openembbeded: dacfa2b1920e285531bec55cd2f08743390aaf57
meta-virtualization: bd77388f31929f38e7d4cc9c711f0f83f563007e
meta-raspberrypi: b58ccfc696e4fa6b680ae5ca79960312676d7af9
Tested: Built witherspoon, palmetto and qemu images
Change-Id: I934ff48674042bb5ce6b7d75642e7adb9668a409
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-6.4/0024-libtool.patch')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-6.4/0024-libtool.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-6.4/0024-libtool.patch b/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-6.4/0024-libtool.patch new file mode 100644 index 0000000000..1f73b5db5a --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-6.4/0024-libtool.patch @@ -0,0 +1,42 @@ +From 6c0aa5c2538829248547197718037ff0b9788676 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 29 Mar 2013 09:29:11 +0400 +Subject: [PATCH 24/46] libtool + +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. +Arguably, 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 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending +--- + ltmain.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec8..0121fba 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -6359,6 +6359,10 @@ func_mode_link () + 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 +-- +2.8.2 + |