From 626064c69b6fd1b5cead6995097f99e5fbda3f19 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 24 Jan 2017 23:52:06 +0000 Subject: gcc/gcc-source: Move libcc1 manipulation into gcc-source Currently there is a race where if you build -cross-canadian without building gcc (target) you see QA errors about RPATHS. I've tracked this down to this manipulation where the target gcc recipe changes libcc1 in the shared sources directory. As long as you build things in the right order, the problem doesn't occur. Since its changing ${S} move it to gcc-source and avoid the race, saving RP some head scratching about why unrelated changes failed to build cleanly. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-source.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/recipes-devtools/gcc/gcc-source.inc') diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 0d0edb58f0..fab99f2d1e 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -26,6 +26,11 @@ python do_preconfigure () { bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure") subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) + + # Easiest way to stop bad RPATHs getting into the library since we have a + # broken libtool here (breaks cross-canadian and target at least) + cmd = d.expand("sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure") + subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) } addtask do_preconfigure after do_patch do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" -- cgit v1.2.3