Various libs: Convert to use STAGING_BINDIR_CROSS

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1038 311d38ba-8fff-0310-9ca6-ca027cbcb966

6 files changed, 14 insertions, 4 deletions

diff --git a/meta/packages/libgcrypt/libgcrypt_1.2.1.bb b/meta/packages/libgcrypt/libgcrypt_1.2.1.bb
index e797ee75c..3f4942cae 100644
--- a/meta/packages/libgcrypt/libgcrypt_1.2.1.bb
+++ b/meta/packages/libgcrypt/libgcrypt_1.2.1.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
 	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
 	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gcrypt.h gcrypt-module.h
diff --git a/meta/packages/libgcrypt/libgcrypt_1.2.3.bb b/meta/packages/libgcrypt/libgcrypt_1.2.3.bb
index e797ee75c..3f4942cae 100644
--- a/meta/packages/libgcrypt/libgcrypt_1.2.3.bb
+++ b/meta/packages/libgcrypt/libgcrypt_1.2.3.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
 	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
 	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gcrypt.h gcrypt-module.h
diff --git a/meta/packages/libidl/libidl_0.8.3.bb b/meta/packages/libidl/libidl_0.8.3.bb
index e74324739..fdce4ba18 100644
--- a/meta/packages/libidl/libidl_0.8.3.bb
+++ b/meta/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/meta/packages/libtool/libtool-cross_1.5.10.bb b/meta/packages/libtool/libtool-cross_1.5.10.bb
index 81a4990d2..fdc8f6ffa 100644
--- a/meta/packages/libtool/libtool-cross_1.5.10.bb
+++ b/meta/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/meta/packages/libusb/libusb_0.1.10a.bb b/meta/packages/libusb/libusb_0.1.10a.bb
index 298eb5ee7..3054d9230 100644
--- a/meta/packages/libusb/libusb_0.1.10a.bb
+++ b/meta/packages/libusb/libusb_0.1.10a.bb
@@ -20,6 +20,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/meta/packages/libxml/libxml2_2.6.22.bb b/meta/packages/libxml/libxml2_2.6.22.bb
index f29501040..499b9beb6 100644
--- a/meta/packages/libxml/libxml2_2.6.22.bb
+++ b/meta/packages/libxml/libxml2_2.6.22.bb
@@ -27,8 +27,8 @@ do_stage () {
 	cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
 		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
 			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config
-	chmod a+rx ${STAGING_BINDIR}/xml2-config
+			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xml2-config
+	chmod a+rx ${STAGING_BINDIR_CROSS}/xml2-config
 	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
 }