summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-12 11:06:34 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-12 11:06:34 +0000
commit0e09147de182aeb96cff9ff59211b3d907ba83f7 (patch)
tree004da019bcbfcd9e2325f1855877eca18fc56587
parent19f1bad37806b5e0b4d971d09226eda51345c9d2 (diff)
downloadpoky-0e09147de182aeb96cff9ff59211b3d907ba83f7.tar.gz
Remove hardcoded staging layout assumptions
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3116 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/claws-mail/claws-mail.inc2
-rw-r--r--meta/packages/curl/curl_7.16.2.bb2
-rw-r--r--meta/packages/eds/eds-dbus_svn.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/packages/gcc/gcc4-build-sdk.inc4
-rw-r--r--meta/packages/gstreamer/gstreamer_0.10.14.bb4
-rw-r--r--meta/packages/hal/hal_0.5.9.1.bb2
-rw-r--r--meta/packages/hal/hal_git.bb2
-rw-r--r--meta/packages/libidl/libidl_0.8.3.bb2
-rw-r--r--meta/packages/libxslt/libxslt_1.1.20.bb4
-rw-r--r--meta/packages/maemo/xpext_1.0-5.bb4
-rw-r--r--meta/packages/maemo/xsp_1.0.0-8.bb4
-rw-r--r--meta/packages/meta/external-poky-toolchain.bb4
-rw-r--r--meta/packages/meta/meta-toolchain.bb4
-rw-r--r--meta/packages/opensync/libopensync_svn.bb1
-rw-r--r--meta/packages/pax-utils/pax-utils-native_0.1.13.bb2
-rw-r--r--meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb2
-rw-r--r--meta/packages/tremor/tremor_20041119.bb2
18 files changed, 24 insertions, 25 deletions
diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/packages/claws-mail/claws-mail.inc
index 698f632fbd..938ba3207d 100644
--- a/meta/packages/claws-mail/claws-mail.inc
+++ b/meta/packages/claws-mail/claws-mail.inc
@@ -15,7 +15,7 @@ SRC_URI = "\
15FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" 15FILES_${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_SYS} \ 18# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} \
19# --enable-aspell" 19# --enable-aspell"
20 20
21EXTRA_OECONF = "--disable-aspell-test \ 21EXTRA_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 23a7fb6840..af705141a5 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}"
10 10
11inherit autotools pkgconfig binconfig 11inherit autotools pkgconfig binconfig
12 12
13EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ 13EXTRA_OECONF = "--with-zlib=${STAGING_DIR_HOST}${layout_prefix}/ \
14 --without-ssl \ 14 --without-ssl \
15 --with-random=/dev/urandom \ 15 --with-random=/dev/urandom \
16 --without-idn \ 16 --without-idn \
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb
index 222b17bd4c..9b70de8c50 100644
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -21,7 +21,7 @@ inherit autotools pkgconfig
21LDFLAGS += "-lpthread" 21LDFLAGS += "-lpthread"
22 22
23do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} " 23do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
24EXTRA_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" 24EXTRA_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"
25 25
26 26
27PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev" 27PACKAGES =+ "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 7c56afecef..2165bf22ce 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"
4PACKAGES = "" 4PACKAGES = ""
5 5
6# This is intended to be a -very- basic config 6# This is intended to be a -very- basic config
7EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \ 7EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
8 --with-newlib \ 8 --with-newlib \
9 --disable-shared \ 9 --disable-shared \
10 --disable-threads \ 10 --disable-threads \
diff --git a/meta/packages/gcc/gcc4-build-sdk.inc b/meta/packages/gcc/gcc4-build-sdk.inc
index 77d326b3ee..1fcd1e80d0 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}"
7do_configure () { 7do_configure () {
8 # Work around Hardcoded path assumptions in gcc 8 # Work around Hardcoded path assumptions in gcc
9 mkdir -p ${SYSROOT}/usr/ 9 mkdir -p ${SYSROOT}/usr/
10 ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include 10 ln -s ${STAGING_DIR_TARGET}${layout_includedir} ${SYSROOT}/usr/include
11 ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib 11 ln -s ${STAGING_DIR_TARGET}${layout_libdir} ${SYSROOT}/usr/lib
12 (cd ${S} && gnu-configize) || die "failure running gnu-configize" 12 (cd ${S} && gnu-configize) || die "failure running gnu-configize"
13 (cd ${S}/libstdc++-v3 && autoreconf) 13 (cd ${S}/libstdc++-v3 && autoreconf)
14 oe_runconf 14 oe_runconf
diff --git a/meta/packages/gstreamer/gstreamer_0.10.14.bb b/meta/packages/gstreamer/gstreamer_0.10.14.bb
index 39aa0314cf..c6134d7fa7 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=
20#} 20#}
21 21
22do_stage() { 22do_stage() {
23 oe_runmake install prefix=${STAGING_DIR} \ 23 oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
24 bindir=${STAGING_BINDIR} \ 24 bindir=${STAGING_BINDIR} \
25 includedir=${STAGING_INCDIR} \ 25 includedir=${STAGING_INCDIR} \
26 libdir=${STAGING_LIBDIR} \ 26 libdir=${STAGING_LIBDIR} \
27 datadir=${STAGING_DATADIR} \ 27 datadir=${STAGING_DATADIR} \
28 mandir=${STAGING_DIR}/share/man 28 mandir=${STAGING_DIR_HOST}${layout_mandir}
29} 29}
30 30
31FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" 31FILES_${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 1698b7e050..6c7bcebd3f 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}"
19inherit autotools pkgconfig 19inherit autotools pkgconfig
20 20
21EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ 21EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
22 --with-expat=${STAGING_LIBDIR}/.. \ 22 --with-expat=${STAGING_DIR_HOST}${layout_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/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 8d4aea834d..44be44f980 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
19inherit autotools pkgconfig 19inherit autotools pkgconfig
20 20
21EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ 21EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
22 --with-expat=${STAGING_LIBDIR}/.. \ 22 --with-expat=${STAGING_DIR_HOST}${layout_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/libidl/libidl_0.8.3.bb b/meta/packages/libidl/libidl_0.8.3.bb
index 6a4e0f895c..b3c59623a3 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
15 15
16do_stage() { 16do_stage() {
17 oe_runmake install \ 17 oe_runmake install \
18 prefix=${STAGING_DIR} \ 18 prefix=${STAGING_DIR_HOST}${layout_prefix} \
19 bindir=${STAGING_BINDIR} \ 19 bindir=${STAGING_BINDIR} \
20 includedir=${STAGING_INCDIR} \ 20 includedir=${STAGING_INCDIR} \
21 libdir=${STAGING_LIBDIR} \ 21 libdir=${STAGING_LIBDIR} \
diff --git a/meta/packages/libxslt/libxslt_1.1.20.bb b/meta/packages/libxslt/libxslt_1.1.20.bb
index fa063142b6..6ec59f14be 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 () {
30 install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i 30 install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
31 done 31 done
32 32
33 cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \ 33 cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR_HOST}${layout_prefix}," \
34 -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \ 34 -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}," \
35 -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ 35 -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
36 -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config 36 -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
37 chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config 37 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 cc40205c50..343db15223 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 () {
18} 18}
19 19
20do_stage() { 20do_stage() {
21 oe_runmake install prefix=${STAGING_DIR} \ 21 oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
22 bindir=${STAGING_BINDIR} \ 22 bindir=${STAGING_BINDIR} \
23 includedir=${STAGING_INCDIR} \ 23 includedir=${STAGING_INCDIR} \
24 libdir=${STAGING_LIBDIR} \ 24 libdir=${STAGING_LIBDIR} \
25 datadir=${STAGING_DATADIR} \ 25 datadir=${STAGING_DATADIR} \
26 mandir=${STAGING_DATADIR}/man 26 mandir=${STAGING_DIR_HOST}${layout_mandir}
27} 27}
diff --git a/meta/packages/maemo/xsp_1.0.0-8.bb b/meta/packages/maemo/xsp_1.0.0-8.bb
index d5f94c64cd..878ddec508 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"
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13do_stage() { 13do_stage() {
14 oe_runmake install prefix=${STAGING_DIR} \ 14 oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
15 bindir=${STAGING_BINDIR} \ 15 bindir=${STAGING_BINDIR} \
16 includedir=${STAGING_INCDIR} \ 16 includedir=${STAGING_INCDIR} \
17 libdir=${STAGING_LIBDIR} \ 17 libdir=${STAGING_LIBDIR} \
18 datadir=${STAGING_DATADIR} \ 18 datadir=${STAGING_DATADIR} \
19 mandir=${STAGING_DATADIR}/man 19 mandir=${STAGING_DIR_HOST}${layout_mandir}
20} 20}
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 87c1ba4145..f26e5761f2 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -28,11 +28,11 @@ do_stage() {
28 install -d ${DEPLOY_DIR}/ipk/ 28 install -d ${DEPLOY_DIR}/ipk/
29 install -d ${STAGING_DIR}/pkgdata/ 29 install -d ${STAGING_DIR}/pkgdata/
30 install -d ${STAGING_DIR}/pkgmaps/ 30 install -d ${STAGING_DIR}/pkgmaps/
31 install -d ${STAGING_DIR}/${TARGET_SYS}/shlibs/ 31 install -d ${STAGING_DIR_TARGET}/shlibs/
32 32
33 cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/ 33 cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/
34 cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ 34 cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
35 cp -ar ${prefix}/pkgmaps/* ${STAGING_DIR}/pkgmaps/ 35 cp -ar ${prefix}/pkgmaps/* ${STAGING_DIR}/pkgmaps/
36 cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR}/${TARGET_SYS}/shlibs/ 36 cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
37} 37}
38 38
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 16e48a0c56..b6705e0a53 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -91,8 +91,8 @@ do_populate_sdk() {
91 if [ -e ${STAGING_DIR}/pkgmaps/debian/$subpkg ]; then 91 if [ -e ${STAGING_DIR}/pkgmaps/debian/$subpkg ]; then
92 cp ${STAGING_DIR}/pkgmaps/debian/$subpkg ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/ 92 cp ${STAGING_DIR}/pkgmaps/debian/$subpkg ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/
93 fi 93 fi
94 if [ -e ${STAGING_DIR}/${TARGET_SYS}/shlibs/$subpkg.list ]; then 94 if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then
95 cp ${STAGING_DIR}/${TARGET_SYS}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ 95 cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
96 fi 96 fi
97 done 97 done
98 break 98 break
diff --git a/meta/packages/opensync/libopensync_svn.bb b/meta/packages/opensync/libopensync_svn.bb
index e3631136e3..9d17684f39 100644
--- a/meta/packages/opensync/libopensync_svn.bb
+++ b/meta/packages/opensync/libopensync_svn.bb
@@ -21,7 +21,6 @@ LEAD_SONAME = "libopensync.so"
21FILES_${PN} += " ${libdir}/opensync/formats/*.so ${datadir}/opensync/ ${libdir}/*.so" 21FILES_${PN} += " ${libdir}/opensync/formats/*.so ${datadir}/opensync/ ${libdir}/*.so"
22 22
23export HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" 23export HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
24#export PKG_CONFIG_PATH = "${STAGING_DIR}/${TARGET_SYS}/share/pkgconfig"
25 24
26do_stage() { 25do_stage() {
27 install -d ${STAGING_LIBDIR}/formats 26 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 d586dcb29e..cf89f803bf 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
3require pax-utils_${PV}.bb 3require pax-utils_${PV}.bb
4 4
5do_stage() { 5do_stage() {
6 oe_runmake PREFIX=${STAGING_DIR}/${HOST_SYS} install 6 oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install
7} 7}
diff --git a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 5455e0c58b..f4a4da1e8a 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 \
31 --enable-text-blink --enable-rxvt-scroll \ 31 --enable-text-blink --enable-rxvt-scroll \
32 --enable-combining --enable-shared \ 32 --enable-combining --enable-shared \
33 --enable-xgetdefault \ 33 --enable-xgetdefault \
34 --with-x=${STAGING_LIBDIR}/.." 34 --with-x=${STAGING_DIR_HOST}${layout_prefix}"
35EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \ 35EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
36 'XLIB=-L${STAGING_LIBDIR} -lX11'" 36 'XLIB=-L${STAGING_LIBDIR} -lX11'"
37 37
diff --git a/meta/packages/tremor/tremor_20041119.bb b/meta/packages/tremor/tremor_20041119.bb
index 276ac491e0..b37cba5b4c 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 "
19#} 19#}
20 20
21do_stage() { 21do_stage() {
22 oe_runmake install prefix=${STAGING_DIR} \ 22 oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
23 bindir=${STAGING_BINDIR} \ 23 bindir=${STAGING_BINDIR} \
24 includedir=${STAGING_INCDIR}/tremor \ 24 includedir=${STAGING_INCDIR}/tremor \
25 libdir=${STAGING_LIBDIR} \ 25 libdir=${STAGING_LIBDIR} \