summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/binconfig.bbclass13
-rw-r--r--classes/e.bbclass30
-rw-r--r--classes/efl.bbclass6
-rw-r--r--conf/bitbake.conf7
-rw-r--r--packages/efl/edje-native_0.5.0.036.bb5
-rw-r--r--packages/efl/evas.inc2
-rw-r--r--packages/fontconfig/fontconfig-native_2.2.95.bb2
-rw-r--r--packages/fontconfig/fontconfig-native_2.3.91.bb2
-rw-r--r--packages/gnupg/gnupg2.inc6
-rw-r--r--packages/klibc/klibc.inc2
-rw-r--r--packages/libidl/libidl_0.8.3.bb4
-rw-r--r--packages/libidl/libidl_0.8.6.bb5
-rw-r--r--packages/libtool/libtool-cross_1.5.10.bb1
-rw-r--r--packages/libusb/libusb_0.1.10a.bb5
-rw-r--r--packages/libusb/libusb_0.1.12.bb5
-rw-r--r--packages/libxslt/libxslt_1.1.12.bb8
-rw-r--r--packages/libxslt/libxslt_1.1.17.bb8
-rw-r--r--packages/prboom/prboom_2.2.6.bb1
-rw-r--r--packages/prboom/prboom_2.3.1.bb1
-rw-r--r--packages/scummvm/scummvm_0.6.0.bb5
-rw-r--r--packages/silo/silo_1.4.8.bb5
-rw-r--r--packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb10
-rw-r--r--packages/uae/e-uae_0.8.28.bb6
23 files changed, 72 insertions, 67 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 317e080fc5..dadf2dddfc 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -20,11 +20,6 @@ def get_binconfig_mangle(d):
s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
return s
-# Native package configurations go in ${BINDIR}/<name>-config-native to prevent a collision with cross packages
-def is_native(d):
- import bb.data
- return ["","-native"][bb.data.inherits_class('native', d)]
-
BINCONFIG_GLOB ?= "*-config"
do_install_append() {
@@ -52,9 +47,9 @@ do_install_append() {
do_stage_append() {
for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
- configname=`basename $config`${@is_native(d)}
- install -d ${STAGING_BINDIR}
- cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname
- chmod u+x ${STAGING_BINDIR}/$configname
+ configname=`basename $config`
+ install -d ${STAGING_BINDIR_CROSS}
+ cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR_CROSS}/$configname
+ chmod u+x ${STAGING_BINDIR_CROSS}/$configname
done
}
diff --git a/classes/e.bbclass b/classes/e.bbclass
index ae8fea0d5d..f20c1f8b60 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -8,23 +8,19 @@ do_prepsources () {
}
addtask prepsources after do_fetch before do_unpack
-def binconfig_suffix(d):
- import bb
- return ["","-native"][bb.data.inherits_class('native', d)]
-
-export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}"
-export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}"
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}"
-export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}"
-export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}"
-export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}"
-export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}"
-export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}"
-export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}"
-export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}"
-export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
-export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
+export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
+export EDB_CONFIG = "${STAGING_BINDIR_CROSS}/edb-config"
+export EET_CONFIG = "${STAGING_BINDIR_CROSS}/eet-config"
+export EVAS_CONFIG = "${STAGING_BINDIR_CROSS}/evas-config"
+export ECORE_CONFIG = "${STAGING_BINDIR_CROSS}/ecore-config"
+export EMBRYO_CONFIG = "${STAGING_BINDIR_CROSS}/embryo-config"
+export ENGRAVE_CONFIG = "${STAGING_BINDIR_CROSS}/engrave-config"
+export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR_CROSS}/enlightenment-config"
+export EPSILON_CONFIG = "${STAGING_BINDIR_CROSS}/epsilon-config"
+export EPEG_CONFIG = "${STAGING_BINDIR_CROSS}/epeg-config"
+export ESMART_CONFIG = "${STAGING_BINDIR_CROSS}/esmart-config"
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
+export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config"
do_compile_prepend() {
find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index be5ef9dcb0..9b0345a5b8 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -13,6 +13,10 @@ libdirectory = "src/lib"
libraries = "lib${SRCNAME}"
headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h"
+def efl_is_native(d):
+ import bb
+ return ["","-native"][bb.data.inherits_class('native', d)]
+
do_stage_append () {
for i in ${libraries}
do
@@ -24,7 +28,7 @@ do_stage_append () {
done
# Install binaries automatically for native builds
- if [ "${@binconfig_suffix(d)}" = "-native" ]
+ if [ "${@efl_is_native(d)}" = "-native" ]
then
# Most EFL binaries start with the package name
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 36e1287d03..6ddf8ecaf4 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -153,10 +153,9 @@ S = "${WORKDIR}/${P}"
B = "${S}"
STAGING_DIR = "${TMPDIR}/staging"
-STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin"
-# Set these to the same a STAGING_BINDIR for now
+STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin"
+STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
-STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin"
STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
@@ -217,7 +216,7 @@ EXTRA_IMAGEDEPENDS = ""
CROSS_DIR = "${TMPDIR}/cross"
CROSS_DATADIR = "${CROSS_DIR}/share"
-export PATH_prepend = "${STAGING_BINDIR}/${HOST_SYS}:${STAGING_BINDIR}:${CROSS_DIR}/bin:"
+export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:"
##################################################################
# Build utility info.
diff --git a/packages/efl/edje-native_0.5.0.036.bb b/packages/efl/edje-native_0.5.0.036.bb
index 9909811448..c66639d25e 100644
--- a/packages/efl/edje-native_0.5.0.036.bb
+++ b/packages/efl/edje-native_0.5.0.036.bb
@@ -6,11 +6,6 @@ inherit native
DEPENDS = "evas-native ecore-native eet-native embryo-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
-EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native \
- --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \
- --with-eet-config=${STAGING_BINDIR}/eet-config-native \
- --with-embryo-config=${STAGING_BINDIR}/embryo-config-native"
-
do_configure_prepend() {
sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 4577535aaa..f065d944f8 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -9,7 +9,7 @@ PROVIDES += "virtual/evas"
inherit efl
-export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
file://fix-configure.patch;patch=1 \
diff --git a/packages/fontconfig/fontconfig-native_2.2.95.bb b/packages/fontconfig/fontconfig-native_2.2.95.bb
index 58589ae124..541b74634c 100644
--- a/packages/fontconfig/fontconfig-native_2.2.95.bb
+++ b/packages/fontconfig/fontconfig-native_2.2.95.bb
@@ -6,7 +6,7 @@ DEPENDS = "freetype-native expat-native zlib-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
EXTRA_OEMAKE = ""
-EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
do_stage () {
oe_runmake install
diff --git a/packages/fontconfig/fontconfig-native_2.3.91.bb b/packages/fontconfig/fontconfig-native_2.3.91.bb
index 58589ae124..541b74634c 100644
--- a/packages/fontconfig/fontconfig-native_2.3.91.bb
+++ b/packages/fontconfig/fontconfig-native_2.3.91.bb
@@ -6,7 +6,7 @@ DEPENDS = "freetype-native expat-native zlib-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
EXTRA_OEMAKE = ""
-EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
do_stage () {
oe_runmake install
diff --git a/packages/gnupg/gnupg2.inc b/packages/gnupg/gnupg2.inc
index c4aadb55eb..d362981f3c 100644
--- a/packages/gnupg/gnupg2.inc
+++ b/packages/gnupg/gnupg2.inc
@@ -24,12 +24,6 @@ FILES_${PN} += "${datadir}/gnupg"
EXTRA_OECONF = "--disable-ldap \
--with-zlib=${STAGING_LIBDIR}/.. \
- --with-gpg-error-prefix=${STAGING_BINDIR}/.. \
- --with-libgcrypt-prefix=${STAGING_BINDIR}/.. \
- --with-libassuan-prefix=${STAGING_BINDIR}/.. \
- --with-pth-prefix=${STAGING_BINDIR}/.. \
- --with-opensc-prefix=${STAGING_BINDIR}/.. \
- --with-ksba-prefix=${STAGING_BINDIR}/.. \
--disable-threads \
--disable-gpgsm \
--disable-scdaemon"
diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc
index 29ca1685c1..4e86824eac 100644
--- a/packages/klibc/klibc.inc
+++ b/packages/klibc/klibc.inc
@@ -66,6 +66,8 @@ do_stage() {
# use the staged libraries and include files.
sed -i -e 's@^\$prefix = .*$@\$prefix = "${STAGING_KLIBC_DIR}/lib/klibc";@' \
'${STAGING_BINDIR}/${TARGET_PREFIX}klcc'
+ # Perhaps other binaries need to be moved to cross?
+ mv '${STAGING_BINDIR}/${TARGET_PREFIX}klcc' '${STAGING_BINDIR_CROSS}'
}
do_install() {
diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb
index a40597718d..2ca114be2c 100644
--- a/packages/libidl/libidl_0.8.3.bb
+++ b/packages/libidl/libidl_0.8.3.bb
@@ -23,6 +23,10 @@ do_stage() {
cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
+
+ if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
+ mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2
+ fi
}
FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb
index 048a5fb1f8..916bfb6e5f 100644
--- a/packages/libidl/libidl_0.8.6.bb
+++ b/packages/libidl/libidl_0.8.6.bb
@@ -16,6 +16,11 @@ do_stage() {
autotools_stage_all
cat ${S}/libIDL-config-2 | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
+
+ if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
+ mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2
+ fi
+
}
FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb
index 81a4990d28..fdc8f6ffaf 100644
--- a/packages/libtool/libtool-cross_1.5.10.bb
+++ b/packages/libtool/libtool-cross_1.5.10.bb
@@ -13,6 +13,7 @@ S = "${WORKDIR}/libtool-${PV}"
prefix = "${STAGING_DIR}"
exec_prefix = "${prefix}/${BUILD_SYS}"
+bindir = "${STAGING_BINDIR_NATIVE}"
do_compile () {
:
diff --git a/packages/libusb/libusb_0.1.10a.bb b/packages/libusb/libusb_0.1.10a.bb
index a62d9ae83e..8648f96571 100644
--- a/packages/libusb/libusb_0.1.10a.bb
+++ b/packages/libusb/libusb_0.1.10a.bb
@@ -22,6 +22,11 @@ do_stage() {
install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
+ if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
+ install -d ${STAGING_BINDIR_CROSS}/
+ mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
+ fi
+
install -d ${STAGING_INCDIR}/
for X in usb.h
do
diff --git a/packages/libusb/libusb_0.1.12.bb b/packages/libusb/libusb_0.1.12.bb
index fea8e57ccf..a2b80ecb6d 100644
--- a/packages/libusb/libusb_0.1.12.bb
+++ b/packages/libusb/libusb_0.1.12.bb
@@ -22,6 +22,11 @@ do_stage() {
# can we get rid of that? wouldn't a sed statement do as well?
perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
+ if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
+ install -d ${STAGING_BINDIR_CROSS}/
+ mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
+ fi
+
install -d ${STAGING_INCDIR}/
for X in usb.h
do
diff --git a/packages/libxslt/libxslt_1.1.12.bb b/packages/libxslt/libxslt_1.1.12.bb
index 507b9abc0e..9c59407ebf 100644
--- a/packages/libxslt/libxslt_1.1.12.bb
+++ b/packages/libxslt/libxslt_1.1.12.bb
@@ -31,11 +31,11 @@ do_stage () {
install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
done
- cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
- -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
+ cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
+ -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
-e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
- -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config
- chmod a+rx ${STAGING_BINDIR}/xslt-config
+ -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
+ chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
}
diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb
index 507b9abc0e..9c59407ebf 100644
--- a/packages/libxslt/libxslt_1.1.17.bb
+++ b/packages/libxslt/libxslt_1.1.17.bb
@@ -31,11 +31,11 @@ do_stage () {
install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
done
- cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
- -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
+ cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
+ -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
-e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
- -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config
- chmod a+rx ${STAGING_BINDIR}/xslt-config
+ -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
+ chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
}
diff --git a/packages/prboom/prboom_2.2.6.bb b/packages/prboom/prboom_2.2.6.bb
index 9133fb6262..f20aae2b64 100644
--- a/packages/prboom/prboom_2.2.6.bb
+++ b/packages/prboom/prboom_2.2.6.bb
@@ -14,7 +14,6 @@ inherit autotools
EXTRA_OECONF = " --without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS} "
do_configure() {
- PATH=${STAGING_BINDIR}:$PATH
gnu-configize
oe_runconf
}
diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb
index 062162ead3..88d1f6a183 100644
--- a/packages/prboom/prboom_2.3.1.bb
+++ b/packages/prboom/prboom_2.3.1.bb
@@ -19,7 +19,6 @@ inherit autotools
EXTRA_OECONF = " --without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS} "
do_configure() {
- PATH=${STAGING_BINDIR}:$PATH
gnu-configize
oe_runconf
}
diff --git a/packages/scummvm/scummvm_0.6.0.bb b/packages/scummvm/scummvm_0.6.0.bb
index a2a28ceb70..1aecd20bc4 100644
--- a/packages/scummvm/scummvm_0.6.0.bb
+++ b/packages/scummvm/scummvm_0.6.0.bb
@@ -11,14 +11,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
inherit autotools
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
EXTRA_OECONF = "--host=${HOST_SYS} \
--backend=sdl \
- --with-sdl-prefix=${STAGING_BINDIR}/.. \
--disable-alsa \
--with-ogg-prefix=${STAGING_LIBDIR}/.. \
--with-vorbis-prefix=${STAGING_LIBDIR}/.. \
--with-mpeg2-prefix=${STAGING_LIBDIR}/.. \
- --with-mad-prefix=${STAGING_BINDIR}/.. "
+ --with-mad-prefix=${STAGING_BINDIR_CROSS}/.. "
do_configure() {
./configure ${EXTRA_OECONF}
diff --git a/packages/silo/silo_1.4.8.bb b/packages/silo/silo_1.4.8.bb
index ee107edeed..41a3d3aaf5 100644
--- a/packages/silo/silo_1.4.8.bb
+++ b/packages/silo/silo_1.4.8.bb
@@ -9,7 +9,8 @@ do_compile() {
oe_runmake CC="${CC} -m32" LD="${LD}" HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" OECFLAGS="${CFLAGS}" OELDFLAGS="-L${STAGING_LIBDIR} -rpath-link ${STAGING_LIBDIR}" NM="${TARGET_SYS}-nm"
}
+# Should this package be installing into native? - not good... RP
do_stage() {
- install tilo/maketilo ${STAGING_BINDIR}
- install tilo/tilo.sh ${STAGING_BINDIR}
+ install tilo/maketilo ${STAGING_BINDIR_NATIVE}
+ install tilo/tilo.sh ${STAGING_BINDIR_NATIVE}
}
diff --git a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
index cf0ffa0406..af849a7778 100644
--- a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
+++ b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
@@ -12,11 +12,11 @@ S = "${WORKDIR}/smpeg"
inherit autotools
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
CFLAGS_append = " -I${STAGING_INCDIR}/SDL"
EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \
- --without-gtk --disable-gtk-player \
- --with-sdl-prefix=${STAGING_LIBDIR}/.. \
- --with-sdl-exec-prefix=${STAGING_BINDIR}/.."
+ --without-gtk --disable-gtk-player"
do_configure_prepend () {
touch NEWS AUTHORS ChangeLog
@@ -35,8 +35,8 @@ do_stage() {
cat smpeg-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \
| sed -e "s,-I/usr/include/smpeg, ," \
| sed -e "s,libdirs ,mickey_is_cool ," \
- | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR}/smpeg-config
- chmod a+rx ${STAGING_BINDIR}/smpeg-config
+ | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR_CROSS}/smpeg-config
+ chmod a+rx ${STAGING_BINDIR_CROSS}/smpeg-config
}
PACKAGES =+ "plaympeg "
diff --git a/packages/uae/e-uae_0.8.28.bb b/packages/uae/e-uae_0.8.28.bb
index 5d8e5bb528..f8f95e846a 100644
--- a/packages/uae/e-uae_0.8.28.bb
+++ b/packages/uae/e-uae_0.8.28.bb
@@ -10,11 +10,11 @@ SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
inherit autotools
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
EXTRA_OECONF = "--with-hostcc=gcc --disable-ui --without-x \
--without-gtk --enable-jit --disable-natmem \
- --with-zlib=${STAGING_LIBDIR}/.. \
- --with-sdl-exec-prefix=${STAGING_BINDIR}/.. \
- --with-sdl-prefix=${STAGING_LIBDIR}/.."
+ --with-zlib=${STAGING_LIBDIR}/.."
CFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 "
CXXFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 "
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 11:09:00 +0000