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
This commit is contained in:
parent
ba2e1f4d93
commit
7fc5d6eeea
|
@ -87,3 +87,4 @@ do_install () {
|
|||
}
|
||||
|
||||
PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
|
||||
PKG_CONFIG_SYSROOT_DIR = ""
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue