From 0e09147de182aeb96cff9ff59211b3d907ba83f7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 12 Nov 2007 11:06:34 +0000 Subject: Remove hardcoded staging layout assumptions git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3116 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/claws-mail/claws-mail.inc | 2 +- meta/packages/curl/curl_7.16.2.bb | 2 +- meta/packages/eds/eds-dbus_svn.bb | 2 +- meta/packages/gcc/gcc-cross-initial.inc | 2 +- meta/packages/gcc/gcc4-build-sdk.inc | 4 ++-- meta/packages/gstreamer/gstreamer_0.10.14.bb | 4 ++-- meta/packages/hal/hal_0.5.9.1.bb | 2 +- meta/packages/hal/hal_git.bb | 2 +- meta/packages/libidl/libidl_0.8.3.bb | 2 +- meta/packages/libxslt/libxslt_1.1.20.bb | 4 ++-- meta/packages/maemo/xpext_1.0-5.bb | 4 ++-- meta/packages/maemo/xsp_1.0.0-8.bb | 4 ++-- meta/packages/meta/external-poky-toolchain.bb | 4 ++-- meta/packages/meta/meta-toolchain.bb | 4 ++-- meta/packages/opensync/libopensync_svn.bb | 1 - meta/packages/pax-utils/pax-utils-native_0.1.13.bb | 2 +- meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb | 2 +- meta/packages/tremor/tremor_20041119.bb | 2 +- 18 files changed, 24 insertions(+), 25 deletions(-) (limited to 'meta') diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/packages/claws-mail/claws-mail.inc index 698f632fb..938ba3207 100644 --- 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 23a7fb684..af705141a 100644 --- 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 222b17bd4..9b70de8c5 100644 --- 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 7c56afece..2165bf22c 100644 --- 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 77d326b3e..1fcd1e80d 100644 --- 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 39aa0314c..c6134d7fa 100644 --- 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 1698b7e05..6c7bcebd3 100644 --- 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 8d4aea834..44be44f98 100644 --- 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 6a4e0f895..b3c59623a 100644 --- 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 fa063142b..6ec59f14b 100644 --- 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 cc40205c5..343db1522 100644 --- 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 d5f94c64c..878ddec50 100644 --- 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 87c1ba414..f26e5761f 100644 --- 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 16e48a0c5..b6705e0a5 100644 --- 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 e3631136e..9d17684f3 100644 --- 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 d586dcb29..cf89f803b 100644 --- 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 5455e0c58..f4a4da1e8 100644 --- 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 276ac491e..b37cba5b4 100644 --- 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} \ -- cgit v1.2.3