From 03d8ab7d71176b80b20abb3309be3c294717676e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 23 Nov 2015 05:16:04 -0500 Subject: 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 --- eclass/toolchain-binutils.eclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 08024cc91f1c..9d513ad0c4de 100644 --- 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 -- cgit v1.2.3-18-g5258