From 7fc5d6eeea6c633682f4cc4759f9e9e99cb2c309 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 12 Nov 2007 11:30:16 +0000 Subject: 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 --- meta/classes/pkgconfig.bbclass | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'meta/classes/pkgconfig.bbclass') 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 } -- cgit v1.2.3-54-g00ecf