diff options
Diffstat (limited to 'recipes')
40 files changed, 102 insertions, 101 deletions
diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index a0a7dfab74..efe8ee8787 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -83,12 +83,12 @@ do_configure () { if [ "${HOST_SYS}" != "${TARGET_SYS}" ]; then # splice our idea of where the headers live into gcc's world - echo "NATIVE_SYSTEM_HEADER_DIR = ${layout_includedir}" > ${T}/t-oe + echo "NATIVE_SYSTEM_HEADER_DIR = ${target_includedir}" > ${T}/t-oe sed 's%^tmake_file=.*$%& ${T}/t-oe%' < ${S}/gcc/Makefile.in >${S}/gcc/Makefile.in.new mv ${S}/gcc/Makefile.in.new ${S}/gcc/Makefile.in cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${S}/gcc/defaults.h.new echo "#ifndef STANDARD_INCLUDE_DIR" >> ${S}/gcc/defaults.h.new - echo "#define STANDARD_INCLUDE_DIR \"${layout_includedir}\"" >> ${S}/gcc/defaults.h.new + echo "#define STANDARD_INCLUDE_DIR \"${target_includedir}\"" >> ${S}/gcc/defaults.h.new echo "#endif" >> ${S}/gcc/defaults.h.new echo "#endif /* ! GCC_DEFAULTS_H */" >> ${S}/gcc/defaults.h.new mv ${S}/gcc/defaults.h.new ${S}/gcc/defaults.h diff --git a/recipes/gcc/gcc-configure-cross.inc b/recipes/gcc/gcc-configure-cross.inc index b526ff3cc4..980f7929ff 100644 --- a/recipes/gcc/gcc-configure-cross.inc +++ b/recipes/gcc/gcc-configure-cross.inc @@ -2,8 +2,8 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \ +EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}/${target_includedir}/c++ \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET}" diff --git a/recipes/gcc/gcc-cross-initial.inc b/recipes/gcc/gcc-cross-initial.inc index 15e5fa62fc..a2c4445578 100644 --- a/recipes/gcc/gcc-cross-initial.inc +++ b/recipes/gcc/gcc-cross-initial.inc @@ -4,7 +4,7 @@ PACKAGES = "" # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --with-newlib \ --without-headers \ --disable-shared \ diff --git a/recipes/gcc/gcc-cross-intermediate.inc b/recipes/gcc/gcc-cross-intermediate.inc index 4746140346..ccfa2b44b8 100644 --- a/recipes/gcc/gcc-cross-intermediate.inc +++ b/recipes/gcc/gcc-cross-intermediate.inc @@ -5,7 +5,7 @@ PACKAGES = "" # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --enable-shared \ --disable-multilib \ --disable-threads \ @@ -18,8 +18,8 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ do_stage_append () { # get rid of dummy libc.so - if [ -z "`file ${STAGING_DIR_TARGET}${layout_libdir}/libc.so | grep "ASCII C program text"`" ]; then - rm -rf ${STAGING_DIR_TARGET}${layout_libdir}/libc.so + if [ -z "`file ${STAGING_DIR_TARGET}${target_libdir}/libc.so | grep "ASCII C program text"`" ]; then + rm -rf ${STAGING_DIR_TARGET}${target_libdir}/libc.so fi } diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb index 9a9eb8ca56..6a7460664f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb @@ -7,4 +7,4 @@ require gcc-package-sdk.inc DEPENDS += "gmp-native mpfr-native" -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index ab52a9ae04..9c67c7e119 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --enable-libssp \ --enable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index 6be2538cd5..ed39d3176d 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bb b/recipes/gcc/gcc-cross-sdk_4.3.4.bb index 081b3c0aab..88e26c509b 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.4.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bb b/recipes/gcc/gcc-cross-sdk_4.4.1.bb index 513cca1ddc..e1b510e58f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.1.bb @@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bb b/recipes/gcc/gcc-cross-sdk_4.4.2.bb index 513cca1ddc..e1b510e58f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.2.bb @@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index 3352e41dcb..2e4fcf25a6 100644 --- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += " \ --disable-libgomp \ --disable-libunwind-exceptions \ --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix} \ + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ " #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include diff --git a/recipes/gcc/gcc-cross-sdk_svn.bb b/recipes/gcc/gcc-cross-sdk_svn.bb index 29ee187785..22937da3c4 100644 --- a/recipes/gcc/gcc-cross-sdk_svn.bb +++ b/recipes/gcc/gcc-cross-sdk_svn.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross.inc b/recipes/gcc/gcc-cross.inc index 3fa6f61f0d..3485824b8a 100644 --- a/recipes/gcc/gcc-cross.inc +++ b/recipes/gcc/gcc-cross.inc @@ -5,6 +5,7 @@ target_libdir := "${libdir}" target_includedir := "${includedir}" target_base_libdir := "${base_libdir}" +target_prefix := "${prefix}" inherit cross diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb index 9513c657f3..def05869d8 100644 --- a/recipes/gcc/gcc-cross_4.1.0.bb +++ b/recipes/gcc/gcc-cross_4.1.0.bb @@ -5,4 +5,4 @@ require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb index 08ae7a552c..e96867e682 100644 --- a/recipes/gcc/gcc-cross_4.1.1.bb +++ b/recipes/gcc/gcc-cross_4.1.1.bb @@ -7,4 +7,4 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb index 85f90b31a1..2367d196c9 100644 --- a/recipes/gcc/gcc-cross_4.1.2.bb +++ b/recipes/gcc/gcc-cross_4.1.2.bb @@ -9,6 +9,6 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " EXTRA_OECONF_append_avr32= " --disable-libmudflap " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb index c080143517..8c7f4c50ed 100644 --- a/recipes/gcc/gcc-cross_4.2.1.bb +++ b/recipes/gcc/gcc-cross_4.2.1.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.2.bb b/recipes/gcc/gcc-cross_4.2.2.bb index 4e7fc479d1..cf1bf6837f 100644 --- a/recipes/gcc/gcc-cross_4.2.2.bb +++ b/recipes/gcc/gcc-cross_4.2.2.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.3.bb b/recipes/gcc/gcc-cross_4.2.3.bb index 4e7fc479d1..cf1bf6837f 100644 --- a/recipes/gcc/gcc-cross_4.2.3.bb +++ b/recipes/gcc/gcc-cross_4.2.3.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb index 4e7fc479d1..cf1bf6837f 100644 --- a/recipes/gcc/gcc-cross_4.2.4.bb +++ b/recipes/gcc/gcc-cross_4.2.4.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.1.bb b/recipes/gcc/gcc-cross_4.3.1.bb index 398ee2ee79..acd552101a 100644 --- a/recipes/gcc/gcc-cross_4.3.1.bb +++ b/recipes/gcc/gcc-cross_4.3.1.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.2.bb b/recipes/gcc/gcc-cross_4.3.2.bb index 5eb6b5fbe8..94b98b9e63 100644 --- a/recipes/gcc/gcc-cross_4.3.2.bb +++ b/recipes/gcc/gcc-cross_4.3.2.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.3.bb b/recipes/gcc/gcc-cross_4.3.3.bb index 5eb6b5fbe8..94b98b9e63 100644 --- a/recipes/gcc/gcc-cross_4.3.3.bb +++ b/recipes/gcc/gcc-cross_4.3.3.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.4.bb b/recipes/gcc/gcc-cross_4.3.4.bb index 9c59a4e5fd..71cb5e63f6 100644 --- a/recipes/gcc/gcc-cross_4.3.4.bb +++ b/recipes/gcc/gcc-cross_4.3.4.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.4.1.bb b/recipes/gcc/gcc-cross_4.4.1.bb index 4db1b33945..11eb29d419 100644 --- a/recipes/gcc/gcc-cross_4.4.1.bb +++ b/recipes/gcc/gcc-cross_4.4.1.bb @@ -6,6 +6,6 @@ PR = "${INC_PR}.1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.4.2.bb b/recipes/gcc/gcc-cross_4.4.2.bb index 4db1b33945..11eb29d419 100644 --- a/recipes/gcc/gcc-cross_4.4.2.bb +++ b/recipes/gcc/gcc-cross_4.4.2.bb @@ -6,6 +6,6 @@ PR = "${INC_PR}.1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb index 4bd9e632a3..34bd251a12 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" @@ -16,11 +16,11 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } -ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb index 59bfd24960..d534574c2e 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" @@ -16,11 +16,11 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } -ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb index bbd4cdf173..ef4ef304ef 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" @@ -16,11 +16,11 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } -ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb index a7df4842b9..2186a81944 100644 --- a/recipes/gcc/gcc-cross_svn.bb +++ b/recipes/gcc/gcc-cross_svn.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-native.inc b/recipes/gcc/gcc-native.inc index 6fa615ffc7..63b7375e96 100644 --- a/recipes/gcc/gcc-native.inc +++ b/recipes/gcc/gcc-native.inc @@ -5,7 +5,7 @@ PROVIDES = "gcc-native-${PV}" inherit native # This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \ --with-newlib \ --disable-shared \ --disable-threads \ diff --git a/recipes/libtool/libtool-cross_1.5.10.bb b/recipes/libtool/libtool-cross_1.5.10.bb index 910ff12066..1ae9c6884d 100644 --- a/recipes/libtool/libtool-cross_1.5.10.bb +++ b/recipes/libtool/libtool-cross_1.5.10.bb @@ -13,8 +13,8 @@ SRC_URI_append = " file://rpath-control.patch;patch=1 \ S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_configure_prepend () { @@ -34,12 +34,12 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c config.guess ${STAGING_DATADIR}/libtool/ - install -c config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ } do_install () { diff --git a/recipes/libtool/libtool-cross_1.5.22.bb b/recipes/libtool/libtool-cross_1.5.22.bb index b0cee4eebb..383261217c 100644 --- a/recipes/libtool/libtool-cross_1.5.22.bb +++ b/recipes/libtool/libtool-cross_1.5.22.bb @@ -12,8 +12,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -23,12 +23,12 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c config.guess ${STAGING_DATADIR}/libtool/ - install -c config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ } do_install () { diff --git a/recipes/libtool/libtool-cross_1.5.24.bb b/recipes/libtool/libtool-cross_1.5.24.bb index 1f8527873f..211e5a3550 100644 --- a/recipes/libtool/libtool-cross_1.5.24.bb +++ b/recipes/libtool/libtool-cross_1.5.24.bb @@ -9,8 +9,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -20,12 +20,12 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c config.guess ${STAGING_DATADIR}/libtool/ - install -c config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ } do_install () { diff --git a/recipes/libtool/libtool-cross_2.2.4.bb b/recipes/libtool/libtool-cross_2.2.4.bb index 31a67f5bd1..1a60b57970 100644 --- a/recipes/libtool/libtool-cross_2.2.4.bb +++ b/recipes/libtool/libtool-cross_2.2.4.bb @@ -17,8 +17,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -27,14 +27,14 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ - install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ if [ -e ${WORKDIR}/dolt.m4 ] ; then - install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ fi } diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb b/recipes/libtool/libtool-cross_2.2.6a.bb index 23c16829ab..d3ea34a341 100644 --- a/recipes/libtool/libtool-cross_2.2.6a.bb +++ b/recipes/libtool/libtool-cross_2.2.6a.bb @@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1" #SRC_URI_append_linux = "${DOLT_PATCH}" #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -25,14 +25,14 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ - install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ if [ -e ${WORKDIR}/dolt.m4 ] ; then - install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ fi } |