[oe-commits] org.oe.dev packages: Improve BUILD_SYS references to staging
rpurdie commit
openembedded-commits at lists.openembedded.org
Tue Oct 30 00:38:16 UTC 2007
packages: Improve BUILD_SYS references to staging
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 6221aa727382836756cfd23399f3f0ffb2ada041
ViewMTN: http://monotone.openembedded.org/revision/info/6221aa727382836756cfd23399f3f0ffb2ada041
Files:
1
packages/avetanabt/avetanabt_20060413.bb
packages/avetanabt/avetanabt_cvs.bb
packages/crimsonfields/crimsonfields_0.4.8.bb
packages/glibc/eglibc_svn.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/gutenprint/gutenprint_5.1.3.bb
packages/icewm/icewm_1.2.20.bb
packages/icewm/icewm_1.2.30.bb
packages/klibc/klibc.inc
packages/mozilla/minimo_cvs.bb
packages/netatalk/netatalk_2.0.3.bb
packages/obsolete/dbus/dbus_0.34.bb
packages/obsolete/dbus/dbus_0.50.bb
packages/omniorb/omniorb-native_4.0.7.bb
packages/perl/perl_5.8.8.bb
packages/python/python-native_2.5.1.bb
packages/python/python-sip_4.7.bb
packages/python/python24-native_2.4.0.bb
Diffs:
#
# mt diff -r1975ac843f05dcdf300925fccd826776ed2db529 -r6221aa727382836756cfd23399f3f0ffb2ada041
#
#
#
# patch "packages/avetanabt/avetanabt_20060413.bb"
# from [3970cc3104dcfe44ee92a93deb184197d5f1235f]
# to [d715915e84514f9f60dd62b9fb19569c1b675e54]
#
# patch "packages/avetanabt/avetanabt_cvs.bb"
# from [db4feffad440a914f5d6df3b02877e9dbb15c752]
# to [d5f611a8d092f7c2afaf2125ff0c507d0f23d218]
#
# patch "packages/crimsonfields/crimsonfields_0.4.8.bb"
# from [8522dc887c0a730c58913b2a6c81d25c5315bdc5]
# to [8dfcbbcdad87ce744bf3a915a867e5c48b3e06aa]
#
# patch "packages/glibc/eglibc_svn.bb"
# from [f21e6fde33775e6d7259b548e8ea613cb6381d7b]
# to [212e444094c694fad0d0b243de740753f10ed55b]
#
# patch "packages/glibc/glibc_2.4.bb"
# from [364445388b67f1d7faba1f8abe200162e43cdf30]
# to [167695f09f46b0437640fa75ad34b85edd2a6590]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [adbbaef7a3f6be171b33e7148e188d99e04e261c]
# to [af0b010317c6304cbb206aab68c72e9c1c1f59a2]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [cc783c4e44a3a182955394de28e61f41cb8bfbcf]
# to [23c7eaecef99f38c791cb4d812d451055a3924fb]
#
# patch "packages/gutenprint/gutenprint_5.1.3.bb"
# from [ac7c23e861599d6d4c28bb4dbb795a5026f61543]
# to [5140095a562b6482a639284250b1c0030a1b310d]
#
# patch "packages/icewm/icewm_1.2.20.bb"
# from [7c69cb4defd29a458749b37be31deaf9229ef223]
# to [0a027303c29416712c81e2ca8184eca58c4b12bb]
#
# patch "packages/icewm/icewm_1.2.30.bb"
# from [1c35ca97b5988f440f742837fc8a2db272c48869]
# to [f7b7e77c36d0b7c8aeb429d0d3612d4d700b6be6]
#
# patch "packages/klibc/klibc.inc"
# from [da384142d18acb714d5d51c1311c32e51c0ffca3]
# to [2619f7a7d823d7bb5fe1870350039f21dea55d9d]
#
# patch "packages/mozilla/minimo_cvs.bb"
# from [2be5472ea7f6505b0ac77854e0ddd53a7d558c56]
# to [a9cc1df6ec5f80aa94c00f89859d1cebd19b39f5]
#
# patch "packages/netatalk/netatalk_2.0.3.bb"
# from [843b0b652c0af1d7322ae272431ae73f175c0d27]
# to [7ede53ec4a1d181c30789368b6a67f4163abf5d4]
#
# patch "packages/obsolete/dbus/dbus_0.34.bb"
# from [8c11536df32432aac2fc9e301e1c3529abf1602f]
# to [180079373b349e46a86857717ddb553b60c22bed]
#
# patch "packages/obsolete/dbus/dbus_0.50.bb"
# from [8c11536df32432aac2fc9e301e1c3529abf1602f]
# to [180079373b349e46a86857717ddb553b60c22bed]
#
# patch "packages/omniorb/omniorb-native_4.0.7.bb"
# from [8097b523200a0b2b3afaca75c650e377e41f39a2]
# to [0fa5ba47b4941671e22d25386db569e534374dc2]
#
# patch "packages/perl/perl_5.8.8.bb"
# from [c97084e319193690d0222303aa7f475971c1dff9]
# to [3aca32440feddd983fff24ef6e8448cc34d35493]
#
# patch "packages/python/python-native_2.5.1.bb"
# from [e2bb20fc9554ec3954487bcf3ed0f6a531af5044]
# to [f2b0b3ca647fbd00b50cbdebf99552d902686955]
#
# patch "packages/python/python-sip_4.7.bb"
# from [67e06621ead5ed2bb60e40843af03715f18f3d20]
# to [57b117962adb2967fdbc967fcb574e700f5ca7b4]
#
# patch "packages/python/python24-native_2.4.0.bb"
# from [dd5a5720b07856c36eba7824a1373b55dee555e0]
# to [3d6413ce5a1732a0f353b2b23d7da540d6afcff1]
#
============================================================
--- packages/avetanabt/avetanabt_20060413.bb 3970cc3104dcfe44ee92a93deb184197d5f1235f
+++ packages/avetanabt/avetanabt_20060413.bb d715915e84514f9f60dd62b9fb19569c1b675e54
@@ -24,7 +24,7 @@ do_compile() {
# generate classes
# javac -> jikes
${STAGING_BINDIR_NATIVE}/find {de,javax,com} -iname *.java > file.list
- ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+ ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d build @file.list
# create own version.xml (add version information available at runtime)
head -n 4 version.xml >> build/version.xml
@@ -37,7 +37,7 @@ do_compile() {
# JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
# javah -> kaffeh
- ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
+ ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
# Native language (C) library - libavetanaBT.so
${CXX} ${CXXFLAGS} -shared -lbluetooth -I${STAGING_INCDIR}/classpath c/BlueZ.cpp -o libavetanaBT.so ${LDFLAGS}
@@ -46,8 +46,8 @@ do_stage() {
do_stage() {
- install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt
- install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/
+ install -d ${STAGING_DATADIR_NATIVE}/avetanabt
+ install avetanaBT.jar ${STAGING_DATADIR_NATIVE}/avetanabt/
}
============================================================
--- packages/avetanabt/avetanabt_cvs.bb db4feffad440a914f5d6df3b02877e9dbb15c752
+++ packages/avetanabt/avetanabt_cvs.bb d5f611a8d092f7c2afaf2125ff0c507d0f23d218
@@ -27,7 +27,7 @@ do_compile() {
# generate classes
# javac -> jikes
${STAGING_BINDIR_NATIVE}/find {de,javax,com} -iname *.java > file.list
- ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+ ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d build @file.list
# create own version.xml (add version information available at runtime)
head -n 4 version.xml >> build/version.xml
@@ -40,7 +40,7 @@ do_compile() {
# JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
# javah -> kaffeh
- ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
+ ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
# Native language (C) library - libavetanaBT.so
${CXX} ${CXXFLAGS} -shared -lbluetooth -I${STAGING_INCDIR}/classpath c/BlueZ.cpp -o libavetanaBT.so ${LDFLAGS}
@@ -49,8 +49,8 @@ do_stage() {
do_stage() {
- install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt
- install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/
+ install -d ${STAGING_DATADIR_NATIVE}/avetanabt
+ install avetanaBT.jar ${STAGING_DATADIR_NATIVE}/avetanabt/
}
============================================================
--- packages/crimsonfields/crimsonfields_0.4.8.bb 8522dc887c0a730c58913b2a6c81d25c5315bdc5
+++ packages/crimsonfields/crimsonfields_0.4.8.bb 8dfcbbcdad87ce744bf3a915a867e5c48b3e06aa
@@ -17,9 +17,9 @@ do_configure() {
oe_runconf
for binary in ${HOST_TOOLS}
do
- install -m 0755 ${STAGING_DIR}/${BUILD_SYS}/bin/$binary tools/
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/$binary tools/
done
- install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/default.* tools/
+ install -m 0644 ${STAGING_DATADIR_NATIVE}/default.* tools/
}
do_install() {
============================================================
--- packages/glibc/eglibc_svn.bb f21e6fde33775e6d7259b548e8ea613cb6381d7b
+++ packages/glibc/eglibc_svn.bb 212e444094c694fad0d0b243de740753f10ed55b
@@ -14,7 +14,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
RPROVIDES_${PN}-dev = "libc6-dev"
# the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
GLIBC_ADDONS ?= "ports,nptl,libidn"
============================================================
--- packages/glibc/glibc_2.4.bb 364445388b67f1d7faba1f8abe200162e43cdf30
+++ packages/glibc/glibc_2.4.bb 167695f09f46b0437640fa75ad34b85edd2a6590
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE_arm = "-1"
DEFAULT_PREFERENCE_arm = "-1"
# the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
============================================================
--- packages/glibc/glibc_2.5.bb adbbaef7a3f6be171b33e7148e188d99e04e261c
+++ packages/glibc/glibc_2.5.bb af0b010317c6304cbb206aab68c72e9c1c1f59a2
@@ -8,7 +8,7 @@ PR = "r7"
PR = "r7"
# the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
============================================================
--- packages/glibc/glibc_2.6.1.bb cc783c4e44a3a182955394de28e61f41cb8bfbcf
+++ packages/glibc/glibc_2.6.1.bb 23c7eaecef99f38c791cb4d812d451055a3924fb
@@ -8,7 +8,7 @@ PR = "r1"
PR = "r1"
# the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
============================================================
--- packages/gutenprint/gutenprint_5.1.3.bb ac7c23e861599d6d4c28bb4dbb795a5026f61543
+++ packages/gutenprint/gutenprint_5.1.3.bb 5140095a562b6482a639284250b1c0030a1b310d
@@ -36,7 +36,7 @@ do_install_append() {
do_install_append() {
install -d ${D}${datadir}/cups/model/
- install -m 644 ${STAGING_DIR}/${BUILD_SYS}/share/cups/model/* ${D}${datadir}/cups/model/
+ install -m 644 ${STAGING_DATADIR_NATIVE}/cups/model/* ${D}${datadir}/cups/model/
cp -pPr ${D}${STAGING_LIBDIR}/* ${D}${libdir}/
cp -pPr ${D}${STAGING_DATADIR}/* ${D}${datadir}/
}
============================================================
--- packages/icewm/icewm_1.2.20.bb 7c69cb4defd29a458749b37be31deaf9229ef223
+++ packages/icewm/icewm_1.2.20.bb 0a027303c29416712c81e2ca8184eca58c4b12bb
@@ -14,7 +14,7 @@ EXTRA_OECONF = "--disable-i18n --without
EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \
--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \
- --with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir"
+ --with-mkfontdir=${STAGING_BINDIR_NATIVE}/mkfontdir"
pkg_postinst() {
update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10
============================================================
--- packages/icewm/icewm_1.2.30.bb 1c35ca97b5988f440f742837fc8a2db272c48869
+++ packages/icewm/icewm_1.2.30.bb f7b7e77c36d0b7c8aeb429d0d3612d4d700b6be6
@@ -12,7 +12,7 @@ EXTRA_OECONF = "--disable-i18n --without
EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \
--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \
- --with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir"
+ --with-mkfontdir=${STAGING_BINDIR_NATIVE}/mkfontdir"
pkg_postinst() {
update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10
============================================================
--- packages/klibc/klibc.inc da384142d18acb714d5d51c1311c32e51c0ffca3
+++ packages/klibc/klibc.inc 2619f7a7d823d7bb5fe1870350039f21dea55d9d
@@ -54,13 +54,13 @@ do_configure () {
ln -sf ${STAGING_KERNEL_DIR} linux
}
-STAGING_KLIBC_DIR = "${STAGING_DIR}/${HOST_SYS}/klibc"
+STAGING_KLIBC_DIR = "${STAGING_DIR_HOST}/klibc"
do_stage() {
rm -rf "${STAGING_KLIBC_DIR}"
oe_runmake 'prefix=${STAGING_KLIBC_DIR}' \
'bindir=${STAGING_BINDIR}' \
- 'mandir=${STAGING_DIR}/${BUILD_SYS}/share/man' \
+ 'mandir=${STAGING_DATADIR}/man' \
install
# The following is sufficient, at least in klibc 1.1.1 to make klcc
# use the staged libraries and include files.
============================================================
--- packages/mozilla/minimo_cvs.bb 2be5472ea7f6505b0ac77854e0ddd53a7d558c56
+++ packages/mozilla/minimo_cvs.bb a9cc1df6ec5f80aa94c00f89859d1cebd19b39f5
@@ -35,7 +35,7 @@ export ac_cv_prog_HOST_CXXFLAGS="${BUILD
export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
-export HOST_LIBIDL_CONFIG = "${STAGING_DIR}/${BUILD_SYS}/bin/libIDL-config-2"
+export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
mozdir="${libdir}/mozilla-minimo"
============================================================
--- packages/netatalk/netatalk_2.0.3.bb 843b0b652c0af1d7322ae272431ae73f175c0d27
+++ packages/netatalk/netatalk_2.0.3.bb 7ede53ec4a1d181c30789368b6a67f4163abf5d4
@@ -1,4 +1,3 @@
-DESCRIPTION = "Appletalk protocol suite"
SECTION = "net"
PR = "r0"
LICENSE = "GPL"
@@ -31,7 +30,7 @@ do_configure () {
--disable-static \
--with-pam \
--mandir=${mandir}
- cp ${STAGING_DIR}/${BUILD_SYS}/bin/${TARGET_SYS}-libtool ./${TARGET_SYS}-libtool
+ cp ${STAGING_BINDIR_NATIVE}/${TARGET_SYS}-libtool ./${TARGET_SYS}-libtool
}
do_install_append() {
============================================================
--- packages/obsolete/dbus/dbus_0.34.bb 8c11536df32432aac2fc9e301e1c3529abf1602f
+++ packages/obsolete/dbus/dbus_0.34.bb 180079373b349e46a86857717ddb553b60c22bed
@@ -9,6 +9,6 @@ do_configure_prepend() {
FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
do_configure_prepend() {
- install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
- install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
+ install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
+ install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
}
============================================================
--- packages/obsolete/dbus/dbus_0.50.bb 8c11536df32432aac2fc9e301e1c3529abf1602f
+++ packages/obsolete/dbus/dbus_0.50.bb 180079373b349e46a86857717ddb553b60c22bed
@@ -9,6 +9,6 @@ do_configure_prepend() {
FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
do_configure_prepend() {
- install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
- install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
+ install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
+ install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
}
============================================================
--- packages/omniorb/omniorb-native_4.0.7.bb 8097b523200a0b2b3afaca75c650e377e41f39a2
+++ packages/omniorb/omniorb-native_4.0.7.bb 0fa5ba47b4941671e22d25386db569e534374dc2
@@ -14,5 +14,5 @@ do_stage_append() {
# Ugly hack so libtool does not find native libs when building cross packages
# We really only build this package for omniidl anyway
do_stage_append() {
- rm -f ${STAGING_DIR}/${BUILD_SYS}/lib/libomni*
+ rm -f ${STAGING_LIBDIR_NATIVE}/libomni*
}
============================================================
--- packages/perl/perl_5.8.8.bb c97084e319193690d0222303aa7f475971c1dff9
+++ packages/perl/perl_5.8.8.bb 3aca32440feddd983fff24ef6e8448cc34d35493
@@ -41,7 +41,7 @@ HOSTPERL = "${STAGING_BINDIR_NATIVE}/per
HOSTPERL = "${STAGING_BINDIR_NATIVE}/perl${PV}"
# Where to find .so files - use the -native versions not those from the target build
-export PERLHOSTLIB = "${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV}/"
+export PERLHOSTLIB = "${STAGING_LIBDIR_NATIVE}/perl/${PV}/"
do_configure() {
# Make hostperl in build directory be the native perl
@@ -138,12 +138,12 @@ do_stage() {
}
do_stage() {
install -d ${STAGING_DIR}/${HOST_SYS}/perl \
- ${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV} \
+ ${STAGING_LIBDIR_NATIVE}/perl/${PV} \
${STAGING_LIBDIR}/perl/${PV}/CORE
# target config, used by cpan.bbclass to extract version information
install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/
# target configuration, used by native perl when cross-compiling
- install lib/Config_heavy.pl ${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV}/Config_heavy-target.pl
+ install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl
# perl shared library headers
for i in av.h embed.h gv.h keywords.h op.h perlio.h pp.h regexp.h \
uconfig.h XSUB.h cc_runtime.h embedvar.h handy.h opnames.h \
============================================================
--- packages/python/python-native_2.5.1.bb e2bb20fc9554ec3954487bcf3ed0f6a531af5044
+++ packages/python/python-native_2.5.1%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list