Skip to contentSkip to conversation

Renamed prefix_native, bindir_native, etc using hyphens

PATCH In review Douglas Royds 4 participants 5 messages Mar 18, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 4/4 Renamed prefix_native, bindir_native, etc using hyphens

- Avoids clashing with the machine override when MACHINE=native
- bindir_cross similarly renamed for consistency

---
 classes/cross-canadian.bbclass              |    2 +-
 classes/native.bbclass                      |    4 +-
 classes/packaged-staging.bbclass            |   16 ++++++------
 conf/bitbake.conf                           |   36 +++++++++++++-------------
 conf/distro/micro.conf                      |    4 +-
 recipes/gcc/gcc-cross-sdk_4.1.2.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.2.2.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.2.3.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.2.4.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.3.1.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.3.2.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.3.3.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.3.4.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.4.1.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.4.2.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.4.3.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb |    2 +-
 recipes/gcc/gcc-cross-sdk_svn.bb            |    2 +-
 recipes/gcc/gcc-cross_4.1.0.bb              |    2 +-
 recipes/gcc/gcc-cross_4.1.1.bb              |    2 +-
 recipes/gcc/gcc-cross_4.1.2.bb              |    2 +-
 recipes/gcc/gcc-cross_4.2.1.bb              |    2 +-
 recipes/gcc/gcc-cross_4.2.2.bb              |    2 +-
 recipes/gcc/gcc-cross_4.2.3.bb              |    2 +-
 recipes/gcc/gcc-cross_4.2.4.bb              |    2 +-
 recipes/gcc/gcc-cross_4.3.1.bb              |    2 +-
 recipes/gcc/gcc-cross_4.3.2.bb              |    2 +-
 recipes/gcc/gcc-cross_4.3.3.bb              |    2 +-
 recipes/gcc/gcc-cross_4.3.4.bb              |    2 +-
 recipes/gcc/gcc-cross_4.4.1.bb              |    2 +-
 recipes/gcc/gcc-cross_4.4.2.bb              |    2 +-
 recipes/gcc/gcc-cross_4.4.3.bb              |    2 +-
 recipes/gcc/gcc-cross_csl-arm-2007q3.bb     |    2 +-
 recipes/gcc/gcc-cross_csl-arm-2008q1.bb     |    2 +-
 recipes/gcc/gcc-cross_csl-arm-2008q3.bb     |    2 +-
 recipes/gcc/gcc-cross_svn.bb                |    2 +-
 recipes/libtool/libtool-cross_1.5.10.bb     |    4 +-
 recipes/libtool/libtool-cross_1.5.22.bb     |    4 +-
 recipes/libtool/libtool-cross_1.5.24.bb     |    4 +-
 recipes/libtool/libtool-cross_2.2.4.bb      |    4 +-
 recipes/libtool/libtool-cross_2.2.6a.bb     |    4 +-
 recipes/libtool/libtool-cross_2.2.6b.bb     |    4 +-
 42 files changed, 74 insertions(+), 74 deletions(-)
classes/cross-canadian.bbclass +1 -1
index bd738ec..04a7130 100644
@@ -17,7 +17,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk"
 STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
 
-PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}"
+PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir-cross}"
 PKGDATA_DIR = 

"${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}"

HOST_ARCH = "${SDK_ARCH}"

classes/native.bbclass +2 -2
index 6698b61..dc57211 100644
@@ -55,8 +55,8 @@ export STRIP = "${HOST_PREFIX}strip"
 
 # Path prefixes
 base_prefix = "${STAGING_DIR_NATIVE}"
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
 
 # Since we actually install these into situ there is no staging prefix
 STAGING_DIR_HOST = ""
classes/packaged-staging.bbclass +4 -4
index 1ede25c..ae0aec4 100644
@@ -149,11 +149,11 @@ staging_helper () {
 		done
 		echo "dest root /" >> $conffile
 	fi
-	if [ ! -e ${TMPDIR}${libdir_native}/opkg/info/ ]; then
-		mkdir -p ${TMPDIR}${libdir_native}/opkg/info/
+	if [ ! -e ${TMPDIR}${libdir-native}/opkg/info/ ]; then
+		mkdir -p ${TMPDIR}${libdir-native}/opkg/info/
 	fi
- 	if [ ! -e ${TMPDIR}${libdir_native}/ipkg/ ]; then
-		ln -sf opkg/ ${TMPDIR}${libdir_native}/ipkg || true
+ 	if [ ! -e ${TMPDIR}${libdir-native}/ipkg/ ]; then
+		ln -sf opkg/ ${TMPDIR}${libdir-native}/ipkg || true
 	fi
 }
 
