gcc-configure-common.inc: sed <sysroot>/usr/include hardcodes paths to use target_includedir
PATCH 1/1 gcc-configure-common.inc: sed <sysroot>/usr/include hardcodes paths to use target_includedir
This fixes the problem where gcc fails to detect presence of libssp
and does not detect powerpc long double 128 bit support correctly on systems which do not use common <sysroot>/usr/include paths like we have in micro distro
Signed-off-by Khem Raj <[email protected]>
--- recipes/gcc/gcc-4.1.0.inc | 2 +- recipes/gcc/gcc-4.1.1.inc | 2 +- recipes/gcc/gcc-4.1.2.inc | 2 +- recipes/gcc/gcc-4.2.1.inc | 2 +- recipes/gcc/gcc-4.2.2.inc | 2 +- recipes/gcc/gcc-4.2.3.inc | 2 +- recipes/gcc/gcc-4.2.4.inc | 2 +- recipes/gcc/gcc-4.3.1.inc | 2 +- recipes/gcc/gcc-4.3.2.inc | 2 +- recipes/gcc/gcc-4.3.3.inc | 2 +- recipes/gcc/gcc-4.3.4.inc | 2 +- recipes/gcc/gcc-4.4.1.inc | 2 +- recipes/gcc/gcc-4.4.2.inc | 2 +- recipes/gcc/gcc-4.4.4.inc | 2 +- recipes/gcc/gcc-4.5.inc | 2 +- recipes/gcc/gcc-configure-common.inc | 9 ++++++++- 16 files changed, 23 insertions(+), 16 deletions(-)
recipes/gcc/gcc-4.1.0.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r13" +INC_PR = "r14" DEFAULT_PREFERENCE = "-1"
recipes/gcc/gcc-4.1.1.inc +1 -1
@@ -3,7 +3,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r4" +INC_PR = "r5" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \
recipes/gcc/gcc-4.1.2.inc +1 -1
@@ -5,7 +5,7 @@ NATIVEDEPS = "mpfr-native gmp-native" COMPATIBLE_TARGET_SYS = "." -INC_PR = "r25" +INC_PR = "r26" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \
recipes/gcc/gcc-4.2.1.inc +1 -1
@@ -3,7 +3,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r23" +INC_PR = "r24" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \
recipes/gcc/gcc-4.2.2.inc +1 -1
@@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r19" +INC_PR = "r20" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \
recipes/gcc/gcc-4.2.3.inc +1 -1
@@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r20" +INC_PR = "r21" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \
recipes/gcc/gcc-4.2.4.inc +1 -1
@@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r14" +INC_PR = "r15" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \
recipes/gcc/gcc-4.3.1.inc +1 -1
@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r24" +INC_PR = "r25" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
recipes/gcc/gcc-4.3.2.inc +1 -1
@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r14" +INC_PR = "r15" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
recipes/gcc/gcc-4.3.3.inc +1 -1
@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r19" +INC_PR = "r20" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
recipes/gcc/gcc-4.3.4.inc +1 -1
@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r13" +INC_PR = "r14" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
recipes/gcc/gcc-4.4.1.inc +1 -1
@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
recipes/gcc/gcc-4.4.2.inc +1 -1
@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r5" +INC_PR = "r6" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
recipes/gcc/gcc-4.4.4.inc +1 -1
@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r6" +INC_PR = "r7" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc444tarbz2 \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
recipes/gcc/gcc-4.5.inc +1 -1
@@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r18" +INC_PR = "r19" SRCREV = "166342" PV = "4.5"
recipes/gcc/gcc-configure-common.inc +8 -1
@@ -93,7 +93,14 @@ do_configure () { sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.tpl (cd ${S} && gnu-configize) || die "failure running gnu-configize" - + # gcc assumes ${sysroot}/usr to be prefix on linux targets + # but we have distro option to flatten out the tree and micro + # uses root file system without leading /usr so we need to + # teach gcc configure to look in correct include paths + # unfortunately there is no configure knob to indicate this + # to configury hence the sed :( + sed -i 's:/usr/include:${target_includedir}:g' ${S}/gcc/configure.ac + sed -i 's:/usr/include:${target_includedir}:g' ${S}/gcc/configure if [ "${HOST_SYS}" != "${TARGET_SYS}" ]; then # splice our idea of where the headers live into gcc's world echo "NATIVE_SYSTEM_HEADER_DIR = ${target_includedir}" > ${T}/t-oe
Signature · 1 line
1.7.1
Quoted 5 lines · Khem Raj
This fixes the problem where gcc fails to detect presence of libssp
and does not detect powerpc long double 128 bit support correctly on systems which do not use common <sysroot>/usr/include paths like we have in micro distroSigned-off-by Khem Raj <[email protected]>
Acked-by Tom Rini <[email protected]>
Quoted 233 lines
--- recipes/gcc/gcc-4.1.0.inc | 2 +- recipes/gcc/gcc-4.1.1.inc | 2 +- recipes/gcc/gcc-4.1.2.inc | 2 +- recipes/gcc/gcc-4.2.1.inc | 2 +- recipes/gcc/gcc-4.2.2.inc | 2 +- recipes/gcc/gcc-4.2.3.inc | 2 +- recipes/gcc/gcc-4.2.4.inc | 2 +- recipes/gcc/gcc-4.3.1.inc | 2 +- recipes/gcc/gcc-4.3.2.inc | 2 +- recipes/gcc/gcc-4.3.3.inc | 2 +- recipes/gcc/gcc-4.3.4.inc | 2 +- recipes/gcc/gcc-4.4.1.inc | 2 +- recipes/gcc/gcc-4.4.2.inc | 2 +- recipes/gcc/gcc-4.4.4.inc | 2 +- recipes/gcc/gcc-4.5.inc | 2 +- recipes/gcc/gcc-configure-common.inc | 9 ++++++++- 16 files changed, 23 insertions(+), 16 deletions(-)recipes/gcc/gcc-4.1.0.inc +1
-1@@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r13" +INC_PR = "r14" DEFAULT_PREFERENCE = "-1"recipes/gcc/gcc-4.1.1.inc +1
-1@@ -3,7 +3,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r4" +INC_PR = "r5" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \recipes/gcc/gcc-4.1.2.inc +1
-1@@ -5,7 +5,7 @@ NATIVEDEPS = "mpfr-native gmp-native" COMPATIBLE_TARGET_SYS = "." -INC_PR = "r25" +INC_PR = "r26" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \recipes/gcc/gcc-4.2.1.inc +1
-1@@ -3,7 +3,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r23" +INC_PR = "r24" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \recipes/gcc/gcc-4.2.2.inc +1
-1@@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r19" +INC_PR = "r20" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \recipes/gcc/gcc-4.2.3.inc +1
-1@@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r20" +INC_PR = "r21" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \recipes/gcc/gcc-4.2.4.inc +1
-1@@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r14" +INC_PR = "r15" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \recipes/gcc/gcc-4.3.1.inc +1
-1@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r24" +INC_PR = "r25" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \recipes/gcc/gcc-4.3.2.inc +1
-1@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r14" +INC_PR = "r15" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \recipes/gcc/gcc-4.3.3.inc +1
-1@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r19" +INC_PR = "r20" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \recipes/gcc/gcc-4.3.4.inc +1
-1@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r13" +INC_PR = "r14" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \recipes/gcc/gcc-4.4.1.inc +1
-1@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \recipes/gcc/gcc-4.4.2.inc +1
-1@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r5" +INC_PR = "r6" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \recipes/gcc/gcc-4.4.4.inc +1
-1@@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r6" +INC_PR = "r7" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc444tarbz2 \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \recipes/gcc/gcc-4.5.inc +1
-1@@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r18" +INC_PR = "r19" SRCREV = "166342" PV = "4.5"recipes/gcc/gcc-configure-common.inc +8
-1@@ -93,7 +93,14 @@ do_configure () { sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.tpl (cd ${S} && gnu-configize) || die "failure running gnu-configize" - + # gcc assumes ${sysroot}/usr to be prefix on linux targets + # but we have distro option to flatten out the tree and micro + # uses root file system without leading /usr so we need to + # teach gcc configure to look in correct include paths + # unfortunately there is no configure knob to indicate this + # to configury hence the sed :( + sed -i 's:/usr/include:${target_includedir}:g' ${S}/gcc/configure.ac + sed -i 's:/usr/include:${target_includedir}:g' ${S}/gcc/configure if [ "${HOST_SYS}" != "${TARGET_SYS}" ]; then # splice our idea of where the headers live into gcc's world echo "NATIVE_SYSTEM_HEADER_DIR = ${target_includedir}" > ${T}/t-oe
Signature · 2 lines
Tom Rini Mentor Graphics Corporation