diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-16 23:09:44 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-17 22:24:36 +0100 |
commit | af85ce4b4e675feb5796f87137c86d70c2f15b9a (patch) | |
tree | f19dbb9bcf1eec671b26685458f7cc47ebb3721e /meta/packages | |
parent | 046ae6a38d829048663fe1afb1f67de1fbe2e3b5 (diff) | |
download | poky-af85ce4b4e675feb5796f87137c86d70c2f15b9a.tar.gz |
Remove layout_* variables
Remove layout_* variables and replace them with variables specific to the
different classes. The layout variables were only useful for the native/cross
classes and caused more confusion than they solved. They didn't scale to the
sdk class. It now clear a small set of native/cross variables fulfil the needs.
This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes
sense since we're installing binaries into the locations we're compiling them for.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
46 files changed, 121 insertions, 125 deletions
diff --git a/meta/packages/apr/apr-util_1.3.4.bb b/meta/packages/apr/apr-util_1.3.4.bb index f2d5470977..12b444976c 100644 --- a/meta/packages/apr/apr-util_1.3.4.bb +++ b/meta/packages/apr/apr-util_1.3.4.bb | |||
@@ -11,10 +11,10 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \ | |||
11 | 11 | ||
12 | EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ | 12 | EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ |
13 | --with-dbm=gdbm \ | 13 | --with-dbm=gdbm \ |
14 | --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \ | 14 | --with-gdbm=${STAGING_DIR_HOST}${prefix} \ |
15 | --without-sqlite2 \ | 15 | --without-sqlite2 \ |
16 | --without-sqlite3 \ | 16 | --without-sqlite3 \ |
17 | --with-expat=${STAGING_DIR_HOST}${layout_prefix}" | 17 | --with-expat=${STAGING_DIR_HOST}${prefix}" |
18 | 18 | ||
19 | 19 | ||
20 | inherit autotools_stage lib_package binconfig | 20 | inherit autotools_stage lib_package binconfig |
diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/packages/claws-mail/claws-mail.inc index 029e769fc8..1df093bb43 100644 --- a/meta/packages/claws-mail/claws-mail.inc +++ b/meta/packages/claws-mail/claws-mail.inc | |||
@@ -15,7 +15,7 @@ SRC_URI = "\ | |||
15 | FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" | 15 | FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" |
16 | 16 | ||
17 | #EXTRA_OECONF = "--disable-aspell-test \ | 17 | #EXTRA_OECONF = "--disable-aspell-test \ |
18 | # --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} \ | 18 | # --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \ |
19 | # --enable-aspell" | 19 | # --enable-aspell" |
20 | 20 | ||
21 | EXTRA_OECONF = "--disable-aspell-test \ | 21 | EXTRA_OECONF = "--disable-aspell-test \ |
diff --git a/meta/packages/eds/eds-dbus_2.20.0.bb b/meta/packages/eds/eds-dbus_2.20.0.bb index 76694ce5a6..274086470c 100644 --- a/meta/packages/eds/eds-dbus_2.20.0.bb +++ b/meta/packages/eds/eds-dbus_2.20.0.bb | |||
@@ -21,7 +21,7 @@ do_configure_append () { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ | 23 | EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ |
24 | --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \ | 24 | --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \ |
25 | --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" | 25 | --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" |
26 | 26 | ||
27 | 27 | ||
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb index 83b875bd43..a4c91412cd 100644 --- a/meta/packages/eds/eds-dbus_svn.bb +++ b/meta/packages/eds/eds-dbus_svn.bb | |||
@@ -23,7 +23,7 @@ do_configure_append () { | |||
23 | } | 23 | } |
24 | 24 | ||
25 | EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ | 25 | EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ |
26 | --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \ | 26 | --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \ |
27 | --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" | 27 | --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" |
28 | 28 | ||
29 | 29 | ||
diff --git a/meta/packages/gcc/gcc-configure-cross.inc b/meta/packages/gcc/gcc-configure-cross.inc index 5befaa8c67..8a47a45bc9 100644 --- a/meta/packages/gcc/gcc-configure-cross.inc +++ b/meta/packages/gcc/gcc-configure-cross.inc | |||
@@ -2,8 +2,8 @@ require gcc-configure-common.inc | |||
2 | 2 | ||
3 | USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' | 3 | USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' |
4 | 4 | ||
5 | EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ | 5 | EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ |
6 | --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \ | 6 | --with-gxx-include-dir=${STAGING_DIR_TARGET}/${target_includedir}/c++ \ |
7 | --with-sysroot=${STAGING_DIR_TARGET} \ | 7 | --with-sysroot=${STAGING_DIR_TARGET} \ |
8 | --with-build-sysroot=${STAGING_DIR_TARGET}" | 8 | --with-build-sysroot=${STAGING_DIR_TARGET}" |
9 | 9 | ||
@@ -31,8 +31,8 @@ do_stage_append () { | |||
31 | rmdir ${CROSS_DIR}/include || : | 31 | rmdir ${CROSS_DIR}/include || : |
32 | 32 | ||
33 | # Move libssp into staging | 33 | # Move libssp into staging |
34 | install -d ${STAGING_DIR_TARGET}${layout_base_libdir}/ | 34 | install -d ${STAGING_DIR_TARGET}${target_base_libdir}/ |
35 | mv ${CROSS_DIR}/${TARGET_SYS}/lib/libssp* ${STAGING_DIR_TARGET}${layout_base_libdir}/ || true | 35 | mv ${CROSS_DIR}/${TARGET_SYS}/lib/libssp* ${STAGING_DIR_TARGET}${target_base_libdir}/ || true |
36 | 36 | ||
37 | # We don't really need to keep this around | 37 | # We don't really need to keep this around |
38 | # rm -rf ${CROSS_DIR}/share but leave java there | 38 | # rm -rf ${CROSS_DIR}/share but leave java there |
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc index ddaa041ee9..c04b93e568 100644 --- a/meta/packages/gcc/gcc-configure-sdk.inc +++ b/meta/packages/gcc/gcc-configure-sdk.inc | |||
@@ -4,8 +4,8 @@ require gcc-configure-common.inc | |||
4 | USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' | 4 | USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' |
5 | USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' | 5 | USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' |
6 | 6 | ||
7 | EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ | 7 | EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ |
8 | --with-gxx-include-dir=${prefix}/${TARGET_SYS}${layout_includedir}/c++/${BINV}/ \ | 8 | --with-gxx-include-dir=${prefix}/${TARGET_SYS}${target_includedir}/c++/${BINV}/ \ |
9 | --with-sysroot=${prefix}/${TARGET_SYS} \ | 9 | --with-sysroot=${prefix}/${TARGET_SYS} \ |
10 | --with-build-sysroot=${STAGING_DIR_TARGET}" | 10 | --with-build-sysroot=${STAGING_DIR_TARGET}" |
11 | 11 | ||
diff --git a/meta/packages/gcc/gcc-configure-target.inc b/meta/packages/gcc/gcc-configure-target.inc index a3e274522c..44d6136240 100644 --- a/meta/packages/gcc/gcc-configure-target.inc +++ b/meta/packages/gcc/gcc-configure-target.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | require gcc-configure-common.inc | 1 | require gcc-configure-common.inc |
2 | 2 | ||
3 | EXTRA_OECONF_PATHS = " \ | 3 | EXTRA_OECONF_PATHS = " \ |
4 | --with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ | 4 | --with-local-prefix=${STAGING_DIR_TARGET}${prefix} \ |
5 | --with-gxx-include-dir=${includedir}/c++/${BINV}/" | 5 | --with-gxx-include-dir=${includedir}/c++/${BINV}/" |
6 | 6 | ||
diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/packages/gcc/gcc-cross-initial.inc index 15e5fa62fc..a2c4445578 100644 --- a/meta/packages/gcc/gcc-cross-initial.inc +++ b/meta/packages/gcc/gcc-cross-initial.inc | |||
@@ -4,7 +4,7 @@ PACKAGES = "" | |||
4 | 4 | ||
5 | # This is intended to be a -very- basic config | 5 | # This is intended to be a -very- basic config |
6 | # sysroot is needed in case we use libc-initial | 6 | # sysroot is needed in case we use libc-initial |
7 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ | 7 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ |
8 | --with-newlib \ | 8 | --with-newlib \ |
9 | --without-headers \ | 9 | --without-headers \ |
10 | --disable-shared \ | 10 | --disable-shared \ |
diff --git a/meta/packages/gcc/gcc-cross-intermediate.inc b/meta/packages/gcc/gcc-cross-intermediate.inc index 4fa12886f1..57fa949485 100644 --- a/meta/packages/gcc/gcc-cross-intermediate.inc +++ b/meta/packages/gcc/gcc-cross-intermediate.inc | |||
@@ -5,7 +5,7 @@ PACKAGES = "" | |||
5 | 5 | ||
6 | # This is intended to be a -very- basic config | 6 | # This is intended to be a -very- basic config |
7 | # sysroot is needed in case we use libc-initial | 7 | # sysroot is needed in case we use libc-initial |
8 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ | 8 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ |
9 | --enable-shared \ | 9 | --enable-shared \ |
10 | --disable-multilib \ | 10 | --disable-multilib \ |
11 | --disable-threads \ | 11 | --disable-threads \ |
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 616a5831d0..83f0ec865b 100644 --- a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb +++ b/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb | |||
@@ -7,4 +7,4 @@ require gcc-package-sdk.inc | |||
7 | 7 | ||
8 | DEPENDS += "gmp-native mpfr-native" | 8 | DEPENDS += "gmp-native mpfr-native" |
9 | 9 | ||
10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb b/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb index 7e3a459ea8..8cca9f8f06 100644 --- a/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb +++ b/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb | |||
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" | |||
11 | 11 | ||
12 | EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ | 12 | EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ |
13 | --disable-libgomp --disable-libmudflap \ | 13 | --disable-libgomp --disable-libmudflap \ |
14 | --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 14 | --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb b/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb index 9562b43fdc..94a95de407 100644 --- a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb +++ b/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb | |||
@@ -11,7 +11,7 @@ DEPENDS += "gmp-sdk mpfr-sdk" | |||
11 | 11 | ||
12 | EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ | 12 | EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ |
13 | --disable-libgomp --disable-libmudflap \ | 13 | --disable-libgomp --disable-libmudflap \ |
14 | --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 14 | --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
15 | 15 | ||
16 | # to find libmpfr | 16 | # to find libmpfr |
17 | export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" | 17 | export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" |
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb b/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb index 9562b43fdc..65df556e8c 100644 --- a/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb +++ b/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb | |||
@@ -11,7 +11,7 @@ DEPENDS += "gmp-sdk mpfr-sdk" | |||
11 | 11 | ||
12 | EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ | 12 | EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ |
13 | --disable-libgomp --disable-libmudflap \ | 13 | --disable-libgomp --disable-libmudflap \ |
14 | --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 14 | --with-mpfr=${STAGING_DIR_NATIVE}${native_prefix}" |
15 | 15 | ||
16 | # to find libmpfr | 16 | # to find libmpfr |
17 | export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" | 17 | export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" |
diff --git a/meta/packages/gcc/gcc-cross.inc b/meta/packages/gcc/gcc-cross.inc index 3fa6f61f0d..3485824b8a 100644 --- a/meta/packages/gcc/gcc-cross.inc +++ b/meta/packages/gcc/gcc-cross.inc | |||
@@ -5,6 +5,7 @@ | |||
5 | target_libdir := "${libdir}" | 5 | target_libdir := "${libdir}" |
6 | target_includedir := "${includedir}" | 6 | target_includedir := "${includedir}" |
7 | target_base_libdir := "${base_libdir}" | 7 | target_base_libdir := "${base_libdir}" |
8 | target_prefix := "${prefix}" | ||
8 | 9 | ||
9 | inherit cross | 10 | inherit cross |
10 | 11 | ||
diff --git a/meta/packages/gcc/gcc-cross_4.1.2.bb b/meta/packages/gcc/gcc-cross_4.1.2.bb index c9e3279ffc..d37ca6653c 100644 --- a/meta/packages/gcc/gcc-cross_4.1.2.bb +++ b/meta/packages/gcc/gcc-cross_4.1.2.bb | |||
@@ -9,6 +9,6 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " | |||
9 | 9 | ||
10 | EXTRA_OECONF_append_avr32= " --disable-libmudflap " | 10 | EXTRA_OECONF_append_avr32= " --disable-libmudflap " |
11 | 11 | ||
12 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 12 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
13 | 13 | ||
14 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" | 14 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" |
diff --git a/meta/packages/gcc/gcc-cross_4.2.3.bb b/meta/packages/gcc/gcc-cross_4.2.3.bb index 72f72835c3..22efffa539 100644 --- a/meta/packages/gcc/gcc-cross_4.2.3.bb +++ b/meta/packages/gcc/gcc-cross_4.2.3.bb | |||
@@ -7,6 +7,6 @@ require gcc-package-cross.inc | |||
7 | 7 | ||
8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " | 8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " |
9 | 9 | ||
10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
11 | 11 | ||
12 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" | 12 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" |
diff --git a/meta/packages/gcc/gcc-cross_4.3.1.bb b/meta/packages/gcc/gcc-cross_4.3.1.bb index 11e04594fc..84bee6baf3 100644 --- a/meta/packages/gcc/gcc-cross_4.3.1.bb +++ b/meta/packages/gcc/gcc-cross_4.3.1.bb | |||
@@ -7,6 +7,6 @@ require gcc-package-cross.inc | |||
7 | 7 | ||
8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " | 8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " |
9 | 9 | ||
10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
11 | 11 | ||
12 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" | 12 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" |
diff --git a/meta/packages/gcc/gcc-cross_4.3.2.bb b/meta/packages/gcc/gcc-cross_4.3.2.bb index 11e04594fc..84bee6baf3 100644 --- a/meta/packages/gcc/gcc-cross_4.3.2.bb +++ b/meta/packages/gcc/gcc-cross_4.3.2.bb | |||
@@ -7,6 +7,6 @@ require gcc-package-cross.inc | |||
7 | 7 | ||
8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " | 8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " |
9 | 9 | ||
10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
11 | 11 | ||
12 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" | 12 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" |
diff --git a/meta/packages/gcc/gcc-cross_4.3.3.bb b/meta/packages/gcc/gcc-cross_4.3.3.bb index 11e04594fc..84bee6baf3 100644 --- a/meta/packages/gcc/gcc-cross_4.3.3.bb +++ b/meta/packages/gcc/gcc-cross_4.3.3.bb | |||
@@ -7,6 +7,6 @@ require gcc-package-cross.inc | |||
7 | 7 | ||
8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " | 8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " |
9 | 9 | ||
10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 10 | EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
11 | 11 | ||
12 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" | 12 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" |
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb index 4fde67b006..b00bebc5c0 100644 --- a/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb +++ b/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb | |||
@@ -7,7 +7,7 @@ require gcc-package-cross.inc | |||
7 | 7 | ||
8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " | 8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " |
9 | 9 | ||
10 | EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 10 | EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
11 | 11 | ||
12 | #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include | 12 | #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include |
13 | CFLAGS = "" | 13 | CFLAGS = "" |
@@ -16,11 +16,11 @@ LDFLAGS = "" | |||
16 | 16 | ||
17 | # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain | 17 | # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain |
18 | do_compile_prepend() { | 18 | do_compile_prepend() { |
19 | ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ | 19 | ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ |
20 | ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ | 20 | ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ |
21 | ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ | 21 | ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ |
22 | sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure | 22 | sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure |
23 | 23 | ||
24 | } | 24 | } |
25 | 25 | ||
26 | ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" | 26 | ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" |
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb index 01b5bdacc4..a1581c2aa1 100644 --- a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb +++ b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb | |||
@@ -7,7 +7,7 @@ require gcc-package-cross.inc | |||
7 | 7 | ||
8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " | 8 | SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " |
9 | 9 | ||
10 | EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 10 | EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" |
11 | 11 | ||
12 | #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include | 12 | #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include |
13 | CFLAGS = "" | 13 | CFLAGS = "" |
@@ -16,11 +16,11 @@ LDFLAGS = "" | |||
16 | 16 | ||
17 | # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain | 17 | # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain |
18 | do_compile_prepend() { | 18 | do_compile_prepend() { |
19 | ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ | 19 | ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ |
20 | ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ | 20 | ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ |
21 | ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ | 21 | ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ |
22 | sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure | 22 | sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure |
23 | 23 | ||
24 | } | 24 | } |
25 | 25 | ||
26 | ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" | 26 | ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" |
diff --git a/meta/packages/gcc/gcc-native.inc b/meta/packages/gcc/gcc-native.inc index 6fa615ffc7..63b7375e96 100644 --- a/meta/packages/gcc/gcc-native.inc +++ b/meta/packages/gcc/gcc-native.inc | |||
@@ -5,7 +5,7 @@ PROVIDES = "gcc-native-${PV}" | |||
5 | inherit native | 5 | inherit native |
6 | 6 | ||
7 | # This is intended to be a -very- basic config | 7 | # This is intended to be a -very- basic config |
8 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ | 8 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \ |
9 | --with-newlib \ | 9 | --with-newlib \ |
10 | --disable-shared \ | 10 | --disable-shared \ |
11 | --disable-threads \ | 11 | --disable-threads \ |
diff --git a/meta/packages/glibc/glibc-initial.inc b/meta/packages/glibc/glibc-initial.inc index 21b7631d3e..127e93e9d3 100644 --- a/meta/packages/glibc/glibc-initial.inc +++ b/meta/packages/glibc/glibc-initial.inc | |||
@@ -12,7 +12,7 @@ do_configure () { | |||
12 | find ${S} -name "configure" | xargs touch | 12 | find ${S} -name "configure" | xargs touch |
13 | ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ | 13 | ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ |
14 | --without-cvs --disable-sanity-checks \ | 14 | --without-cvs --disable-sanity-checks \ |
15 | --with-headers=${STAGING_DIR_TARGET}${layout_includedir} \ | 15 | --with-headers=${STAGING_DIR_TARGET}${includedir} \ |
16 | --enable-hacker-mode | 16 | --enable-hacker-mode |
17 | if grep -q GLIBC_2.3 ${S}/ChangeLog; then | 17 | if grep -q GLIBC_2.3 ${S}/ChangeLog; then |
18 | # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. | 18 | # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. |
@@ -32,7 +32,7 @@ do_compile () { | |||
32 | 32 | ||
33 | do_stage () { | 33 | do_stage () { |
34 | oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \ | 34 | oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \ |
35 | includedir='${layout_includedir}' prefix='${layout_prefix}' \ | 35 | includedir='${includedir}' prefix='${prefix}' \ |
36 | install-bootstrap-headers=yes install-headers | 36 | install-bootstrap-headers=yes install-headers |
37 | 37 | ||
38 | oe_runmake csu/subdir_lib | 38 | oe_runmake csu/subdir_lib |
@@ -46,10 +46,10 @@ do_stage () { | |||
46 | if [ -e ${B}/bits/stdio_lim.h ]; then | 46 | if [ -e ${B}/bits/stdio_lim.h ]; then |
47 | cp ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ | 47 | cp ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ |
48 | fi | 48 | fi |
49 | mkdir -p ${STAGING_DIR_TARGET}${layout_libdir} | 49 | mkdir -p ${STAGING_DIR_TARGET}${libdir} |
50 | install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir} | 50 | install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${libdir} |
51 | ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ | 51 | ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ |
52 | -o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so | 52 | -o ${STAGING_DIR_TARGET}${libdir}/libc.so |
53 | } | 53 | } |
54 | 54 | ||
55 | do_install () { | 55 | do_install () { |
diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb index 6a5e9f37d7..3f184a6b13 100644 --- a/meta/packages/glibc/glibc_2.4.bb +++ b/meta/packages/glibc/glibc_2.4.bb | |||
@@ -4,7 +4,7 @@ PR = "r13" | |||
4 | 4 | ||
5 | # the -isystem in bitbake.conf screws up glibc do_stage | 5 | # the -isystem in bitbake.conf screws up glibc do_stage |
6 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" | 6 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" |
7 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" | 7 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" |
8 | 8 | ||
9 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" | 9 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" |
10 | 10 | ||
diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb index 0cab17f128..5f95280584 100644 --- a/meta/packages/glibc/glibc_2.5.bb +++ b/meta/packages/glibc/glibc_2.5.bb | |||
@@ -4,7 +4,7 @@ PR = "r8" | |||
4 | 4 | ||
5 | # the -isystem in bitbake.conf screws up glibc do_stage | 5 | # the -isystem in bitbake.conf screws up glibc do_stage |
6 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" | 6 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" |
7 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" | 7 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" |
8 | 8 | ||
9 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" | 9 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" |
10 | 10 | ||
diff --git a/meta/packages/glibc/glibc_2.6.1.bb b/meta/packages/glibc/glibc_2.6.1.bb index f98864276e..3d39e0f748 100644 --- a/meta/packages/glibc/glibc_2.6.1.bb +++ b/meta/packages/glibc/glibc_2.6.1.bb | |||
@@ -1,4 +1,3 @@ | |||
1 | require glibc.inc | ||
2 | PR = "r6" | 1 | PR = "r6" |
3 | 2 | ||
4 | ARM_INSTRUCTION_SET = "arm" | 3 | ARM_INSTRUCTION_SET = "arm" |
@@ -8,7 +7,7 @@ RPROVIDES_${PN}-dev = "libc6-dev" | |||
8 | 7 | ||
9 | # the -isystem in bitbake.conf screws up glibc do_stage | 8 | # the -isystem in bitbake.conf screws up glibc do_stage |
10 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" | 9 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" |
11 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" | 10 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" |
12 | 11 | ||
13 | 12 | ||
14 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" | 13 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" |
diff --git a/meta/packages/glibc/glibc_2.9.bb b/meta/packages/glibc/glibc_2.9.bb index 24b07163e1..ea178366ac 100644 --- a/meta/packages/glibc/glibc_2.9.bb +++ b/meta/packages/glibc/glibc_2.9.bb | |||
@@ -9,7 +9,7 @@ PR = "r1" | |||
9 | 9 | ||
10 | # the -isystem in bitbake.conf screws up glibc do_stage | 10 | # the -isystem in bitbake.conf screws up glibc do_stage |
11 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" | 11 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" |
12 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" | 12 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" |
13 | 13 | ||
14 | GLIBC_ADDONS ?= "ports,nptl,libidn" | 14 | GLIBC_ADDONS ?= "ports,nptl,libidn" |
15 | 15 | ||
diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb index c82121f027..d2aa11605b 100644 --- a/meta/packages/glibc/glibc_csl-2005q3-2.bb +++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb | |||
@@ -6,7 +6,7 @@ PR = "r11" | |||
6 | 6 | ||
7 | # the -isystem in bitbake.conf screws up glibc do_stage | 7 | # the -isystem in bitbake.conf screws up glibc do_stage |
8 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" | 8 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" |
9 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" | 9 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" |
10 | 10 | ||
11 | GLIBC_ADDONS ?= "nptl,libidn" | 11 | GLIBC_ADDONS ?= "nptl,libidn" |
12 | 12 | ||
diff --git a/meta/packages/gnutls/gnutls.inc b/meta/packages/gnutls/gnutls.inc index e871ab4181..41d765f133 100644 --- a/meta/packages/gnutls/gnutls.inc +++ b/meta/packages/gnutls/gnutls.inc | |||
@@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" | |||
8 | 8 | ||
9 | inherit autotools binconfig pkgconfig pkgconfig_stage | 9 | inherit autotools binconfig pkgconfig pkgconfig_stage |
10 | 10 | ||
11 | EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-libz-prefix=${STAGING_DIR_HOST}${layout_prefix} --with-lzo --disable-guile" | 11 | EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile" |
12 | 12 | ||
13 | do_stage() { | 13 | do_stage() { |
14 | oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} | 14 | oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} |
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb index 1238094914..60c545063e 100644 --- a/meta/packages/hal/hal_git.bb +++ b/meta/packages/hal/hal_git.bb | |||
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git" | |||
19 | inherit autotools_stage pkgconfig | 19 | inherit autotools_stage pkgconfig |
20 | 20 | ||
21 | EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ | 21 | EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ |
22 | --with-expat=${STAGING_DIR_HOST}${layout_prefix} \ | 22 | --with-expat=${STAGING_DIR_HOST}${prefix} \ |
23 | --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ | 23 | --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ |
24 | --with-hotplug=${sysconfdir}/hotplug.d \ | 24 | --with-hotplug=${sysconfdir}/hotplug.d \ |
25 | --disable-docbook-docs \ | 25 | --disable-docbook-docs \ |
diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb index 451f5796cd..67f9add9ab 100644 --- a/meta/packages/libtool/libtool-cross_2.2.6.bb +++ b/meta/packages/libtool/libtool-cross_2.2.6.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require libtool.inc | 1 | require libtool.inc |
2 | require libtool_${PV}.bb | 2 | require libtool_${PV}.bb |
3 | 3 | ||
4 | PR = "r23" | 4 | PR = "r24" |
5 | PACKAGES = "" | 5 | PACKAGES = "" |
6 | SRC_URI_append = " file://cross_compile.patch;patch=1 \ | 6 | SRC_URI_append = " file://cross_compile.patch;patch=1 \ |
7 | file://prefix.patch;patch=1" | 7 | file://prefix.patch;patch=1" |
@@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1" | |||
15 | #SRC_URI_append_linux = "${DOLT_PATCH}" | 15 | #SRC_URI_append_linux = "${DOLT_PATCH}" |
16 | #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}" | 16 | #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}" |
17 | 17 | ||
18 | prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" | 18 | prefix = "${STAGING_DIR_NATIVE}${prefix_native}" |
19 | exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 19 | exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" |
20 | bindir = "${STAGING_BINDIR_NATIVE}" | 20 | bindir = "${STAGING_BINDIR_NATIVE}" |
21 | 21 | ||
22 | do_compile () { | 22 | do_compile () { |
@@ -25,13 +25,13 @@ do_compile () { | |||
25 | 25 | ||
26 | do_stage () { | 26 | do_stage () { |
27 | install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool | 27 | install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool |
28 | install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal | 28 | install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal |
29 | install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ | 29 | install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ |
30 | install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ | 30 | install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ |
31 | install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/ | 31 | install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ |
32 | install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ | 32 | install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ |
33 | install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ | 33 | install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ |
34 | install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/ | 34 | install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ |
35 | } | 35 | } |
36 | 36 | ||
37 | do_install () { | 37 | do_install () { |
diff --git a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb index 008e580b9b..0017f38cde 100644 --- a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb +++ b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb | |||
@@ -38,7 +38,7 @@ do_stage() { | |||
38 | install -d ${STAGING_LIBDIR} | 38 | install -d ${STAGING_LIBDIR} |
39 | cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} | 39 | cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} |
40 | 40 | ||
41 | install -d ${STAGING_DIR_TARGET}${layout_base_libdir} | 41 | install -d ${STAGING_DIR_TARGET}${base_libdir} |
42 | cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} | 42 | cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} |
43 | } | 43 | } |
44 | 44 | ||
diff --git a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb index 879e719fcd..a8f987b7e1 100644 --- a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb +++ b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb | |||
@@ -38,7 +38,7 @@ do_stage() { | |||
38 | install -d ${STAGING_LIBDIR} | 38 | install -d ${STAGING_LIBDIR} |
39 | cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} | 39 | cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} |
40 | 40 | ||
41 | install -d ${STAGING_DIR_TARGET}${layout_base_libdir} | 41 | install -d ${STAGING_DIR_TARGET}${base_libdir} |
42 | cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} | 42 | cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} |
43 | } | 43 | } |
44 | 44 | ||
diff --git a/meta/packages/meta/external-csl-toolchain_2008q3-72.bb b/meta/packages/meta/external-csl-toolchain_2008q3-72.bb index c5dde36e9c..f02128dac6 100644 --- a/meta/packages/meta/external-csl-toolchain_2008q3-72.bb +++ b/meta/packages/meta/external-csl-toolchain_2008q3-72.bb | |||
@@ -39,7 +39,7 @@ do_stage() { | |||
39 | install -d ${STAGING_LIBDIR} | 39 | install -d ${STAGING_LIBDIR} |
40 | cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} | 40 | cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} |
41 | 41 | ||
42 | install -d ${STAGING_DIR_TARGET}${layout_base_libdir} | 42 | install -d ${STAGING_DIR_TARGET}${base_libdir} |
43 | cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} | 43 | cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} |
44 | 44 | ||
45 | sed -e "s# /lib# ../../lib#g" \ | 45 | sed -e "s# /lib# ../../lib#g" \ |
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb index acdf29c4a8..2b8666099d 100644 --- a/meta/packages/meta/external-poky-toolchain.bb +++ b/meta/packages/meta/external-poky-toolchain.bb | |||
@@ -25,15 +25,15 @@ do_stage() { | |||
25 | install -d ${DEPLOY_DIR}/ipk/ | 25 | install -d ${DEPLOY_DIR}/ipk/ |
26 | install -d ${STAGING_DIR}/pkgdata/ | 26 | install -d ${STAGING_DIR}/pkgdata/ |
27 | install -d ${STAGING_DIR_TARGET}/shlibs/ | 27 | install -d ${STAGING_DIR_TARGET}/shlibs/ |
28 | install -d ${STAGING_DIR_TARGET}/${layout_base_libdir}/ | 28 | install -d ${STAGING_DIR_TARGET}/${base_libdir}/ |
29 | install -d ${STAGING_DIR_TARGET}/${layout_libdir}/ | 29 | install -d ${STAGING_DIR_TARGET}/${libdir}/ |
30 | install -d ${STAGING_DIR_TARGET}/${layout_includedir}/ | 30 | install -d ${STAGING_DIR_TARGET}/${includedir}/ |
31 | 31 | ||
32 | cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/ | 32 | cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/ |
33 | cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ | 33 | cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ |
34 | cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ | 34 | cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ |
35 | cp -ar ${prefix}/${TARGET_SYS}/lib/* ${STAGING_DIR_TARGET}/${layout_base_libdir}/ | 35 | cp -ar ${prefix}/${TARGET_SYS}/lib/* ${STAGING_DIR_TARGET}/${base_libdir}/ |
36 | cp -ar ${prefix}/${TARGET_SYS}/usr/include/* ${STAGING_DIR_TARGET}/${layout_includedir}/ | 36 | cp -ar ${prefix}/${TARGET_SYS}/usr/include/* ${STAGING_DIR_TARGET}/${includedir}/ |
37 | cp -ar ${prefix}/${TARGET_SYS}/usr/lib/* ${STAGING_DIR_TARGET}/${layout_libdir}/ | 37 | cp -ar ${prefix}/${TARGET_SYS}/usr/lib/* ${STAGING_DIR_TARGET}/${libdir}/ |
38 | } | 38 | } |
39 | 39 | ||
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb index 65b802f6b2..91226a9d77 100644 --- a/meta/packages/meta/meta-toolchain.bb +++ b/meta/packages/meta/meta-toolchain.bb | |||
@@ -24,8 +24,8 @@ do_populate_sdk() { | |||
24 | rm -rf ${SDK_OUTPUT} | 24 | rm -rf ${SDK_OUTPUT} |
25 | rm -rf ${SDK_OUTPUT2} | 25 | rm -rf ${SDK_OUTPUT2} |
26 | mkdir -p ${SDK_OUTPUT} | 26 | mkdir -p ${SDK_OUTPUT} |
27 | mkdir -p ${SDK_OUTPUT}${layout_libdir}/opkg/ | 27 | mkdir -p ${SDK_OUTPUT}${libdir}/opkg/ |
28 | mkdir -p ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}${layout_libdir}/opkg/ | 28 | mkdir -p ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}${libdir}/opkg/ |
29 | 29 | ||
30 | rm -f ${IPKGCONF_TARGET} | 30 | rm -f ${IPKGCONF_TARGET} |
31 | touch ${IPKGCONF_TARGET} | 31 | touch ${IPKGCONF_TARGET} |
@@ -49,8 +49,8 @@ do_populate_sdk() { | |||
49 | mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATH}/usr/lib/opkg/ | 49 | mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATH}/usr/lib/opkg/ |
50 | rm -Rf ${SDK_OUTPUT}/usr/lib | 50 | rm -Rf ${SDK_OUTPUT}/usr/lib |
51 | 51 | ||
52 | install -d ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${layout_sysconfdir} | 52 | install -d ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir} |
53 | install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${layout_sysconfdir}/ | 53 | install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir}/ |
54 | 54 | ||
55 | install -d ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir} | 55 | install -d ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir} |
56 | install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir}/ | 56 | install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir}/ |
@@ -87,10 +87,10 @@ do_populate_sdk() { | |||
87 | 87 | ||
88 | # Fix or remove broken .la files | 88 | # Fix or remove broken .la files |
89 | for i in `find ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS} -name \*.la`; do | 89 | for i in `find ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS} -name \*.la`; do |
90 | sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${SDKPATH}/${TARGET_SYS}${layout_base_libdir},g" \ | 90 | sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1${SDKPATH}/${TARGET_SYS}${base_libdir},g" \ |
91 | -e "/^dependency_libs=/s,\([[:space:]']\)${layout_libdir},\1${SDKPATH}/${TARGET_SYS}${layout_libdir},g" \ | 91 | -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${SDKPATH}/${TARGET_SYS}${libdir},g" \ |
92 | -e "/^dependency_libs=/s,\-\([LR]\)${layout_base_libdir},-\1${SDKPATH}/${TARGET_SYS}${layout_base_libdir},g" \ | 92 | -e "/^dependency_libs=/s,\-\([LR]\)${base_libdir},-\1${SDKPATH}/${TARGET_SYS}${base_libdir},g" \ |
93 | -e "/^dependency_libs=/s,\-\([LR]\)${layout_libdir},-\1${SDKPATH}/${TARGET_SYS}${layout_libdir},g" \ | 93 | -e "/^dependency_libs=/s,\-\([LR]\)${libdir},-\1${SDKPATH}/${TARGET_SYS}${libdir},g" \ |
94 | -e 's/^installed=yes$/installed=no/' $i | 94 | -e 's/^installed=yes$/installed=no/' $i |
95 | done | 95 | done |
96 | rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la | 96 | rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la |
@@ -107,19 +107,19 @@ do_populate_sdk() { | |||
107 | touch $script | 107 | touch $script |
108 | echo 'export PATH=${SDKPATH}/bin:$PATH' >> $script | 108 | echo 'export PATH=${SDKPATH}/bin:$PATH' >> $script |
109 | echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKPATH}/${TARGET_SYS}' >> $script | 109 | echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKPATH}/${TARGET_SYS}' >> $script |
110 | echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${layout_libdir}/pkgconfig' >> $script | 110 | echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${libdir}/pkgconfig' >> $script |
111 | echo 'export CONFIG_SITE=${SDKPATH}/site-config' >> $script | 111 | echo 'export CONFIG_SITE=${SDKPATH}/site-config' >> $script |
112 | echo 'export CC=${TARGET_PREFIX}gcc' >> $script | 112 | echo 'export CC=${TARGET_PREFIX}gcc' >> $script |
113 | echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${BUILD_SYS}"' >> $script | 113 | echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${BUILD_SYS}"' >> $script |
114 | if [ "${TARGET_OS}" = "darwin8" ]; then | 114 | if [ "${TARGET_OS}" = "darwin8" ]; then |
115 | echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${layout_includedir}"' >> $script | 115 | echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${includedir}"' >> $script |
116 | echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${layout_libdir}"' >> $script | 116 | echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${libdir}"' >> $script |
117 | # Workaround darwin toolchain sysroot path problems | 117 | # Workaround darwin toolchain sysroot path problems |
118 | cd ${SDK_OUTPUT}${SDKPATH}/${TARGET_SYS}/usr | 118 | cd ${SDK_OUTPUT}${SDKPATH}/${TARGET_SYS}/usr |
119 | ln -s /usr/local local | 119 | ln -s /usr/local local |
120 | fi | 120 | fi |
121 | echo "alias opkg='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATH}'" >> $script | 121 | echo "alias opkg='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATH}'" >> $script |
122 | echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${TARGET_SYS}${layout_sysconfdir}/opkg.conf -o ${SDKPATH}/${TARGET_SYS}'" >> $script | 122 | echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${TARGET_SYS}${sysconfdir}/opkg.conf -o ${SDKPATH}/${TARGET_SYS}'" >> $script |
123 | 123 | ||
124 | # Add version information | 124 | # Add version information |
125 | versionfile=${SDK_OUTPUT}/${SDKPATH}/version | 125 | versionfile=${SDK_OUTPUT}/${SDKPATH}/version |
diff --git a/meta/packages/meta/staging-linkage_1.0.bb b/meta/packages/meta/staging-linkage_1.0.bb index 95d82d3273..2a50d1f04e 100644 --- a/meta/packages/meta/staging-linkage_1.0.bb +++ b/meta/packages/meta/staging-linkage_1.0.bb | |||
@@ -21,9 +21,9 @@ do_install() { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | do_stage () { | 23 | do_stage () { |
24 | if [ -e ${STAGING_DIR_HOST}${layout_base_libdir} ]; then | 24 | if [ -e ${STAGING_DIR_HOST}${base_libdir} ]; then |
25 | cp -pPRr ${STAGING_DIR_HOST}${layout_base_libdir}/* ${STAGING_LIBDIR} | 25 | cp -pPRr ${STAGING_DIR_HOST}${base_libdir}/* ${STAGING_LIBDIR} |
26 | mv ${STAGING_DIR_HOST}${layout_base_libdir}/ ${STAGING_DIR_HOST}${layout_libdir}-oldbackup | 26 | mv ${STAGING_DIR_HOST}${base_libdir}/ ${STAGING_DIR_HOST}${libdir}-oldbackup |
27 | fi | 27 | fi |
28 | ln -s ${STAGING_LIBDIR}/ ${STAGING_DIR_HOST}${layout_base_libdir} | 28 | ln -s ${STAGING_LIBDIR}/ ${STAGING_DIR_HOST}${base_libdir} |
29 | } | 29 | } |
diff --git a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb index 9e6bcd6eee..450313c2e7 100644 --- a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb | |||
@@ -1,7 +1,6 @@ | |||
1 | LICENSE = "GPL" | 1 | require module-init-tools.inc |
2 | require module-init-tools_${PV}.bb | 2 | PR = "r3" |
3 | inherit cross | 3 | inherit cross |
4 | DEFAULT_PREFERENCE = "0" | ||
5 | PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" | 4 | PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" |
6 | 5 | ||
7 | EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" | 6 | EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" |
diff --git a/meta/packages/module-init-tools/module-init-tools.inc b/meta/packages/module-init-tools/module-init-tools.inc new file mode 100644 index 0000000000..449b9fd455 --- /dev/null +++ b/meta/packages/module-init-tools/module-init-tools.inc | |||
@@ -0,0 +1,23 @@ | |||
1 | DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ | ||
2 | removing kernel modules for Linux (versions 2.5.48 and above). It serves \ | ||
3 | the same function that the modutils package serves for Linux 2.4." | ||
4 | LICENSE = "GPL" | ||
5 | SECTION = "base" | ||
6 | |||
7 | PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" | ||
8 | RDEPENDS_${PN} += "module-init-tools-depmod" | ||
9 | |||
10 | FILES_module-init-tools-depmod = "${sbindir}/depmod.26" | ||
11 | FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" | ||
12 | |||
13 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ | ||
14 | file://ignore_arch_directory;patch=1 \ | ||
15 | file://modutils_extension;patch=1 \ | ||
16 | file://no_man_rebuild;patch=1 \ | ||
17 | file://manpagesopt;patch=1 \ | ||
18 | file://module-init-tools-remove-index.patch;patch=1 " | ||
19 | S = "${WORKDIR}/module-init-tools-${PV}" | ||
20 | |||
21 | EXTRA_OECONF = "--disable-manpages" | ||
22 | |||
23 | inherit autotools | ||
diff --git a/meta/packages/module-init-tools/module-init-tools_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools_3.2.2.bb index dcf9063219..4977049b8a 100644 --- a/meta/packages/module-init-tools/module-init-tools_3.2.2.bb +++ b/meta/packages/module-init-tools/module-init-tools_3.2.2.bb | |||
@@ -1,31 +1,9 @@ | |||
1 | DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ | 1 | require module-init-tools.inc |
2 | removing kernel modules for Linux (versions 2.5.48 and above). It serves \ | ||
3 | the same function that the modutils package serves for Linux 2.4." | ||
4 | LICENSE = "GPL" | ||
5 | SECTION = "base" | ||
6 | PR = "r3" | 2 | PR = "r3" |
7 | 3 | ||
8 | PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" | ||
9 | RDEPENDS_${PN} += "module-init-tools-depmod" | ||
10 | |||
11 | FILES_module-init-tools-depmod = "${sbindir}/depmod.26" | ||
12 | FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" | ||
13 | |||
14 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ | ||
15 | file://ignore_arch_directory;patch=1 \ | ||
16 | file://modutils_extension;patch=1 \ | ||
17 | file://no_man_rebuild;patch=1 \ | ||
18 | file://manpagesopt;patch=1 \ | ||
19 | file://module-init-tools-remove-index.patch;patch=1 " | ||
20 | S = "${WORKDIR}/module-init-tools-${PV}" | ||
21 | |||
22 | EXTRA_OECONF = "--disable-manpages" | ||
23 | |||
24 | bindir = "/bin" | 4 | bindir = "/bin" |
25 | sbindir = "/sbin" | 5 | sbindir = "/sbin" |
26 | 6 | ||
27 | inherit autotools | ||
28 | |||
29 | do_install() { | 7 | do_install() { |
30 | autotools_do_install | 8 | autotools_do_install |
31 | for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do | 9 | for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do |
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb index ff862211c3..36aee351bb 100644 --- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb +++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb | |||
@@ -59,12 +59,12 @@ EXTRA_OECONF =+ "--enable-application=xulrunner --enable-default-toolkit=cairo-h | |||
59 | export LIBXUL_DIST="${S}/dist" | 59 | export LIBXUL_DIST="${S}/dist" |
60 | 60 | ||
61 | do_stage_append () { | 61 | do_stage_append () { |
62 | autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ | 62 | autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-1.9.2a1pre ${STAGING_DIR_HOST}${libdir}/xulrunner-1.9.2a1pre/ |
63 | autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-devel-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/ | 63 | autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-devel-1.9.2a1pre ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/ |
64 | ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/bin | 64 | ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-1.9.2a1pre/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/bin |
65 | ln -fs ${STAGING_DIR_HOST}${layout_datadir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/idl | 65 | ln -fs ${STAGING_DIR_HOST}${datadir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/idl |
66 | ln -fs ${STAGING_DIR_HOST}${layout_includedir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/include | 66 | ln -fs ${STAGING_DIR_HOST}${includedir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/include |
67 | ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/lib | 67 | ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/lib |
68 | install -m 755 ${S}/dist/host/bin/host_xpidl ${STAGING_BINDIR_NATIVE}/xpidl | 68 | install -m 755 ${S}/dist/host/bin/host_xpidl ${STAGING_BINDIR_NATIVE}/xpidl |
69 | } | 69 | } |
70 | 70 | ||
diff --git a/meta/packages/pax-utils/pax-utils-native_0.1.19.bb b/meta/packages/pax-utils/pax-utils-native_0.1.19.bb index cf89f803bf..a8db2d8f2a 100644 --- a/meta/packages/pax-utils/pax-utils-native_0.1.19.bb +++ b/meta/packages/pax-utils/pax-utils-native_0.1.19.bb | |||
@@ -3,5 +3,5 @@ inherit native | |||
3 | require pax-utils_${PV}.bb | 3 | require pax-utils_${PV}.bb |
4 | 4 | ||
5 | do_stage() { | 5 | do_stage() { |
6 | oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install | 6 | oe_runmake PREFIX=${STAGING_DIR_HOST}${prefix} install |
7 | } | 7 | } |
diff --git a/meta/packages/python/python-native_2.5.1.bb b/meta/packages/python/python-native_2.5.1.bb index 4f6a4a84ca..df3d3c899d 100644 --- a/meta/packages/python/python-native_2.5.1.bb +++ b/meta/packages/python/python-native_2.5.1.bb | |||
@@ -22,9 +22,6 @@ S = "${WORKDIR}/Python-${PV}" | |||
22 | 22 | ||
23 | inherit autotools native | 23 | inherit autotools native |
24 | 24 | ||
25 | prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" | ||
26 | exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" | ||
27 | |||
28 | EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ | 25 | EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ |
29 | --without-cxx --with-signal-module --with-wctype-functions" | 26 | --without-cxx --with-signal-module --with-wctype-functions" |
30 | EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \ | 27 | EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \ |
diff --git a/meta/packages/rpm/rpm-native_4.4.2.3.bb b/meta/packages/rpm/rpm-native_4.4.2.3.bb index 5ed737e366..1545801370 100644 --- a/meta/packages/rpm/rpm-native_4.4.2.3.bb +++ b/meta/packages/rpm/rpm-native_4.4.2.3.bb | |||
@@ -3,5 +3,4 @@ inherit native | |||
3 | 3 | ||
4 | DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native" | 4 | DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native" |
5 | 5 | ||
6 | export localstatedir = "${layout_localstatedir}" | 6 | export varprefix = "${localstatedir}" |
7 | export varprefix = "${layout_localstatedir}" | ||
diff --git a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb index bc821bc1a7..d13089501f 100644 --- a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb +++ b/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb | |||
@@ -35,7 +35,7 @@ EXTRA_OECONF = "--enable-menubar --enable-xim \ | |||
35 | --enable-text-blink --enable-rxvt-scroll \ | 35 | --enable-text-blink --enable-rxvt-scroll \ |
36 | --enable-combining --enable-shared \ | 36 | --enable-combining --enable-shared \ |
37 | --enable-xgetdefault \ | 37 | --enable-xgetdefault \ |
38 | --with-x=${STAGING_DIR_HOST}${layout_prefix}" | 38 | --with-x=${STAGING_DIR_HOST}${prefix}" |
39 | EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \ | 39 | EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \ |
40 | 'XLIB=-L${STAGING_LIBDIR} -lX11'" | 40 | 'XLIB=-L${STAGING_LIBDIR} -lX11'" |
41 | 41 | ||
diff --git a/meta/packages/uclibc/uclibc.inc b/meta/packages/uclibc/uclibc.inc index 68dcd14ef8..d0afff5f3c 100644 --- a/meta/packages/uclibc/uclibc.inc +++ b/meta/packages/uclibc/uclibc.inc | |||
@@ -66,7 +66,7 @@ UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCAL | |||
66 | SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ | 66 | SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ |
67 | file://uClibc.config" | 67 | file://uClibc.config" |
68 | 68 | ||
69 | UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}" | 69 | UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${prefix}" |
70 | 70 | ||
71 | # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in | 71 | # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in |
72 | # the CFLAGS (for when building the utils). | 72 | # the CFLAGS (for when building the utils). |