[oe-commits] org.oe.dev gcc4-sdk: Use sysroot to workaround various path problems with external toolchains (from Poky)

[rpurdie commit]

gcc4-sdk: Use sysroot to workaround various path problems with external toolchains (from Poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 35178105537047e48df3d1d6815915cd669db7b2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=35178105537047e48df3d1d6815915cd669db7b2
Files:
1
packages/gcc/gcc-cross-sdk_3.4.4.bb
packages/gcc/gcc-cross-sdk_4.1.0.bb
packages/gcc/gcc-cross-sdk_4.1.1.bb
packages/gcc/gcc-cross-sdk_4.1.2.bb
packages/gcc/gcc4-build-sdk.inc
Diffs:

#
# mt diff -r5941cc71453964925ef4ade7c93b8347ad92c2b7 -r35178105537047e48df3d1d6815915cd669db7b2
#
# 
# 
# patch "packages/gcc/gcc-cross-sdk_3.4.4.bb"
#  from [fa5ca4ad0eaf2ec0fa465b06f463bee485c52b64]
#    to [ffaafb6a6ef931a5cd71c7623aba38189dc94161]
# 
# patch "packages/gcc/gcc-cross-sdk_4.1.0.bb"
#  from [7eb85e54952c596416152f1e969d0bd613f44447]
#    to [2cea3da097f8c9f838e82a3e085426ce0916af21]
# 
# patch "packages/gcc/gcc-cross-sdk_4.1.1.bb"
#  from [02ea95e063fa7ba063dc7824231550515b11b651]
#    to [6837a925b54454ab71c724293d0af79096445b3a]
# 
# patch "packages/gcc/gcc-cross-sdk_4.1.2.bb"
#  from [1eec9c99dd94a9914c2db2ccb6a1be346b5c492c]
#    to [55ce0a11feb44ce43df3155213413eda911bc8b1]
# 
# patch "packages/gcc/gcc4-build-sdk.inc"
#  from [9346ade760bf1914b9aef9ef6701465c2001aef9]
#    to [803d124f9bdd702633e7820806cfc41d7703ddc8]
# 
============================================================
--- packages/gcc/gcc-cross-sdk_3.4.4.bb	fa5ca4ad0eaf2ec0fa465b06f463bee485c52b64
+++ packages/gcc/gcc-cross-sdk_3.4.4.bb	ffaafb6a6ef931a5cd71c7623aba38189dc94161
@@ -1,9 +1,9 @@ require gcc_${PV}.bb
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 require gcc_${PV}.bb
-PR = "r0"
+PR = "r1"
 
 inherit sdk
 
============================================================
--- packages/gcc/gcc-cross-sdk_4.1.0.bb	7eb85e54952c596416152f1e969d0bd613f44447
+++ packages/gcc/gcc-cross-sdk_4.1.0.bb	2cea3da097f8c9f838e82a3e085426ce0916af21
@@ -1,9 +1,9 @@ require gcc_${PV}.bb
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 require gcc_${PV}.bb
-PR = "r0"
+PR = "r1"
 
 inherit sdk
 
============================================================
--- packages/gcc/gcc-cross-sdk_4.1.1.bb	02ea95e063fa7ba063dc7824231550515b11b651
+++ packages/gcc/gcc-cross-sdk_4.1.1.bb	6837a925b54454ab71c724293d0af79096445b3a
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 inherit sdk
 
============================================================
--- packages/gcc/gcc-cross-sdk_4.1.2.bb	1eec9c99dd94a9914c2db2ccb6a1be346b5c492c
+++ packages/gcc/gcc-cross-sdk_4.1.2.bb	55ce0a11feb44ce43df3155213413eda911bc8b1
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 inherit sdk
 
============================================================
--- packages/gcc/gcc4-build-sdk.inc	9346ade760bf1914b9aef9ef6701465c2001aef9
+++ packages/gcc/gcc4-build-sdk.inc	803d124f9bdd702633e7820806cfc41d7703ddc8
@@ -1,19 +1,17 @@ USE_NLS = '${@base_conditional( "TARGET_
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
 
+SYSROOT = "${WORKDIR}/sysroot"
+EXTRA_OECONF += "--with-sysroot=${SYSROOT}"
 
-STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
-STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_configure () {
+       # Work around Hardcoded path assumptions in gcc
+       mkdir -p ${SYSROOT}/usr/
+       ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include
+       ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib
        (cd ${S} && gnu-configize) || die "failure running gnu-configize"
        (cd ${S}/libstdc++-v3 && autoreconf)
        oe_runconf
-       mkdir -p gcc
-       ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as
-       ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld
-       ln -sf ${STAGING_TARGET_INCDIR}/* ${S}/include
-       ln -sf ${STAGING_TARGET_LIBDIR}/crt*.o gcc/
 }
 
 do_compile () {
@@ -23,5 +21,5 @@ do_compile () {
 	export LD_FOR_TARGET="${TARGET_SYS}-ld"
 	export NM_FOR_TARGET="${TARGET_SYS}-nm"
 	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}"
-	oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}"
+	oe_runmake
 }