@@ -182,7 +182,7 @@ python packagestage_scenefunc () {
         #
         # Install the staging package somewhere temporarily so we can 

extract the stamp files

         #
- bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir_native}/opkg/info/ ", d))
+ bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir-native}/opkg/info/ ", d))
         cmd = bb.data.expand("${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} 
-force-depends -o ${WORKDIR}/tstage install", d)
         ret = os.system("PATH=\"%s\" %s %s" % (path, cmd, stagepkg))
         if ret != 0:

@@ -329,20 +329,20 @@ staging_packager () {
staging_package_installer () {
#${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}

- STATUSFILE=${TMPDIR}${libdir_native}/opkg/status
+ STATUSFILE=${TMPDIR}${libdir-native}/opkg/status

 	echo "Package: ${PSTAGE_PKGPN}"        >> $STATUSFILE
 	echo "Version: ${PSTAGE_PKGVERSION}"   >> $STATUSFILE
 	echo "Status: install user installed"  >> $STATUSFILE

echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE echo "" >> $STATUSFILE

- CTRLFILE=${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.control
+ CTRLFILE=${TMPDIR}${libdir-native}/opkg/info/${PSTAGE_PKGPN}.control
echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE
echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE
echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE

cd ${PSTAGE_TMPDIR_STAGE}

-	find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.list
+	find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir-native}/opkg/info/${PSTAGE_PKGPN}.list

}

python do_package_stage () {

conf/bitbake.conf +18 -18
index 0886587..1627c51 100644
@@ -69,16 +69,16 @@ export oldincludedir = "${exec_prefix}/include"
 #
 # These must match the various bbclass layout definitions
 #
-base_bindir_native = "/bin"
-base_sbindir_native = "/sbin"
-sysconfdir_native = "/etc"
-prefix_native = "/usr"
-bindir_native = "${prefix_native}/bin"
-sbindir_native = "${prefix_native}/sbin"
-includedir_native = "${prefix_native}/include"
-libdir_native = "${prefix_native}/lib"
-datadir_native = "${prefix_native}/share"
-bindir_cross = "/bin"
+base_bindir-native = "/bin"
+base_sbindir-native = "/sbin"
+sysconfdir-native = "/etc"
+prefix-native = "/usr"
+bindir-native = "${prefix-native}/bin"
+sbindir-native = "${prefix-native}/sbin"
+includedir-native = "${prefix-native}/include"
+libdir-native = "${prefix-native}/lib"
+datadir-native = "${prefix-native}/share"
+bindir-cross = "/bin"
 
 #
 # Cross recipes need to know about the target layout
@@ -299,13 +299,13 @@ STAGING_DIR = "${TMPDIR}/staging"
 
 STAGING_DIR_JAVA = "${STAGING_DIR}/java"
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
-STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
-STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"
-STAGING_BINDIR_CROSS_BASEPKG = "${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}"
-STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
-STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
-STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
-STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
+STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir-native}"
+STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${bindir-native}/${MULTIMACH_HOST_SYS}"
+STAGING_BINDIR_CROSS_BASEPKG = "${STAGING_DIR_NATIVE}${bindir-native}/${BASEPKG_TARGET_SYS}"
+STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir-native}"
+STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir-native}"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir-native}"
+STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir-native}"
 
 # This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine
 # specific packages - hack around it for now.
@@ -414,7 +414,7 @@ EXTRA_IMAGEDEPENDS = ""
 
 CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
 CROSS_DATADIR = "${CROSS_DIR}/share"
-PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_CROSS_BASEPKG}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}${base_bindir_native}:"
+PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_CROSS_BASEPKG}:${STAGING_DIR_NATIVE}${sbindir-native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir-cross}:${STAGING_DIR_NATIVE}${base_sbindir-native}:${STAGING_DIR_NATIVE}${base_bindir-native}:"
 export PATH
 
 ##################################################################
conf/distro/micro.conf +2 -2
index 9885425..01a5b00 100644
@@ -97,8 +97,8 @@ PACKAGE_SNAP_LIB_SYMLINKS = "1"
 # Collapse /usr into /
 prefix = ""
 exec_prefix = ""
-prefix_native = ""
-exec_prefix_native = ""
+prefix-native = ""
+exec_prefix-native = ""
 
 # Don't install ldconfig and associated gubbins
 USE_LDCONFIG = "0"
