From 14a6abd7d4c87d51068a61f1dde1019102ac5571 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Nov 2006 15:10:10 +0000
Subject: binconfig.bbclass: mangle *-config and .la files that end up in
 packages, based on work by Marcin Juszkiewicz

---
 classes/binconfig.bbclass | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'classes/binconfig.bbclass')

diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 34021845ee..ad33c0e498 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -27,6 +27,27 @@ def is_native(d):
 
 BINCONFIG_GLOB ?= "*-config"
 
+do_install_append() {
+
+        for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
+                cat $config | sed \
+		-e 's:${STAGING_LIBDIR}:${libdir}:g;' \ 
+		-e 's:${STAGING_INCDIR}:${includedir}:g;' \
+		-e 's:${STAGING_DATADIR}:${datadir}:' \
+		-e 's:${STAGING_LIBDIR}/..:${prefix}:' > ${D}${bindir}/`basename $config`
+        done
+
+	for lafile in `find ${D} -name *.la` ; do
+		sed -i \
+		    -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
+		    -e 's:${STAGING_INCDIR}:${includedir}:g;' \
+		    -e 's:${STAGING_DATADIR}:${datadir}:' \
+		    -e 's:${STAGING_LIBDIR}/..:${prefix}:' \
+		    $lafile
+	done	    
+
+}
+
 do_stage_append() {
 	for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
 		configname=`basename $config`${@is_native(d)}
-- 
cgit v1.2.3


From d05d3f991cfbd3c4af619fe87cfdcde0bc5da868 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Nov 2006 15:49:36 +0000
Subject: binconfig.bbclass: protect foo-native stuff from do_install

---
 classes/binconfig.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'classes/binconfig.bbclass')

diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index ad33c0e498..317e080fc5 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -29,6 +29,8 @@ BINCONFIG_GLOB ?= "*-config"
 
 do_install_append() {
 
+    #the 'if' protects native packages, since we can't easily check for bb.data.inherits_class('native', d) in shell 
+    if [ -e ${D}${bindir} ] ; then
         for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
                 cat $config | sed \
 		-e 's:${STAGING_LIBDIR}:${libdir}:g;' \ 
@@ -36,6 +38,7 @@ do_install_append() {
 		-e 's:${STAGING_DATADIR}:${datadir}:' \
 		-e 's:${STAGING_LIBDIR}/..:${prefix}:' > ${D}${bindir}/`basename $config`
         done
+    fi	
 
 	for lafile in `find ${D} -name *.la` ; do
 		sed -i \
@@ -45,7 +48,6 @@ do_install_append() {
 		    -e 's:${STAGING_LIBDIR}/..:${prefix}:' \
 		    $lafile
 	done	    
-
 }
 
 do_stage_append() {
-- 
cgit v1.2.3