diff options
Diffstat (limited to 'packages')
118 files changed, 180 insertions, 175 deletions
diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb index 4a23f39590..94541581d3 100644 --- a/packages/apmd/apmd_3.2.2.bb +++ b/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/packages/apr/apr-util_0.9.12.bb b/packages/apr/apr-util_0.9.12.bb index ba6e38241d..776fd03bfe 100644 --- a/packages/apr/apr-util_0.9.12.bb +++ b/packages/apr/apr-util_0.9.12.bb @@ -9,7 +9,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \ file://gen_uri_delims.patch;patch=1 \ file://uri_delims.h" -EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}" inherit autotools lib_package binconfig diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb index ad89228fff..ec1998d64b 100644 --- a/packages/apr/apr-util_1.1.2.bb +++ b/packages/apr/apr-util_1.1.2.bb @@ -8,7 +8,7 @@ PR = "r0" # apache mirrors? SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz" -EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}" inherit autotools lib_package binconfig diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf index 37785871db..fc19018533 100644 --- a/packages/apt/files/apt.conf +++ b/packages/apt/files/apt.conf @@ -11,7 +11,7 @@ Dir "${STAGING_DIR}/" pkgcache ""; srcpkgcache ""; }; - Bin "${STAGING_BINDIR}/" + Bin "${STAGING_BINDIR_NATIVE}/" { methods "${STAGING_LIBDIR}/apt/methods/"; gzip "/bin/gzip"; diff --git a/packages/asterisk/asterisk-1.0.9/makefile.patch b/packages/asterisk/asterisk-1.0.9/makefile.patch index 066fb677dc..6684d8696e 100644 --- a/packages/asterisk/asterisk-1.0.9/makefile.patch +++ b/packages/asterisk/asterisk-1.0.9/makefile.patch @@ -208,7 +208,7 @@ # Add GTK console if appropriate -PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+PBX_LIBS+=$(shell ${STAGING_BINDIR}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") ++PBX_LIBS+=$(shell ${STAGING_BINDIR_CROSS}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") # Add KDE Console if appropriate #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") diff --git a/packages/asterisk/asterisk-1.2.8/makefile.patch b/packages/asterisk/asterisk-1.2.8/makefile.patch index c786d09017..780868b91e 100644 --- a/packages/asterisk/asterisk-1.2.8/makefile.patch +++ b/packages/asterisk/asterisk-1.2.8/makefile.patch @@ -11,7 +11,7 @@ # If cross compiling, define these to suit +CROSS_COMPILE=$(CROSS_DIR) +CROSS_COMPILE_TARGET=$(STAGING_DIR) -+CROSS_COMPILE_BIN=$(STAGING_BINDIR) ++CROSS_COMPILE_BIN=$(STAGING_BINDIR_CROSS) # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target diff --git a/packages/asterisk/asterisk_1.2.12.1.bb b/packages/asterisk/asterisk_1.2.12.1.bb index c27963c9a0..c0b7fc2ed9 100644 --- a/ |