diff options
Diffstat (limited to 'packages')
23 files changed, 34 insertions, 35 deletions
diff --git a/packages/agg/agg_2.5.bb b/packages/agg/agg_2.5.bb index 84bbb4d4bb..f91d0112be 100644 --- a/packages/agg/agg_2.5.bb +++ b/packages/agg/agg_2.5.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/${P}" inherit autotools pkgconfig -EXTRA_OECONF = "--with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" +EXTRA_OECONF = "--with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}" CFLAGS += " -I{$STAGING_INCDIR} " PACKAGES =+ "${PN}-sdl ${PN}-x11" diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb index b3a4463451..6535b5e2bb 100644 --- a/packages/frodo/frodo_4.2.bb +++ b/packages/frodo/frodo_4.2.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}/Frodo4/Src" inherit autotools -EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" +EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}" do_install() { install -d ${D}${palmtopdir}/bin \ diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb index 238f5c2fd0..450dc82b08 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb @@ -10,4 +10,4 @@ require gcc_${PV}.bb require gcc4-build-sdk.inc require gcc-package-sdk.inc -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb index 0328f45cfb..bfcfac2033 100644 --- a/packages/gcc/gcc-cross_4.1.0.bb +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -15,4 +15,4 @@ require gcc3-build-cross.inc # cross packaging require gcc-package-cross.inc -EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" +EXTRA_OECONF += "--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 55d2cbde15..8a66ce250e 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -17,4 +17,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}/${BUILD_SYS}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb index 629e87b653..8204e2c316 100644 --- a/packages/gcc/gcc-cross_4.1.2.bb +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -17,4 +17,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}/${BUILD_SYS}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index 3272876326..da27c68d9a 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -17,4 +17,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}/${BUILD_SYS}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb index 9025a98f3c..1d5ebdcc61 100644 --- a/packages/gcc/gcc-cross_4.2.2.bb +++ b/packages/gcc/gcc-cross_4.2.2.bb @@ -17,4 +17,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}/${BUILD_SYS}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc index c33458eebc..0ddcef82d9 100644 --- a/packages/klibc/klibc.inc +++ b/packages/klibc/klibc.inc @@ -60,7 +60,7 @@ do_stage() { rm -rf "${STAGING_KLIBC_DIR}" oe_runmake 'prefix=${STAGING_KLIBC_DIR}' \ 'bindir=${STAGING_BINDIR}' \ - 'mandir=${STAGING_DATADIR}/man' \ + 'mandir=${STAGING_DIR_HOST}${layout_mandir}' \ install # The following is sufficient, at least in klibc 1.1.1 to make klcc # use the staged libraries and include files. diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb index fbb37d88d7..4c1b7c2e1f 100644 --- a/packages/libtool/libtool-cross_1.5.10.bb +++ b/packages/libtool/libtool-cross_1.5.10.bb @@ -11,8 +11,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR}" -exec_prefix = "${prefix}/${BUILD_SYS}" +prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" +exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { diff --git a/packages/libtool/libtool-cross_1.5.22.bb b/packages/libtool/libtool-cross_1.5.22.bb index 8edb1f0a44..c91647b559 100644 --- a/packages/libtool/libtool-cross_1.5.22.bb +++ b/packages/libtool/libtool-cross_1.5.22.bb @@ -14,8 +14,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR}" -exec_prefix = "${prefix}/${BUILD_SYS}" +prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" +exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { diff --git a/packages/libtool/libtool-cross_1.5.24.bb b/packages/libtool/libtool-cross_1.5.24.bb index f782982b88..e60db4b808 100644 --- a/packages/libtool/libtool-cross_1.5.24.bb +++ b/packages/libtool/libtool-cross_1.5.24.bb @@ -11,8 +11,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR}" -exec_prefix = "${prefix}/${BUILD_SYS}" +prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" +exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { diff --git a/packages/modphp/modphp5.inc b/packages/modphp/modphp5.inc index b4bdd15f5b..202cacc75b 100644 --- a/packages/modphp/modphp5.inc +++ b/packages/modphp/modphp5.inc @@ -29,14 +29,14 @@ EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_NATIVE}/apxs \ --disable-simplexml \ --disable-libxml \ --disable-dom \ - --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ + --with-zlib --with-zlib-dir=${STAGING_DIR_NATIVE}${layout_exec_prefix} \ --with-config-file-path=/etc/php/apache2-php5" -# --with-libxml-dir=${STAGING_DIR}/${BUILD_SYS}/ \ +# --with-libxml-dir=${STAGING_DIR_NATIVE}${layout_exec_prefix} \ # to get postgres support, add it to the DEPENDS above # and uncomment this line. similar for mysql -#EXTRA_OECONF += " --with-pgsql=${STAGING_LIBDIR}/.." +#EXTRA_OECONF += " --with-pgsql=${STAGING_DIR_HOST}${layout_exec_prefix}" acpaths = "" @@ -45,7 +45,7 @@ acpaths = "" # which breaks everything... # do_configure() { - export PHP_LIBXML_DIR=${STAGING_DIR}/${BUILD_SYS} + export PHP_LIBXML_DIR=${STAGING_DIR_NATIVE}${layout_exec_prefix} oe_runconf } diff --git a/packages/prboom/prboom_2.2.6.bb b/packages/prboom/prboom_2.2.6.bb index f20aae2b64..a54616db71 100644 --- a/packages/prboom/prboom_2.2.6.bb +++ b/packages/prboom/prboom_2.2.6.bb @@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \ inherit autotools -EXTRA_OECONF = " --without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS} " +EXTRA_OECONF = "--without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}" do_configure() { gnu-configize diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb index 88d1f6a183..7af6048bcd 100644 --- a/packages/prboom/prboom_2.3.1.bb +++ b/packages/prboom/prboom_2.3.1.bb @@ -16,7 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \ inherit autotools -EXTRA_OECONF = " --without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS} " +EXTRA_OECONF = "--without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}" do_configure() { gnu-configize diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb index 2587c5f421..ea6e257043 100644 --- a/packages/python/python-native_2.5.1.bb +++ b/packages/python/python-native_2.5.1.bb @@ -17,8 +17,8 @@ S = "${WORKDIR}/Python-${PV}" inherit autotools native -prefix = "${STAGING_DIR}/${BUILD_SYS}" -exec_prefix = "${STAGING_DIR}/${BUILD_SYS}" +prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" +exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ --without-cxx --with-signal-module --with-wctype-functions" diff --git a/packages/python/python24-native_2.4.0.bb b/packages/python/python24-native_2.4.0.bb index 0d852994b3..15b2b4c0fe 100644 --- a/packages/python/python24-native_2.4.0.bb +++ b/packages/python/python24-native_2.4.0.bb @@ -16,8 +16,8 @@ S = "${WORKDIR}/Python-2.4" inherit autotools native -prefix = "${STAGING_DIR}/${BUILD_SYS}" -exec_prefix = "${STAGING_DIR}/${BUILD_SYS}" +prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" +exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ --without-cxx --with-signal-module --with-wctype-functions" diff --git a/packages/qemu/qemu-native.inc b/packages/qemu/qemu-native.inc index f97e031f73..a20f5056b5 100644 --- a/packages/qemu/qemu-native.inc +++ b/packages/qemu/qemu-native.inc @@ -1,5 +1,4 @@ FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:" -# prefix = "${STAGING_DIR}/${BUILD_SYS}" DEPENDS = "libsdl-native zlib-native" require qemu-gcc3-check.inc diff --git a/packages/qemu/qemu-native_20070613.bb b/packages/qemu/qemu-native_20070613.bb index 88c944a308..d440d560e8 100644 --- a/packages/qemu/qemu-native_20070613.bb +++ b/packages/qemu/qemu-native_20070613.bb @@ -1,7 +1,7 @@ require qemu_${PV}.bb inherit native DEPENDS = "zlib-native" -prefix = "${STAGING_DIR}/${BUILD_SYS}" +prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" require qemu-gcc3-check.inc diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb index 775fed148f..1e40cd7a55 100644 --- a/packages/subversion/subversion_1.3.1.bb +++ b/packages/subversion/subversion_1.3.1.bb @@ -9,7 +9,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://apr-regex.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ +EXTRA_OECONF = "--with-neon=${STAGING_DIR_NATIVE}${layout_exec_prefix} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" diff --git a/packages/swig/swig_1.3.31.bb b/packages/swig/swig_1.3.31.bb index c8f595be07..8a8138c21c 100644 --- a/packages/swig/swig_1.3.31.bb +++ b/packages/swig/swig_1.3.31.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/swig-${PV}" inherit autotools -EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig" +EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR_NATIVE}/swig" do_configure() { oe_runconf diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc index 77ef361980..8f0c715a89 100644 --- a/packages/uicmoc/uicmoc4-native.inc +++ b/packages/uicmoc/uicmoc4-native.inc @@ -11,7 +11,7 @@ S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" inherit native -EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \ +EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \ -qt-libjpeg -qt-gif -system-zlib \ -no-nis -no-cups -no-exceptions \ -no-accessibility -no-libjpeg \ @@ -56,6 +56,6 @@ do_stage() { install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 - install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/ - install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/ + install -d ${STAGING_DIR_NATIVE}/qt4/ + install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ } diff --git a/packages/uicmoc/uicmoc4-native_4.3.0.bb b/packages/uicmoc/uicmoc4-native_4.3.0.bb index 93a2b6a4ce..bc5aba4102 100644 --- a/packages/uicmoc/uicmoc4-native_4.3.0.bb +++ b/packages/uicmoc/uicmoc4-native_4.3.0.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}" inherit native -EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \ +EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \ -qt-libjpeg -qt-gif -system-zlib \ -no-nis -no-cups -no-exceptions \ -no-accessibility -no-libjpeg \ @@ -48,6 +48,6 @@ do_stage() { install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 - install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/ - install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/ + install -d ${STAGING_DIR_NATIVE}/qt4/ + install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ } |