diff options
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" INITSCRIPT_PARAMS = "defaults" do_compile() { - oe_runmake "LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool" apm apmd + oe_runmake "LIBTOOL=${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" apm apmd } 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}" inherit autotools EXTRA_OECONF="--enable-static --enable-shared" -EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"' +EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"' CFLAGS_append = " -D_REENTRANT" 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 \ inherit autotools pkgconfig -export PKG_CONFIG="${STAGING_BINDIR}/pkg-config" +export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" EXTRA_OECONF = "--disable-binreloc" 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 \ file://config.sh-mipsel-linux \ file://config.sh-i686-linux" -HOSTPERL="${STAGING_BINDIR}/perl${PV}" +HOSTPERL="${STAGING_BINDIR_NATIVE}/perl${PV}" do_configure() { - ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl + ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl cp ${HOSTPERL} hostperl cd Cross 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 = "" PR = "r21" do_configure() { - ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl + ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl cp ${HOSTPERL} hostperl cd Cross 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 file://game.png" do_compile_prepend = " \ - export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \ - export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; " + export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ + export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" 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() { } do_stage() { - install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR}/ + install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR_NATIVE}/ } do_install() { |