mirror of
https://git.yoctoproject.org/poky
synced 2026-04-14 08:02:30 +02:00
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.
(From OE-Core rev: 626064c69b6fd1b5cead6995097f99e5fbda3f19)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -6,10 +6,4 @@ require gcc-target.inc
|
||||
# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output
|
||||
ARM_INSTRUCTION_SET_armv4 = "arm"
|
||||
|
||||
do_configure_prepend() {
|
||||
# Easiest way to stop bad RPATHs getting into the library since we have a
|
||||
# broken libtool here
|
||||
sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "nativesdk"
|
||||
|
||||
@@ -6,10 +6,4 @@ require gcc-target.inc
|
||||
# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output
|
||||
ARM_INSTRUCTION_SET_armv4 = "arm"
|
||||
|
||||
do_configure_prepend() {
|
||||
# Easiest way to stop bad RPATHs getting into the library since we have a
|
||||
# broken libtool here
|
||||
sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "nativesdk"
|
||||
|
||||
Reference in New Issue
Block a user