summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-12 11:30:16 (GMT)
committerRichard Purdie <richard@openedhand.com>2007-11-12 11:30:16 (GMT)
commit7fc5d6eeea6c633682f4cc4759f9e9e99cb2c309 (patch)
tree127b290374d663c062f472f5e619f5f7aa482995 /meta
parentba2e1f4d933c37b372d6749d64614f2510ee9d7b (diff)
downloadpoky-7fc5d6eeea6c633682f4cc4759f9e9e99cb2c309.tar.gz
pkgconfig: Switch to using sysroot simplifying pkgconfig files. Requires a full rebuild.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3125 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/native.bbclass1
-rw-r--r--meta/classes/pkgconfig.bbclass21
-rw-r--r--meta/conf/bitbake.conf1
3 files changed, 4 insertions, 19 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index d40a502..8f2b6f3 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -87,3 +87,4 @@ do_install () {
87} 87}
88 88
89PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" 89PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
90PKG_CONFIG_SYSROOT_DIR = ""
diff --git a/meta/classes/pkgconfig.bbclass b/meta/classes/pkgconfig.bbclass
index e2751d0..d65f8a6 100644
--- a/meta/classes/pkgconfig.bbclass
+++ b/meta/classes/pkgconfig.bbclass
@@ -2,27 +2,10 @@ inherit base
2 2
3DEPENDS_prepend = "pkgconfig-native " 3DEPENDS_prepend = "pkgconfig-native "
4 4
5# The namespaces can clash here hence the two step replace
6def get_pkgconfig_mangle(d):
7 import bb.data
8 s = "-e ''"
9 if not bb.data.inherits_class('native', d):
10 s += " -e 's:=${libdir}:=OELIBDIR:;'"
11 s += " -e 's:=${includedir}:=OEINCDIR:;'"
12 s += " -e 's:=${datadir}:=OEDATADIR:'"
13 s += " -e 's:=${prefix}:=OEPREFIX:'"
14 s += " -e 's:=${exec_prefix}:=OEEXECPREFIX:'"
15 s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
16 s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
17 s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
18 s += " -e 's:OEPREFIX::${STAGING_DIR_HOST}${layout_prefix}:'"
19 s += " -e 's:OEEXECPREFIX::${STAGING_DIR_HOST}${layout_exec_prefix}:'"
20 return s
21
22do_stage_append () { 5do_stage_append () {
6 install -d ${PKG_CONFIG_DIR}
23 for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do 7 for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
24 pcname=`basename $pc` 8 pcname=`basename $pc`
25 install -d ${PKG_CONFIG_DIR} 9 cat $pc > ${PKG_CONFIG_DIR}/$pcname
26 cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_DIR}/$pcname
27 done 10 done
28} 11}
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 90b0403..ddfaeed 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -483,6 +483,7 @@ SLOT = "0"
483 483
484export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" 484export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig"
485export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" 485export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
486export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${TARGET_SYS}"
486export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" 487export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
487 488
488export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" 489export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake"