diff options
author | Richard Purdie <richard@openedhand.com> | 2006-11-25 10:01:30 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-11-25 10:01:30 +0000 |
commit | 4f249a8efbced11400f99c182ef101b7c00e7ba8 (patch) | |
tree | 03766f69c5fd2b6a4d1f3d8936cdf6c6d32b8989 /meta/packages | |
parent | 82dd73248db6eb9be25db48081a573d7027a204f (diff) | |
download | poky-4f249a8efbced11400f99c182ef101b7c00e7ba8.tar.gz |
Fix STAGING_BINDIR for multimachine use by spliting into STAGING_BINDIR and STAGING_BINDIR_NATIVE and adding both to PATH
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@958 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/apmd/apmd_3.2.2.bb | 2 | ||||
-rw-r--r-- | meta/packages/jpeg/jpeg_6b.bb | 2 | ||||
-rwxr-xr-x | meta/packages/kf/kf_0.5.4.1.bb | 2 | ||||
-rw-r--r-- | meta/packages/perl/perl.inc | 4 | ||||
-rw-r--r-- | meta/packages/perl/perl_5.8.7.bb | 2 | ||||
-rw-r--r-- | meta/packages/puzzles/puzzles_r6915.bb | 4 | ||||
-rw-r--r-- | meta/packages/update-rc.d/update-rc.d_0.7.bb | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/meta/packages/apmd/apmd_3.2.2.bb b/meta/packages/apmd/apmd_3.2.2.bb index 4a23f39590..94541581d3 100644 --- a/meta/packages/apmd/apmd_3.2.2.bb +++ b/meta/packages/apmd/apmd_3.2.2.bb | |||
@@ -22,7 +22,7 @@ INITSCRIPT_NAME = "apmd" | |||
22 | INITSCRIPT_PARAMS = "defaults" | 22 | INITSCRIPT_PARAMS = "defaults" |
23 | 23 | ||
24 | do_compile() { | 24 | do_compile() { |
25 | oe_runmake "LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool" apm apmd | 25 | oe_runmake "LIBTOOL=${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" apm apmd |
26 | } | 26 | } |
27 | 27 | ||
28 | do_stage() { | 28 | do_stage() { |
diff --git a/meta/packages/jpeg/jpeg_6b.bb b/meta/packages/jpeg/jpeg_6b.bb index 342197c8ad..978ae10be5 100644 --- a/meta/packages/jpeg/jpeg_6b.bb +++ b/meta/packages/jpeg/jpeg_6b.bb | |||
@@ -16,7 +16,7 @@ S = "${WORKDIR}/jpeg-${PV}" | |||
16 | inherit autotools | 16 | inherit autotools |
17 | 17 | ||
18 | EXTRA_OECONF="--enable-static --enable-shared" | 18 | EXTRA_OECONF="--enable-static --enable-shared" |
19 | EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"' | 19 | EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"' |
20 | 20 | ||
21 | CFLAGS_append = " -D_REENTRANT" | 21 | CFLAGS_append = " -D_REENTRANT" |
22 | 22 | ||
diff --git a/meta/packages/kf/kf_0.5.4.1.bb b/meta/packages/kf/kf_0.5.4.1.bb index 806a383579..cd4feffa6d 100755 --- a/meta/packages/kf/kf_0.5.4.1.bb +++ b/meta/packages/kf/kf_0.5.4.1.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \ | |||
9 | 9 | ||
10 | inherit autotools pkgconfig | 10 | inherit autotools pkgconfig |
11 | 11 | ||
12 | export PKG_CONFIG="${STAGING_BINDIR}/pkg-config" | 12 | export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" |
13 | 13 | ||
14 | EXTRA_OECONF = "--disable-binreloc" | 14 | EXTRA_OECONF = "--disable-binreloc" |
15 | 15 | ||
diff --git a/meta/packages/perl/perl.inc b/meta/packages/perl/perl.inc index 7e42f45314..6ee0ed702c 100644 --- a/meta/packages/perl/perl.inc +++ b/meta/packages/perl/perl.inc | |||
@@ -14,10 +14,10 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ | |||
14 | file://config.sh-mipsel-linux \ | 14 | file://config.sh-mipsel-linux \ |
15 | file://config.sh-i686-linux" | 15 | file://config.sh-i686-linux" |
16 | 16 | ||
17 | HOSTPERL="${STAGING_BINDIR}/perl${PV}" | 17 | HOSTPERL="${STAGING_BINDIR_NATIVE}/perl${PV}" |
18 | 18 | ||
19 | do_configure() { | 19 | do_configure() { |
20 | ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl | 20 | ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl |
21 | cp ${HOSTPERL} hostperl | 21 | cp ${HOSTPERL} hostperl |
22 | cd Cross | 22 | cd Cross |
23 | rm Makefile.SH.patch | 23 | rm Makefile.SH.patch |
diff --git a/meta/packages/perl/perl_5.8.7.bb b/meta/packages/perl/perl_5.8.7.bb index a7095433a3..40d499eac3 100644 --- a/meta/packages/perl/perl_5.8.7.bb +++ b/meta/packages/perl/perl_5.8.7.bb | |||
@@ -26,7 +26,7 @@ PARALLEL_MAKE = "" | |||
26 | PR = "r21" | 26 | PR = "r21" |
27 | 27 | ||
28 | do_configure() { | 28 | do_configure() { |
29 | ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl | 29 | ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl |
30 | cp ${HOSTPERL} hostperl | 30 | cp ${HOSTPERL} hostperl |
31 | cd Cross | 31 | cd Cross |
32 | rm Makefile.SH.patch | 32 | rm Makefile.SH.patch |
diff --git a/meta/packages/puzzles/puzzles_r6915.bb b/meta/packages/puzzles/puzzles_r6915.bb index f8ffcb7d01..2c1d17dca8 100644 --- a/meta/packages/puzzles/puzzles_r6915.bb +++ b/meta/packages/puzzles/puzzles_r6915.bb | |||
@@ -6,8 +6,8 @@ SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar | |||
6 | file://game.png" | 6 | file://game.png" |
7 | 7 | ||
8 | do_compile_prepend = " \ | 8 | do_compile_prepend = " \ |
9 | export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \ | 9 | export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ |
10 | export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; " | 10 | export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " |
11 | 11 | ||
12 | FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" | 12 | FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" |
13 | FILES_${PN}-dbg += "${prefix}/games/.debug" | 13 | FILES_${PN}-dbg += "${prefix}/games/.debug" |
diff --git a/meta/packages/update-rc.d/update-rc.d_0.7.bb b/meta/packages/update-rc.d/update-rc.d_0.7.bb index 5c7ef67aed..8070197b82 100644 --- a/meta/packages/update-rc.d/update-rc.d_0.7.bb +++ b/meta/packages/update-rc.d/update-rc.d_0.7.bb | |||
@@ -13,7 +13,7 @@ do_compile() { | |||
13 | } | 13 | } |
14 | 14 | ||
15 | do_stage() { | 15 | do_stage() { |
16 | install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR}/ | 16 | install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR_NATIVE}/ |
17 | } | 17 | } |
18 | 18 | ||
19 | do_install() { | 19 | do_install() { |