Remove hardcoded staging layout assumptions

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3116 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/packages/claws-mail/claws-mail.inc
index 698f632fbd339081a92e3ee6067fb826c6aaeb6b..938ba3207d51410c9f24529e35b06a6129f5ff6c 100644 (file)
--- a/meta/packages/claws-mail/claws-mail.inc
+++ b/meta/packages/claws-mail/claws-mail.inc
@@ -15,7 +15,7 @@ SRC_URI = "\
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 
 #EXTRA_OECONF = "--disable-aspell-test \
-# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR}/${HOST_SYS} \
+# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} \
 # --enable-aspell"
 
 EXTRA_OECONF = "--disable-aspell-test          \

diff --git a/meta/packages/curl/curl_7.16.2.bb b/meta/packages/curl/curl_7.16.2.bb
index 23a7fb6840626321cf74961920b3a3d4f8ee386f..af705141a5202937f9479654d7c6a051a50a3d5c 100644 (file)
--- a/meta/packages/curl/curl_7.16.2.bb
+++ b/meta/packages/curl/curl_7.16.2.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/curl-${PV}"
 
 inherit autotools pkgconfig binconfig
 
-EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
+EXTRA_OECONF = "--with-zlib=${STAGING_DIR_HOST}${layout_prefix}/ \
                --without-ssl \
                --with-random=/dev/urandom \
                --without-idn \

diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb
index 222b17bd4c4ec144313f2f31ad27aff7fbbea0c1..9b70de8c50c852345f00039c103b9f13d5520cb6 100644 (file)
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -21,7 +21,7 @@ inherit autotools pkgconfig
 LDFLAGS += "-lpthread"
 
 do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
-EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR}/${HOST_SYS} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
+EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
 
 
 PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev"

diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/packages/gcc/gcc-cross-initial.inc
index 7c56afecef35c7abfeb37be62e6d9269605e0067..2165bf22ce43258249f7cb4a846efad6b6e45dd9 100644 (file)
--- a/meta/packages/gcc/gcc-cross-initial.inc
+++ b/meta/packages/gcc/gcc-cross-initial.inc
@@ -4,7 +4,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 PACKAGES = ""
 
 # This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
                --with-newlib \
                --disable-shared \
                --disable-threads \

