From a780643c4b6aa11e1a36965a69df7116477c7b4c Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Tue, 7 Dec 2004 22:05:47 +0000
Subject: Merge oe-devel@oe-devel.bkbits.net:packages.bb into
 handhelds.org:/home/kergoth/code/packages.bb

2004/12/07 04:58:25-06:00 ti.com!kergoth
More updates per the core rename.

2004/12/07 04:46:51-06:00 ti.com!kergoth
Update soundtracker per the core rename.

2004/12/07 04:44:14-06:00 ti.com!kergoth
Merge

2004/12/07 04:42:38-06:00 ti.com!kergoth
Updates per the recent rename of the oe core from 'oe' to 'bitbake'.

BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw
---
 classes/pkgconfig.bbclass | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 classes/pkgconfig.bbclass

(limited to 'classes/pkgconfig.bbclass')

diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3


From a2b1be8430c236be3708ac8f9c5e3a1ff48ead33 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 2 Mar 2005 14:04:55 +0000
Subject: binconfig.bbclass/pkgconfig.bbclass: Make pattern matching more
 restrictive so oe works within /usr

BKrev: 4225c807EQAZ6gSzTcAR8RuS2aIW1Q
---
 classes/pkgconfig.bbclass | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'classes/pkgconfig.bbclass')

diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index e69de29bb2..e89e827fc8 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -0,0 +1,28 @@
+inherit base
+
+DEPENDS_prepend = "pkgconfig-native "
+
+# The namespaces can clash here hence the two step replace
+def get_pkgconfig_mangle(d):
+	import bb.data
+	s = "-e ''"
+	if not bb.data.inherits_class('native', d):
+		s += " -e 's:=${libdir}:=OELIBDIR:;'"
+		s += " -e 's:=${includedir}:=OEINCDIR:;'"
+		s += " -e 's:=${datadir}:=OEDATADIR:'"
+		s += " -e 's:=${prefix}:=OEPREFIX:'"
+		s += " -e 's:=${exec_prefix}:=OEEXECPREFIX:'"
+		s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
+		s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
+		s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
+		s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'"
+		s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
+	return s
+
+do_stage_append () {
+	for pc in `find ${S} -name '*.pc'`; do
+		pcname=`basename $pc`
+		install -d ${PKG_CONFIG_PATH}
+		cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname
+	done
+}
-- 
cgit v1.2.3


From 6e9bdb5645934ee9bc90a63f2a9386403f02676e Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 28 Aug 2005 16:29:19 +0000
Subject: pkgconfig.bbclass: don't install *-uninstalled.pc files into the
 staging area

---
 classes/pkgconfig.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/pkgconfig.bbclass')

diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index e89e827fc8..3f3a44eb2b 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -20,7 +20,7 @@ def get_pkgconfig_mangle(d):
 	return s
 
 do_stage_append () {
-	for pc in `find ${S} -name '*.pc'`; do
+	for pc in `find ${S} -name '*.pc' | grep -v '-uninstalled.pc$'`; do
 		pcname=`basename $pc`
 		install -d ${PKG_CONFIG_PATH}
 		cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname
-- 
cgit v1.2.3


From 13683265b3e3dd0fc62d42fa89360c27fca4bc89 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 29 Aug 2005 09:35:24 +0000
Subject: pkgconfig.bbclass: Fix bug causing failure.

---
 classes/pkgconfig.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/pkgconfig.bbclass')

diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index 3f3a44eb2b..62f15f312d 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -20,7 +20,7 @@ def get_pkgconfig_mangle(d):
 	return s
 
 do_stage_append () {
-	for pc in `find ${S} -name '*.pc' | grep -v '-uninstalled.pc$'`; do
+	for pc in `find ${S} -name '*.pc' | grep -v -- '-uninstalled.pc$'`; do
 		pcname=`basename $pc`
 		install -d ${PKG_CONFIG_PATH}
 		cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname
-- 
cgit v1.2.3