summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/avetanabt/avetanabt_20060413.bb8
-rw-r--r--packages/avetanabt/avetanabt_cvs.bb8
-rw-r--r--packages/crimsonfields/crimsonfields_0.4.8.bb4
-rw-r--r--packages/glibc/eglibc_svn.bb2
-rw-r--r--packages/glibc/glibc_2.4.bb2
-rw-r--r--packages/glibc/glibc_2.5.bb2
-rw-r--r--packages/glibc/glibc_2.6.1.bb2
-rw-r--r--packages/gutenprint/gutenprint_5.1.3.bb2
-rw-r--r--packages/icewm/icewm_1.2.20.bb2
-rw-r--r--packages/icewm/icewm_1.2.30.bb2
-rw-r--r--packages/klibc/klibc.inc4
-rw-r--r--packages/mozilla/minimo_cvs.bb2
-rw-r--r--packages/netatalk/netatalk_2.0.3.bb3
-rw-r--r--packages/obsolete/dbus/dbus_0.34.bb4
-rw-r--r--packages/obsolete/dbus/dbus_0.50.bb4
-rw-r--r--packages/omniorb/omniorb-native_4.0.7.bb2
-rw-r--r--packages/perl/perl_5.8.8.bb6
-rw-r--r--packages/python/python-native_2.5.1.bb2
-rw-r--r--packages/python/python-sip_4.7.bb2
-rw-r--r--packages/python/python24-native_2.4.0.bb2
20 files changed, 32 insertions, 33 deletions
diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb
index be88139319..54e3d845bb 100644
--- a/packages/avetanabt/avetanabt_20060413.bb
+++ b/packages/avetanabt/avetanabt_20060413.bb
@@ -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_compile() {
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/
}
diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb
index a5c9ce0ac7..a8f795989b 100644
--- a/packages/avetanabt/avetanabt_cvs.bb
+++ b/packages/avetanabt/avetanabt_cvs.bb
@@ -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_compile() {
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/
}
diff --git a/packages/crimsonfields/crimsonfields_0.4.8.bb b/packages/crimsonfields/crimsonfields_0.4.8.bb
index 6c36c1fca6..6e84c46570 100644
--- a/packages/crimsonfields/crimsonfields_0.4.8.bb
+++ b/packages/crimsonfields/crimsonfields_0.4.8.bb
@@ -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() {
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index 7abac644bc..0004eabaaf 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -14,7 +14,7 @@ PACKAGES_DYNAMIC = "libc6*"
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"
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 6f408d70f8..9217779ad0 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -7,7 +7,7 @@ COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
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"
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index e35e1ced43..0218993f64 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -8,7 +8,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
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"
diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 7a73a03794..26ea0e3d93 100644
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -8,7 +8,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
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"
diff --git a/packages/gutenprint/gutenprint_5.1.3.bb b/packages/gutenprint/gutenprint_5.1.3.bb
index 8886323da5..f0e0b734ab 100644
--- a/packages/gutenprint/gutenprint_5.1.3.bb
+++ b/packages/gutenprint/gutenprint_5.1.3.bb
@@ -36,7 +36,7 @@ do_configure() {
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}/
}
diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb
index 4da5da5146..b6a90a54a4 100644
--- a/packages/icewm/icewm_1.2.20.bb
+++ b/packages/icewm/icewm_1.2.20.bb
@@ -14,7 +14,7 @@ inherit autotools pkgconfig
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
diff --git a/packages/icewm/icewm_1.2.30.bb b/packages/icewm/icewm_1.2.30.bb
index 5266b0adb9..4e7b7125ec 100644
--- a/packages/icewm/icewm_1.2.30.bb
+++ b/packages/icewm/icewm_1.2.30.bb
@@ -12,7 +12,7 @@ inherit autotools pkgconfig
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
diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc
index 4e86824eac..c33458eebc 100644
--- a/packages/klibc/klibc.inc
+++ b/packages/klibc/klibc.inc
@@ -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.
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 5f1ae3e996..b94dff2ab1 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -35,7 +35,7 @@ export ac_cv_prog_HOST_CC="${BUILD_CC}"
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"
diff --git a/packages/netatalk/netatalk_2.0.3.bb b/packages/netatalk/netatalk_2.0.3.bb
index 74cfd84042..5fd7255fed 100644
--- a/packages/netatalk/netatalk_2.0.3.bb
+++ b/packages/netatalk/netatalk_2.0.3.bb
@@ -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() {
diff --git a/packages/obsolete/dbus/dbus_0.34.bb b/packages/obsolete/dbus/dbus_0.34.bb
index 2a9989fe3b..442cb191ea 100644
--- a/packages/obsolete/dbus/dbus_0.34.bb
+++ b/packages/obsolete/dbus/dbus_0.34.bb
@@ -9,6 +9,6 @@ FILES_${PN} += "${bindir}/dbus-daemon"
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/
}
diff --git a/packages/obsolete/dbus/dbus_0.50.bb b/packages/obsolete/dbus/dbus_0.50.bb
index 2a9989fe3b..442cb191ea 100644
--- a/packages/obsolete/dbus/dbus_0.50.bb
+++ b/packages/obsolete/dbus/dbus_0.50.bb
@@ -9,6 +9,6 @@ FILES_${PN} += "${bindir}/dbus-daemon"
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/
}
diff --git a/packages/omniorb/omniorb-native_4.0.7.bb b/packages/omniorb/omniorb-native_4.0.7.bb
index b8a2e40395..1df6236aea 100644
--- a/packages/omniorb/omniorb-native_4.0.7.bb
+++ b/packages/omniorb/omniorb-native_4.0.7.bb
@@ -14,5 +14,5 @@ do_compile () {
# 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*
}
diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb
index a3873d99fb..328b4fb5df 100644
--- a/packages/perl/perl_5.8.8.bb
+++ b/packages/perl/perl_5.8.8.bb
@@ -41,7 +41,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
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_install() {
}
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 \
diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb
index a64a4f96c8..2587c5f421 100644
--- a/packages/python/python-native_2.5.1.bb
+++ b/packages/python/python-native_2.5.1.bb
@@ -30,5 +30,5 @@ EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""'
#}
do_stage_append() {
- install -m 0755 Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/
+ install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/
}
diff --git a/packages/python/python-sip_4.7.bb b/packages/python/python-sip_4.7.bb
index 2978edd54f..61fcc32986 100644
--- a/packages/python/python-sip_4.7.bb
+++ b/packages/python/python-sip_4.7.bb
@@ -30,7 +30,7 @@ do_configure_prepend() {
}
do_stage() {
- install -d ${STAGING_DIR}/${BUILD_SYS}/lib/${PYTHON_DIR}/site-packages/
+ install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/
# sipconfig.py sipdistutils.py
install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
}
diff --git a/packages/python/python24-native_2.4.0.bb b/packages/python/python24-native_2.4.0.bb
index 5e948965ad..0d852994b3 100644
--- a/packages/python/python24-native_2.4.0.bb
+++ b/packages/python/python24-native_2.4.0.bb
@@ -30,6 +30,6 @@ do_configure() {
do_stage_append() {
# install pgen for later usage with non-native builds
- install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/
+ install Parser/pgen ${STAGING_BINDIR_NATIVE}/
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 05:03:47 +0000