diff --git a/meta/packages/gcc/gcc4-build-sdk.inc b/meta/packages/gcc/gcc4-build-sdk.inc
index 77d326b3eeba074b89c13b3b230720697e291169..1fcd1e80d07da64a0cde01d08ed90986c4937e17 100644 (file)
--- a/meta/packages/gcc/gcc4-build-sdk.inc
+++ b/meta/packages/gcc/gcc4-build-sdk.inc
@@ -7,8 +7,8 @@ EXTRA_OECONF += "--with-sysroot=${SYSROOT}"
 do_configure () {
        # Work around Hardcoded path assumptions in gcc
        mkdir -p ${SYSROOT}/usr/
-       ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include
-       ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib
+       ln -s ${STAGING_DIR_TARGET}${layout_includedir} ${SYSROOT}/usr/include
+       ln -s ${STAGING_DIR_TARGET}${layout_libdir} ${SYSROOT}/usr/lib
        (cd ${S} && gnu-configize) || die "failure running gnu-configize"
        (cd ${S}/libstdc++-v3 && autoreconf)
        oe_runconf

diff --git a/meta/packages/gstreamer/gstreamer_0.10.14.bb b/meta/packages/gstreamer/gstreamer_0.10.14.bb
index 39aa0314cfa01379e61641493be276fc3baf2953..c6134d7fa7fdea78e8c2a37e7b8effafdccee359 100644 (file)
--- a/meta/packages/gstreamer/gstreamer_0.10.14.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.14.bb
@@ -20,12 +20,12 @@ EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=
 #}
 
 do_stage() {
-       oe_runmake install prefix=${STAGING_DIR} \
+       oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
               bindir=${STAGING_BINDIR} \
               includedir=${STAGING_INCDIR} \
               libdir=${STAGING_LIBDIR} \
               datadir=${STAGING_DATADIR} \
-              mandir=${STAGING_DIR}/share/man
+              mandir=${STAGING_DIR_HOST}${layout_mandir}
 }
 
 FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"

diff --git a/meta/packages/hal/hal_0.5.9.1.bb b/meta/packages/hal/hal_0.5.9.1.bb
index 1698b7e050c92300ff5cfd921990e8e0dcc30cdd..6c7bcebd3f9e9162dd6cac43c9b4e40f6060f968 100644 (file)
--- a/meta/packages/hal/hal_0.5.9.1.bb
+++ b/meta/packages/hal/hal_0.5.9.1.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/hal-${PV}"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
-                --with-expat=${STAGING_LIBDIR}/.. \
+                --with-expat=${STAGING_DIR_HOST}${layout_prefix} \
                 --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
                 --with-hotplug=${sysconfdir}/hotplug.d \
                 --disable-docbook-docs \

diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 8d4aea834da608961e1ae10f2ee5353d655b0bfa..44be44f98069a59ea9acafb3294a4ba7d307b7a6 100644 (file)
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
-                --with-expat=${STAGING_LIBDIR}/.. \
+                --with-expat=${STAGING_DIR_HOST}${layout_prefix} \
                 --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
                 --with-hotplug=${sysconfdir}/hotplug.d \
                 --disable-docbook-docs \

diff --git a/meta/packages/libidl/libidl_0.8.3.bb b/meta/packages/libidl/libidl_0.8.3.bb
index 6a4e0f895c6c43b83d5e7f2d878447de42b3ec4d..b3c59623a3d9ed2678d2a00e17dcfc19fe12b633 100644 (file)
--- a/meta/packages/libidl/libidl_0.8.3.bb
+++ b/meta/packages/libidl/libidl_0.8.3.bb
@@ -15,7 +15,7 @@ inherit autotools pkgconfig binconfig
 
 do_stage() {
        oe_runmake install \
-               prefix=${STAGING_DIR} \
+               prefix=${STAGING_DIR_HOST}${layout_prefix} \
                bindir=${STAGING_BINDIR} \
                includedir=${STAGING_INCDIR} \
                libdir=${STAGING_LIBDIR} \

diff --git a/meta/packages/libxslt/libxslt_1.1.20.bb b/meta/packages/libxslt/libxslt_1.1.20.bb
index fa063142b6f16e88c2f8f401b24642760dc09bc2..6ec59f14be412ca501671da783a0319430b7e991 100644 (file)
--- a/meta/packages/libxslt/libxslt_1.1.20.bb
+++ b/meta/packages/libxslt/libxslt_1.1.20.bb
@@ -30,8 +30,8 @@ do_stage () {
                install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
        done
 
-       cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
-                            -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
+       cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR_HOST}${layout_prefix}," \
+                            -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}," \
                             -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
                             -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
        chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config

diff --git a/meta/packages/maemo/xpext_1.0-5.bb b/meta/packages/maemo/xpext_1.0-5.bb
index cc40205c501185e5494b8f2720f0101bac061aee..343db15223b32b016a9ceb6378487846e4dabe92 100644 (file)
--- a/meta/packages/maemo/xpext_1.0-5.bb
+++ b/meta/packages/maemo/xpext_1.0-5.bb
@@ -18,10 +18,10 @@ do_configure_prepend () {
 }
 
 do_stage() {
-       oe_runmake install prefix=${STAGING_DIR} \
+       oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
               bindir=${STAGING_BINDIR} \
               includedir=${STAGING_INCDIR} \
               libdir=${STAGING_LIBDIR} \
               datadir=${STAGING_DATADIR} \
-              mandir=${STAGING_DATADIR}/man
+              mandir=${STAGING_DIR_HOST}${layout_mandir}
 }

diff --git a/meta/packages/maemo/xsp_1.0.0-8.bb b/meta/packages/maemo/xsp_1.0.0-8.bb
index d5f94c64cd775583ec71657b18e0fb01e4d19a8e..878ddec5085e807e9b4d97f491305046e9754767 100644 (file)
--- a/meta/packages/maemo/xsp_1.0.0-8.bb
+++ b/meta/packages/maemo/xsp_1.0.0-8.bb
@@ -11,10 +11,10 @@ S = "${WORKDIR}/Xsp"
 inherit autotools pkgconfig
 
 do_stage() {
-       oe_runmake install prefix=${STAGING_DIR} \
+       oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
               bindir=${STAGING_BINDIR} \
               includedir=${STAGING_INCDIR} \
               libdir=${STAGING_LIBDIR} \
               datadir=${STAGING_DATADIR} \
-              mandir=${STAGING_DATADIR}/man
+              mandir=${STAGING_DIR_HOST}${layout_mandir}
 }

diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 87c1ba4145e614d6868bf23afe961f60dc2d0dfb..f26e5761f2d325b0d53e929f881e8313bd7455ef 100644 (file)
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -28,11 +28,11 @@ do_stage() {
        install -d ${DEPLOY_DIR}/ipk/
        install -d ${STAGING_DIR}/pkgdata/
        install -d ${STAGING_DIR}/pkgmaps/
-       install -d ${STAGING_DIR}/${TARGET_SYS}/shlibs/
+       install -d ${STAGING_DIR_TARGET}/shlibs/
 
        cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/
        cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
        cp -ar ${prefix}/pkgmaps/* ${STAGING_DIR}/pkgmaps/
-       cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR}/${TARGET_SYS}/shlibs/
+       cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
 }
 

diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 16e48a0c564bd371c6cced48694f1b28e0006897..b6705e0a53c1a4dfd3e69b248d379d0c7a848d7c 100644 (file)
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -91,8 +91,8 @@ do_populate_sdk() {
                                        if [ -e ${STAGING_DIR}/pkgmaps/debian/$subpkg ]; then
                                                cp ${STAGING_DIR}/pkgmaps/debian/$subpkg ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/
                                        fi
-                                       if [ -e ${STAGING_DIR}/${TARGET_SYS}/shlibs/$subpkg.list ]; then
-                                               cp ${STAGING_DIR}/${TARGET_SYS}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
+                                       if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then
+                                               cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
                                        fi
                                done
                                break

diff --git a/meta/packages/opensync/libopensync_svn.bb b/meta/packages/opensync/libopensync_svn.bb
index e3631136e362162d95d6fec1a8a3ac60db0342cf..9d17684f39f92ef9a41fe969a0bd39a4a2f404ad 100644 (file)
--- a/meta/packages/opensync/libopensync_svn.bb
+++ b/meta/packages/opensync/libopensync_svn.bb
@@ -21,7 +21,6 @@ LEAD_SONAME = "libopensync.so"
 FILES_${PN} += " ${libdir}/opensync/formats/*.so ${datadir}/opensync/ ${libdir}/*.so"
 
 export HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
-#export PKG_CONFIG_PATH = "${STAGING_DIR}/${TARGET_SYS}/share/pkgconfig"
 
 do_stage() {
     install -d ${STAGING_LIBDIR}/formats

diff --git a/meta/packages/pax-utils/pax-utils-native_0.1.13.bb b/meta/packages/pax-utils/pax-utils-native_0.1.13.bb
index d586dcb29eb69f95653e50336441469559324886..cf89f803bf79ab5f7d58c0d3b6569b532c2b727b 100644 (file)
--- a/meta/packages/pax-utils/pax-utils-native_0.1.13.bb
+++ b/meta/packages/pax-utils/pax-utils-native_0.1.13.bb
@@ -3,5 +3,5 @@ inherit native
 require pax-utils_${PV}.bb
 
 do_stage() {
-    oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install
+    oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install
 }

diff --git a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 5455e0c58b16894589af4ab9b44c1abaf9388dfc..f4a4da1e8a9c4a8ae3688a751fd6c69c48ee9c35 100644 (file)
--- a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -31,7 +31,7 @@ EXTRA_OECONF = "--enable-menubar --enable-xim \
                --enable-text-blink --enable-rxvt-scroll \
                --enable-combining --enable-shared \
                --enable-xgetdefault \
-               --with-x=${STAGING_LIBDIR}/.."
+               --with-x=${STAGING_DIR_HOST}${layout_prefix}"
 EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
                'XLIB=-L${STAGING_LIBDIR} -lX11'"
 

diff --git a/meta/packages/tremor/tremor_20041119.bb b/meta/packages/tremor/tremor_20041119.bb
index 276ac491e0f1507816730909fce4b3ba6a708a57..b37cba5b4c5c099dafff0e3251ca190897d88d9b 100644 (file)
--- a/meta/packages/tremor/tremor_20041119.bb
+++ b/meta/packages/tremor/tremor_20041119.bb
@@ -19,7 +19,7 @@ EXTRA_OECONF=" --enable-shared --disable-rpath  "
 #}
 
 do_stage() {
-       oe_runmake install prefix=${STAGING_DIR} \
+       oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
               bindir=${STAGING_BINDIR} \
               includedir=${STAGING_INCDIR}/tremor \
               libdir=${STAGING_LIBDIR} \