diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-12 11:30:16 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-12 11:30:16 +0000 |
| commit | 7fc5d6eeea6c633682f4cc4759f9e9e99cb2c309 (patch) | |
| tree | 127b290374d663c062f472f5e619f5f7aa482995 | |
| parent | ba2e1f4d933c37b372d6749d64614f2510ee9d7b (diff) | |
| download | openembedded-core-7fc5d6eeea6c633682f4cc4759f9e9e99cb2c309.tar.gz openembedded-core-7fc5d6eeea6c633682f4cc4759f9e9e99cb2c309.tar.bz2 openembedded-core-7fc5d6eeea6c633682f4cc4759f9e9e99cb2c309.zip | |
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
| -rw-r--r-- | meta/classes/native.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/pkgconfig.bbclass | 21 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 1 |
3 files changed, 4 insertions, 19 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index d40a5028c9..8f2b6f3fec 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -87,3 +87,4 @@ do_install () { } PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" +PKG_CONFIG_SYSROOT_DIR = "" diff --git a/meta/classes/pkgconfig.bbclass b/meta/classes/pkgconfig.bbclass index e2751d0ef3..d65f8a6253 100644 --- a/meta/classes/pkgconfig.bbclass +++ b/meta/classes/pkgconfig.bbclass @@ -2,27 +2,10 @@ 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_DIR_HOST}${layout_prefix}:'" - s += " -e 's:OEEXECPREFIX::${STAGING_DIR_HOST}${layout_exec_prefix}:'" - return s - do_stage_append () { + install -d ${PKG_CONFIG_DIR} for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` - install -d ${PKG_CONFIG_DIR} - cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_DIR}/$pcname + cat $pc > ${PKG_CONFIG_DIR}/$pcname done } diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 90b0403d0b..ddfaeed48b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -483,6 +483,7 @@ SLOT = "0" export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${TARGET_SYS}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" |