recipes/gcc/gcc-cross-sdk_4.1.2.bb +1 -1
index 6a74606..7efe162 100644
@@ -7,4 +7,4 @@ require gcc-package-sdk.inc
 
 DEPENDS += "gmp-native mpfr-native"
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.2.2.bb +1 -1
index bea9839..da4450f 100644
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.2.3.bb +1 -1
index bea9839..da4450f 100644
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.2.4.bb +1 -1
index 9c67c7e..b41adb5 100644
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --enable-libssp \
 		--enable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.3.1.bb +1 -1
index bea9839..da4450f 100644
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.3.2.bb +1 -1
index bea9839..da4450f 100644
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.3.3.bb +1 -1
index ed39d31..3ada381 100644
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.3.4.bb +1 -1
index 88e26c5..fda3d70 100644
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.4.1.bb +1 -1
index e1b510e..c2913fa 100644
@@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.4.2.bb +1 -1
index e1b510e..c2913fa 100644
@@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_4.4.3.bb +1 -1
index e1b510e..c2913fa 100644
@@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +1 -1
index 2e4fcf2..3cf64bd 100644
@@ -13,7 +13,7 @@ EXTRA_OECONF += " \
 		--disable-libgomp \
 		--disable-libunwind-exceptions \
 		--disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native} \
 		"
 
 #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: 

-isystem/OE/angstrom-tmp/staging/i686-linux/usr/include

recipes/gcc/gcc-cross-sdk_svn.bb +1 -1
index 48d8a0d..4c6cae4 100644
@@ -11,4 +11,4 @@ DEPENDS += "libmpc-native gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+		--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross_4.1.0.bb +1 -1
index def0586..4bddd02 100644
@@ -5,4 +5,4 @@ require gcc-cross4.inc
 require gcc-configure-cross.inc
 require gcc-package-cross.inc
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross_4.1.1.bb +1 -1
index e96867e..9ff852a 100644
@@ -7,4 +7,4 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
recipes/gcc/gcc-cross_4.1.2.bb +1 -1
index 2367d19..c0a56f1 100644
@@ -9,6 +9,6 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 EXTRA_OECONF_append_avr32= "  --disable-libmudflap "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.2.1.bb +1 -1
index 8c7f4c5..2934ce5 100644
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.2.2.bb +1 -1
index cf1bf68..b2237b2 100644
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.2.3.bb +1 -1
index cf1bf68..b2237b2 100644
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.2.4.bb +1 -1
index cf1bf68..b2237b2 100644
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.3.1.bb +1 -1
index acd5521..7f007e2 100644
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.3.2.bb +1 -1
index 94b98b9..e9c62a4 100644
@@ -6,6 +6,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.3.3.bb +1 -1
index 94b98b9..e9c62a4 100644
@@ -6,6 +6,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.3.4.bb +1 -1
index 71cb5e6..ec32a60 100644
@@ -6,6 +6,6 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.4.1.bb +1 -1
index 11eb29d..519ce85 100644
@@ -6,6 +6,6 @@ PR = "${INC_PR}.1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.4.2.bb +1 -1
index 11eb29d..519ce85 100644
@@ -6,6 +6,6 @@ PR = "${INC_PR}.1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_4.4.3.bb +1 -1
index 11eb29d..519ce85 100644
@@ -6,6 +6,6 @@ PR = "${INC_PR}.1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/gcc/gcc-cross_csl-arm-2007q3.bb +1 -2
index adf7f5a..02e279e 100644
@@ -7,7 +7,7 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: 
-isystem/OE/angstrom-tmp/staging/i686-linux/usr/include

CFLAGS = ""

recipes/gcc/gcc-cross_csl-arm-2008q1.bb +1 -2
index d534574..a0f297f 100644
@@ -7,7 +7,7 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: 
-isystem/OE/angstrom-tmp/staging/i686-linux/usr/include

CFLAGS = ""

recipes/gcc/gcc-cross_csl-arm-2008q3.bb +1 -2
index ef4ef30..7687ad7 100644
@@ -7,7 +7,7 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
 
 #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: 
-isystem/OE/angstrom-tmp/staging/i686-linux/usr/include

CFLAGS = ""

