[oe-commits] org.oe.dev native, autotools bbclass: check if bindir exists before trying to access it

[koen commit]

native, autotools bbclass: check if bindir exists before trying to access it
* hardcoded since native.bbclass redefines ${bindir} and friends :(

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: bc4a8e8d779abed3918fe9ba7d2631eea0d32565
ViewMTN: http://monotone.openembedded.org/revision/info/bc4a8e8d779abed3918fe9ba7d2631eea0d32565
Files:
1
classes/autotools.bbclass
classes/native.bbclass
Diffs:

#
# mt diff -r04060d9bff99c4f4f9077dac1cf372043a7791cb -rbc4a8e8d779abed3918fe9ba7d2631eea0d32565
#
#
#
# patch "classes/autotools.bbclass"
#  from [aaa33a18c4d011916fbaf542a60cac115cdb6f85]
#    to [2c968bfb912e6a0afcfe01128a82f93e3ed4c611]
# 
# patch "classes/native.bbclass"
#  from [d85cd50f184e6fc81c02edd676b8f6122af18ede]
#    to [24887023b61569ffaeb8ce05d668ff7879919693]
#
============================================================
--- classes/autotools.bbclass	aaa33a18c4d011916fbaf542a60cac115cdb6f85
+++ classes/autotools.bbclass	2c968bfb912e6a0afcfe01128a82f93e3ed4c611
@@ -205,10 +205,21 @@ autotools_stage_all() {
 		cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
 	fi
 	
-	if [ "${AUTOTOOLS_NATIVE_STAGE_BINARIES}" = "1"] ; then
-		install -d ${STAGING_BINDIR_NATIVE}
-		cp -fpPR ${STAGE_TEMP}/*bin/* ${STAGING_BINDIR_NATIVE}/
-		cp -fpPR ${STAGE_TEMP}/usr/*bin/* ${STAGING_BINDIR_NATIVE}/
+	if [ "${AUTOTOOLS_NATIVE_STAGE_BINARIES}" = "1" ] ; then
+		if [ -d ${STAGE_TEMP}/bin ]; then
+			cp -fpPR ${STAGE_TEMP}/bin/*${STAGING_DIR_HOST}/${layout_bindir}
+		fi
+
+		if [ -d ${STAGE_TEMP}/sbin ]; then
+			cp -fpPR ${STAGE_TEMP}/sbin/* ${STAGING_DIR_HOST}/${layout_bindir}
+		fi
+
+		if [ -d ${STAGE_TEMP}/usr/bin ]; then
+			cp -fpPR ${STAGE_TEMP}/usr/bin/* ${STAGING_DIR_HOST}/${layout_bindir}
+		fi
+		if [ -d ${STAGE_TEMP}/usr/sbin ]; then
+			cp -fpPR ${STAGE_TEMP}/usr/sbin/* ${STAGING_DIR_HOST}/${layout_bindir}
+		fi
 	fi
 	rm -rf ${STAGE_TEMP}
 }
============================================================
--- classes/native.bbclass	d85cd50f184e6fc81c02edd676b8f6122af18ede
+++ classes/native.bbclass	24887023b61569ffaeb8ce05d668ff7879919693
@@ -80,7 +80,7 @@ do_stage () {
 		then
 			oe_runmake install
 		else
-			AUTOTOOLS_NATIVE_STAGE_BINARIES = "1"	
+			export AUTOTOOLS_NATIVE_STAGE_BINARIES="1"	
 			autotools_stage_all
 		fi
 	fi