[oe-commits] org.oe.dev Split STAGING_BINDIR into CROSS and NATIVE versions. This means there is no need to rename -config scripts and multimachine won't break with binconfig.bbclass. ***NOTE: This change will require staging to be rebuilt***
rpurdie commit
openembedded-commits at lists.openembedded.org
Sun Dec 31 22:34:27 UTC 2006
Split STAGING_BINDIR into CROSS and NATIVE versions. This means there is no need to rename -config scripts and multimachine won't break with binconfig.bbclass. ***NOTE: This change will require staging to be rebuilt***
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: d44c9019c71ce262d2a01eec34bf8a724a8d40d0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d44c9019c71ce262d2a01eec34bf8a724a8d40d0
Files:
1
classes/binconfig.bbclass
classes/e.bbclass
classes/efl.bbclass
conf/bitbake.conf
packages/efl/edje-native_0.5.0.036.bb
packages/efl/evas.inc
packages/fontconfig/fontconfig-native_2.2.95.bb
packages/fontconfig/fontconfig-native_2.3.91.bb
packages/gnupg/gnupg2.inc
packages/klibc/klibc.inc
packages/libidl/libidl_0.8.3.bb
packages/libidl/libidl_0.8.6.bb
packages/libtool/libtool-cross_1.5.10.bb
packages/libusb/libusb_0.1.10a.bb
packages/libusb/libusb_0.1.12.bb
packages/libxslt/libxslt_1.1.12.bb
packages/libxslt/libxslt_1.1.17.bb
packages/prboom/prboom_2.2.6.bb
packages/prboom/prboom_2.3.1.bb
packages/scummvm/scummvm_0.6.0.bb
packages/silo/silo_1.4.8.bb
packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
packages/uae/e-uae_0.8.28.bb
Diffs:
#
# mt diff -r78be4988f2df25f9f57d87935dfdf978a878343a -rd44c9019c71ce262d2a01eec34bf8a724a8d40d0
#
#
#
# patch "classes/binconfig.bbclass"
# from [f8dd40493686ef241ed9aa8e92ab3bae9aa683b1]
# to [987c43d5cb3e1b4ea049f26871947ca3bade6c26]
#
# patch "classes/e.bbclass"
# from [66bf4babb3b30bfa6028726b76194d14612180d2]
# to [bf5ca9ec51bfa4a5a24b8eeef50d7d15de15277e]
#
# patch "classes/efl.bbclass"
# from [0aafdb1bb782e4ce627c88f351458400582b3aa0]
# to [286ff931b6d17a0d8f49287fed8d26c7e4b0c21b]
#
# patch "conf/bitbake.conf"
# from [2ca46fb3754624d308e877ff9c5caebe8c21b7c9]
# to [d41ded8cda51b4fb9404b4e2a1fb1fe88f355081]
#
# patch "packages/efl/edje-native_0.5.0.036.bb"
# from [b664bfe21a6fc110998ae5122977094b6419421d]
# to [00facd8ab5b03f81d691d365d38f7285ed7a3e6a]
#
# patch "packages/efl/evas.inc"
# from [97ac7777d45c991af63249ae4b3564de9d18ee1b]
# to [93b54ddf93a6ca60c17bd82fa0d39f1cbdd32c51]
#
# patch "packages/fontconfig/fontconfig-native_2.2.95.bb"
# from [72f6b374d76c5ca02747c83d84bda0c75d3f8810]
# to [24c03de8b197db8f1a84eb259d920c904b79f74b]
#
# patch "packages/fontconfig/fontconfig-native_2.3.91.bb"
# from [72f6b374d76c5ca02747c83d84bda0c75d3f8810]
# to [24c03de8b197db8f1a84eb259d920c904b79f74b]
#
# patch "packages/gnupg/gnupg2.inc"
# from [c8871fc39bda7d803cd54b2a0c1cbcd38b16c083]
# to [aba5d51d3d82e6fd2afde3d1e36bc46dff857c22]
#
# patch "packages/klibc/klibc.inc"
# from [e88ff5d5be9f531e54cbcb6893420615e8e1a428]
# to [da384142d18acb714d5d51c1311c32e51c0ffca3]
#
# patch "packages/libidl/libidl_0.8.3.bb"
# from [e89f6944d9632c5075a34ff5b029243d74fc3285]
# to [c74d112df76e923e7f68fec8f2b6d8f10f7e2335]
#
# patch "packages/libidl/libidl_0.8.6.bb"
# from [afcc16946db7d44c733f6a0081c0b7888ed0399d]
# to [e57cf04a4324aef31ea1edee55103beabb4793cc]
#
# patch "packages/libtool/libtool-cross_1.5.10.bb"
# from [26aab2f0ec2113741c9306e176b7dd2a176471eb]
# to [58b238af5bb9acdeca5b86c34b50c419fb49b55e]
#
# patch "packages/libusb/libusb_0.1.10a.bb"
# from [7b394262fe9557947691233ff2d2ea3c2ac4d0ce]
# to [a5f8eec6b7626a376da5bae1f22b7d012952aefc]
#
# patch "packages/libusb/libusb_0.1.12.bb"
# from [b10c39acc04b2dc46f8327e38ff9f17b1b21e0fa]
# to [dbd6be17ba184a3d83d70c20579fcffa4690d9f6]
#
# patch "packages/libxslt/libxslt_1.1.12.bb"
# from [3e01883936c0dfd61b7301307c78e192ad0d4c43]
# to [3c7895c92d5f9b64204f31cead40afbdbbe532c7]
#
# patch "packages/libxslt/libxslt_1.1.17.bb"
# from [3e01883936c0dfd61b7301307c78e192ad0d4c43]
# to [3c7895c92d5f9b64204f31cead40afbdbbe532c7]
#
# patch "packages/prboom/prboom_2.2.6.bb"
# from [3ab188d27f9703c03cc55b6626a917c72fef1efc]
# to [0c4cb9985dbc0f969f512cc154ab992212d88bb8]
#
# patch "packages/prboom/prboom_2.3.1.bb"
# from [22df69068835fe48e53d842faaa8fa68f54da374]
# to [b5eb9173dd4dc732bf3e8101665626c8f15c9c0b]
#
# patch "packages/scummvm/scummvm_0.6.0.bb"
# from [087d45f314345030d01761d3ea32e13f65220457]
# to [19fc8bf64c4fb3fa849acf71fde29ab712a5310a]
#
# patch "packages/silo/silo_1.4.8.bb"
# from [e090e17a4731bdb7f4aa05e4e4133778d50e73d9]
# to [acb9c243a9bddc5f6939a646badcb0ca7ce410be]
#
# patch "packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb"
# from [111d54c4aa8ae4103d2e72df4b14af6cc3c3f356]
# to [5cd293cd1d369ce5fe377177a966a07414929378]
#
# patch "packages/uae/e-uae_0.8.28.bb"
# from [34328ce61c9b3b8d732b03d15b11dcb6c9013618]
# to [1015b9b081b3e824a248a48ac0ac417aad052241]
#
============================================================
--- classes/binconfig.bbclass f8dd40493686ef241ed9aa8e92ab3bae9aa683b1
+++ classes/binconfig.bbclass 987c43d5cb3e1b4ea049f26871947ca3bade6c26
@@ -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_stage_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
}
============================================================
--- classes/e.bbclass 66bf4babb3b30bfa6028726b76194d14612180d2
+++ classes/e.bbclass bf5ca9ec51bfa4a5a24b8eeef50d7d15de15277e
@@ -8,24 +8,20 @@ addtask prepsources after do_fetch befor
}
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_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"
-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)}"
-
do_compile_prepend() {
find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
============================================================
--- classes/efl.bbclass 0aafdb1bb782e4ce627c88f351458400582b3aa0
+++ classes/efl.bbclass 286ff931b6d17a0d8f49287fed8d26c7e4b0c21b
@@ -13,6 +13,10 @@ headers = "${@bb.data.getVar('SRCNAME',d
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
============================================================
--- conf/bitbake.conf 2ca46fb3754624d308e877ff9c5caebe8c21b7c9
+++ conf/bitbake.conf d41ded8cda51b4fb9404b4e2a1fb1fe88f355081
@@ -153,10 +153,9 @@ STAGING_DIR = "${TMPDIR}/staging"
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 @@ CROSS_DATADIR = "${CROSS_DIR}/share"
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.
============================================================
--- packages/efl/edje-native_0.5.0.036.bb b664bfe21a6fc110998ae5122977094b6419421d
+++ packages/efl/edje-native_0.5.0.036.bb 00facd8ab5b03f81d691d365d38f7285ed7a3e6a
@@ -6,11 +6,6 @@ FILESDIR = "${@os.path.dirname(bb.data.g
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
============================================================
--- packages/efl/evas.inc 97ac7777d45c991af63249ae4b3564de9d18ee1b
+++ packages/efl/evas.inc 93b54ddf93a6ca60c17bd82fa0d39f1cbdd32c51
@@ -9,7 +9,7 @@ inherit efl
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 \
============================================================
--- packages/fontconfig/fontconfig-native_2.2.95.bb 72f6b374d76c5ca02747c83d84bda0c75d3f8810
+++ packages/fontconfig/fontconfig-native_2.2.95.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
@@ -6,7 +6,7 @@ EXTRA_OEMAKE = ""
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
============================================================
--- packages/fontconfig/fontconfig-native_2.3.91.bb 72f6b374d76c5ca02747c83d84bda0c75d3f8810
+++ packages/fontconfig/fontconfig-native_2.3.91.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
@@ -6,7 +6,7 @@ EXTRA_OEMAKE = ""
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
============================================================
--- packages/gnupg/gnupg2.inc c8871fc39bda7d803cd54b2a0c1cbcd38b16c083
+++ packages/gnupg/gnupg2.inc aba5d51d3d82e6fd2afde3d1e36bc46dff857c22
@@ -24,12 +24,6 @@ EXTRA_OECONF = "--disable-ldap \
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"
============================================================
--- packages/klibc/klibc.inc e88ff5d5be9f531e54cbcb6893420615e8e1a428
+++ packages/klibc/klibc.inc da384142d18acb714d5d51c1311c32e51c0ffca3
@@ -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() {
============================================================
--- packages/libidl/libidl_0.8.3.bb e89f6944d9632c5075a34ff5b029243d74fc3285
+++ packages/libidl/libidl_0.8.3.bb c74d112df76e923e7f68fec8f2b6d8f10f7e2335
@@ -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.*"
============================================================
--- packages/libidl/libidl_0.8.6.bb afcc16946db7d44c733f6a0081c0b7888ed0399d
+++ packages/libidl/libidl_0.8.6.bb e57cf04a4324aef31ea1edee55103beabb4793cc
@@ -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.*"
============================================================
--- packages/libtool/libtool-cross_1.5.10.bb 26aab2f0ec2113741c9306e176b7dd2a176471eb
+++ packages/libtool/libtool-cross_1.5.10.bb 58b238af5bb9acdeca5b86c34b50c419fb49b55e
@@ -13,6 +13,7 @@ exec_prefix = "${prefix}/${BUILD_SYS}"
prefix = "${STAGING_DIR}"
exec_prefix = "${prefix}/${BUILD_SYS}"
+bindir = "${STAGING_BINDIR_NATIVE}"
do_compile () {
:
============================================================
--- packages/libusb/libusb_0.1.10a.bb 7b394262fe9557947691233ff2d2ea3c2ac4d0ce
+++ packages/libusb/libusb_0.1.10a.bb a5f8eec6b7626a376da5bae1f22b7d012952aefc
@@ -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
============================================================
--- packages/libusb/libusb_0.1.12.bb b10c39acc04b2dc46f8327e38ff9f17b1b21e0fa
+++ packages/libusb/libusb_0.1.12.bb dbd6be17ba184a3d83d70c20579fcffa4690d9f6
@@ -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
============================================================
--- packages/libxslt/libxslt_1.%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list