recipes/gcc/gcc-cross_svn.bb +1 -1
index 2d3c136..7d4da6c 100644
@@ -8,6 +8,6 @@ DEPENDS += "libmpc-native"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} --with-system-zlib"
+EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native} --with-system-zlib"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
recipes/libtool/libtool-cross_1.5.10.bb +2 -2
index 1ae9c68..fbec4dc 100644
@@ -13,8 +13,8 @@ SRC_URI_append = " file://rpath-control.patch;patch=1 \
 
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_configure_prepend () {
recipes/libtool/libtool-cross_1.5.22.bb +2 -2
index 3832612..71cc95c 100644
@@ -12,8 +12,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
recipes/libtool/libtool-cross_1.5.24.bb +2 -2
index 211e5a3..b558d71 100644
@@ -9,8 +9,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
recipes/libtool/libtool-cross_2.2.4.bb +2 -2
index 1a60b57..99323ce 100644
@@ -17,8 +17,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
 
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
recipes/libtool/libtool-cross_2.2.6a.bb +2 -2
index d3ea34a..aaf51ff 100644
@@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
 #SRC_URI_append_linux = "${DOLT_PATCH}"
 #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
 
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
recipes/libtool/libtool-cross_2.2.6b.bb +2 -2
index d3ea34a..aaf51ff 100644
@@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
 #SRC_URI_append_linux = "${DOLT_PATCH}"
 #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
 
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
Signature · 19 lines
1.6.3.3







=======================================================================
This email, including any attachments, is only for the intended
addressee.  It is subject to copyright, is confidential and may be
the subject of legal or other privilege, none of which is waived or
lost by reason of this transmission.
If the receiver is not the intended addressee, please accept our
apologies, notify us by return, delete all copies and perform no
other act on the email.
Unfortunately, we cannot warrant that the email has not been
altered or corrupted during transmission.
=======================================================================
#1 lore raw

2010/3/18 Douglas Royds <[email protected]>:

Quoted 3 lines

  - Avoids clashing with the machine override when MACHINE=native
  - bindir_cross similarly renamed for consistency

[...]

classes/native.bbclass export STRIP = "${HOST_PREFIX}strip" · line 59

Quoted 7 lines

 # Path prefixes
 base_prefix = "${STAGING_DIR_NATIVE}"

classes/native.bbclass +2 -2
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"

[...]

Shouldn't we then for consistent naming also go to exex-prefix etc ?

FM

#2 lore raw
Quoted 15 lines · Frans Meulenbroeks

2010/3/18 Douglas Royds <[email protected]>:

Quoted 3 lines

- Avoids clashing with the machine override when MACHINE=native
- bindir_cross similarly renamed for consistency

[...]

Quoted 7 lines

# Path prefixes
base_prefix = "${STAGING_DIR_NATIVE}"

classes/native.bbclass +2 -2
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"

[...]

Quoted 1 line

Shouldn't we then for consistent naming also go to exex-prefix etc ?

That would need to be done carefully since ${exec_prefix} is exported. I am not sure it would be worth the effort to get it right at the moment. This would probably be better done as a part of a larger effort to tidy up the semantics of the bitbake variable namespace.

p.

#3 lore raw
In reply to Frans Meulenbroeks
Quoted 18 lines · Frans Meulenbroeks

2010/3/18 Douglas Royds <[email protected]>:

Quoted 4 lines

- Avoids clashing with the machine override when MACHINE=native
- bindir_cross similarly renamed for consistency

[...]

Quoted 7 lines

# Path prefixes
base_prefix = "${STAGING_DIR_NATIVE}"

classes/native.bbclass +2 -2
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"

[...]

Quoted 1 line

Shouldn't we then for consistent naming also go to exex-prefix etc ?

In the spirit of keeping a single patch for a single purpose, I have not modified anything that is not required to fix the problem at hand (um, except for bindir_cross). I have only modified the variable names that were modified in Richard's commit "Start removal of layout_* variables and replace these with new mechanisms to allow nextgen SDK generation (from Poky)":

http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=bea72c2fecde175add169bb55df1922b048030c8

Any renaming of base_prefix, exec_prefix, base_bindir, target_datadir, &c is a separate matter. Note that some of these names are imposed on us by Autotools convention. This is why these variables are in lower case in the first place:

http://www.gnu.org/prep/standards/html_node/Directory-Variables.html#Directory-Variables

Douglas.

=======================================================================
This email, including any attachments, is only for the intended addressee. It is subject to copyright, is confidential and may be the subject of legal or other privilege, none of which is waived or lost by reason of this transmission.
If the receiver is not the intended addressee, please accept our apologies, notify us by return, delete all copies and perform no other act on the email.
Unfortunately, we cannot warrant that the email has not been altered or corrupted during transmission.
=======================================================================

#4 lore raw
Quoted 6 lines · Douglas Royds

Any renaming of base_prefix, exec_prefix, base_bindir, target_datadir, &c is a separate matter. Note that some of these names are imposed on us by Autotools convention. This is why these variables are in lower case in the first place:

http://www.gnu.org/prep/standards/html_node/Directory-Variables.html#Directory-Variables

Exactly, this is why they are as they are and I don't think changing this is practical.

It would in fact be more feasible to switch to a "new" character for overrides in bitbake...

Cheers,

Richard