[oe-commits] Constantin Musca : bitbake.conf: add nonarch_base_lib variable

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 0730a8cbb42cd8b6667f2d1daefa0f6fcec06af2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0730a8cbb42cd8b6667f2d1daefa0f6fcec06af2

Author: Constantin Musca <constantinx.musca at intel.com>
Date:   Fri Dec 14 15:55:09 2012 +0200

bitbake.conf: add nonarch_base_lib variable

Adapt stagging.bbclass to this change

Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/staging.bbclass |    4 ++++
 meta/conf/bitbake.conf       |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 82624cb..1a078b4 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -50,6 +50,10 @@ sysroot_stage_dirs() {
 	then
 		sysroot_stage_libdir $from${base_libdir} $to${base_libdir}
 	fi
+	if [ -d $from${nonarch_base_libdir} ]
+	then
+		sysroot_stage_libdir $from${nonarch_base_libdir} $to${nonarch_base_libdir}
+	fi
 	sysroot_stage_dir $from${datadir} $to${datadir}
 	# We don't care about docs/info/manpages/locales
 	rm -rf $to${mandir}/ $to${docdir}/ $to${infodir}/ ${to}${datadir}/locale/
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 578c29f..2e3856a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -21,6 +21,7 @@ export exec_prefix = "/usr"
 export base_bindir = "${base_prefix}/bin"
 export base_sbindir = "${base_prefix}/sbin"
 export base_libdir = "${base_prefix}/${baselib}"
+export nonarch_base_libdir = "${base_prefix}/lib"
 
 # Architecture independent paths
 export datadir = "${prefix}/share"