toolchain-binutils.eclass: use our libdir/includedir paths w/cross-compilers #562460

Upstream tried to make the default install of bfd/opcodes libs and
headers a bit smoother when dealing with cross-compilers (so native
and cross files wouldn't collide), but they ended up breaking cases
where the package builder already took care of using unique paths.
Force the builds to use our configure paths to avoid that.

URL: https://www.sourceware.org/ml/binutils/2002-05/msg00184.html

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 08024cc91f1c6fc11b4b0ba9f9f1e8b526499013..9d513ad0c4de1cc3938231069592389d69ab4247 100644 (file)
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -164,6 +164,13 @@ tc-binutils_apply_patches() {
                        fi
                fi
                [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}"
+
+               # Make sure our explicit libdir paths don't get clobbered. #562460
+               sed -i \
+                       -e 's:@bfdlibdir@:@libdir@:g' \
+                       -e 's:@bfdincludedir@:@includedir@:g' \
+                       {bfd,opcodes}/Makefile.in || die
+
                epatch_user
        fi