packages/gcc: require the right files, add a gcc4-build-sdk (review please)

    The gcc 4.1.x sdk tries to require gcc4-build-sdk.inc which
    doesn't exist. Copy the gcc3-build-sdk.inc and ask florian to
    verify it.

4 files changed, 30 insertions, 3 deletions

diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 96eaee7682..7ea8a0d166 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-require gcc3-cross-build.inc
+require gcc3-build-cross.inc
 # cross packaging
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
index 22fdd3701a..b894c2a86e 100644
--- a/packages/gcc/gcc-cross_csl-arm-cvs.bb
+++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb
@@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-require gcc3-cross-build.inc
+require gcc3-build-cross.inc
 # cross packaging
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb
index 6cd825d079..95bda6c95e 100644
--- a/packages/gcc/gcc-cross_csl-arm.bb
+++ b/packages/gcc/gcc-cross_csl-arm.bb
@@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-require gcc3-cross-build.inc
+require gcc3-build-cross.inc
 # cross packaging
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc
new file mode 100644
index 0000000000..e2ec9565a7
--- /dev/null
+++ b/packages/gcc/gcc4-build-sdk.inc
@@ -0,0 +1,27 @@
+USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
+
+SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
+
+STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
+STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
+
+do_configure () {
+       (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 () {
+	export CC="${BUILD_CC}"
+	export AR_FOR_TARGET="${TARGET_SYS}-ar"
+	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+	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}"
+}