summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-06-17 00:11:00 +0000
committerRichard Purdie <richard@openedhand.com>2007-06-17 00:11:00 +0000
commit18e36b35ebdc5445f40d802bf3e9e4d1c9c0a55d (patch)
tree719ff7f1f50b42865c3b4ea1eaf6e85f3d8b31bb /meta/packages
parent7e30ceeefeeaff6ca7bb4d8a436948345655b103 (diff)
downloadpoky-18e36b35ebdc5445f40d802bf3e9e4d1c9c0a55d.tar.gz
gcc-cross-sdk: Use --with-sysroot option to gcc to fix and simplify configuration
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1961 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gcc/gcc-cross-sdk_4.1.2.bb6
-rw-r--r--meta/packages/gcc/gcc4-build-sdk.inc16
2 files changed, 10 insertions, 12 deletions
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb b/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
index c42f419766..305365a143 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -1,13 +1,13 @@
1PR = "r2" 1PR = "r3"
2 2
3inherit sdk 3inherit sdk
4 4
5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" 5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
6 6
7DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" 7DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
8PACKAGES = "${PN}"
9 8
10require gcc_${PV}.bb 9require gcc_${PV}.bb
11require gcc4-build-sdk.inc 10require gcc4-build-sdk.inc
12require gcc-package-sdk.inc 11require gcc-package-sdk.inc
13 12
13EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
diff --git a/meta/packages/gcc/gcc4-build-sdk.inc b/meta/packages/gcc/gcc4-build-sdk.inc
index b75e8a57c9..77d326b3ee 100644
--- a/meta/packages/gcc/gcc4-build-sdk.inc
+++ b/meta/packages/gcc/gcc4-build-sdk.inc
@@ -1,19 +1,17 @@
1USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' 1USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
2USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' 2USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
3 3
4 4SYSROOT = "${WORKDIR}/sysroot"
5STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include" 5EXTRA_OECONF += "--with-sysroot=${SYSROOT}"
6STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
7 6
8do_configure () { 7do_configure () {
8 # Work around Hardcoded path assumptions in gcc
9 mkdir -p ${SYSROOT}/usr/
10 ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include
11 ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib
9 (cd ${S} && gnu-configize) || die "failure running gnu-configize" 12 (cd ${S} && gnu-configize) || die "failure running gnu-configize"
10 (cd ${S}/libstdc++-v3 && autoreconf) 13 (cd ${S}/libstdc++-v3 && autoreconf)
11 oe_runconf 14 oe_runconf
12 mkdir -p gcc
13 ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as
14 ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld
15 ln -sf ${STAGING_TARGET_INCDIR}/* ${S}/include
16 ln -sf ${STAGING_TARGET_LIBDIR}/crt*.o gcc/
17} 15}
18 16
19do_compile () { 17do_compile () {
@@ -23,5 +21,5 @@ do_compile () {
23 export LD_FOR_TARGET="${TARGET_SYS}-ld" 21 export LD_FOR_TARGET="${TARGET_SYS}-ld"
24 export NM_FOR_TARGET="${TARGET_SYS}-nm" 22 export NM_FOR_TARGET="${TARGET_SYS}-nm"
25 export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}" 23 export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}"
26 oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" 24 oe_runmake
27} 25}