diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-12 11:25:30 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-12 11:25:30 +0000 |
| commit | 01d5da72d0bd5038ce4b6a211546a4ca3f8daffd (patch) | |
| tree | ba1921d2beb66d9da21a5d6183c2c7db2bfc22a7 /meta/packages | |
| parent | 8c1871aabfd2b010152886cb5b48a0be84c2dc80 (diff) | |
| download | openembedded-core-01d5da72d0bd5038ce4b6a211546a4ca3f8daffd.tar.gz openembedded-core-01d5da72d0bd5038ce4b6a211546a4ca3f8daffd.tar.bz2 openembedded-core-01d5da72d0bd5038ce4b6a211546a4ca3f8daffd.tar.xz openembedded-core-01d5da72d0bd5038ce4b6a211546a4ca3f8daffd.zip | |
Rearrange staging to match target system layout. This is a major change and will require a full rebuild.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3123 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
| -rw-r--r-- | meta/packages/apt/files/apt.conf | 2 | ||||
| -rw-r--r-- | meta/packages/binutils/binutils-cross.inc | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc3-build-cross.inc | 13 | ||||
| -rw-r--r-- | meta/packages/qemu/qemu-native_20070613.bb | 1 | ||||
| -rw-r--r-- | meta/packages/qemu/qemu-native_cvs.bb | 1 |
5 files changed, 6 insertions, 13 deletions
diff --git a/meta/packages/apt/files/apt.conf b/meta/packages/apt/files/apt.conf index 9e9061646..2bd9ddbfa 100644 --- a/meta/packages/apt/files/apt.conf +++ b/meta/packages/apt/files/apt.conf @@ -1,4 +1,4 @@ -Dir "${STAGING_DIR}/" +Dir "${STAGING_DIR_NATIVE}/" { State "var/lib/apt/" { diff --git a/meta/packages/binutils/binutils-cross.inc b/meta/packages/binutils/binutils-cross.inc index c63ea687a..a45a39fea 100644 --- a/meta/packages/binutils/binutils-cross.inc +++ b/meta/packages/binutils/binutils-cross.inc @@ -3,7 +3,7 @@ inherit cross DEPENDS += "flex-native bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" PACKAGES = "" -EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \ --program-prefix=${TARGET_PREFIX}" do_stage () { diff --git a/meta/packages/gcc/gcc3-build-cross.inc b/meta/packages/gcc/gcc3-build-cross.inc index ec285f522..2b9766975 100644 --- a/meta/packages/gcc/gcc3-build-cross.inc +++ b/meta/packages/gcc/gcc3-build-cross.inc @@ -1,7 +1,9 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \ - --with-gxx-include-dir=${STAGING_DIR}/${TARGET_SYS}/include/c++" +EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \ + --with-sysroot=${STAGING_DIR_TARGET} \ + --with-build-sysroot=${STAGING_DIR_TARGET}" do_configure_prepend () { rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a @@ -25,13 +27,6 @@ do_stage_append () { rm -f ${CROSS_DIR}/bin/*gcov rm -f ${CROSS_DIR}/bin/*gccbug - # Fix a few include links so cross builds are happier - if [ ! -e ${STAGING_INCDIR}/c++ ]; then - mkdir -p ${STAGING_INCDIR} - ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \ - ${STAGING_INCDIR}/ - fi - # We use libiberty from binutils rm -f ${CROSS_DIR}/lib/libiberty.a diff --git a/meta/packages/qemu/qemu-native_20070613.bb b/meta/packages/qemu/qemu-native_20070613.bb index a6a5bda58..28373e273 100644 --- a/meta/packages/qemu/qemu-native_20070613.bb +++ b/meta/packages/qemu/qemu-native_20070613.bb @@ -1,6 +1,5 @@ require qemu_${PV}.bb inherit native DEPENDS = "zlib-native" -prefix = "${STAGING_DIR}/${BUILD_SYS}" require qemu-gcc3-check.inc diff --git a/meta/packages/qemu/qemu-native_cvs.bb b/meta/packages/qemu/qemu-native_cvs.bb index fae6ca2f1..c87d45b60 100644 --- a/meta/packages/qemu/qemu-native_cvs.bb +++ b/meta/packages/qemu/qemu-native_cvs.bb @@ -1,6 +1,5 @@ require qemu_cvs.bb inherit native DEPENDS = "zlib-native" -prefix = "${STAGING_DIR}/${BUILD_SYS}" require qemu-gcc3-check.inc |