diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-08-20 16:04:02 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-24 23:46:53 +0100 |
| commit | a044db9527f2182918745260c914e71a3cb3f3a5 (patch) | |
| tree | e31f1b0499e364c65961db73e268ce97bb4ab909 /meta/conf/multilib.conf | |
| parent | a3d228a484cf471e999b6537987e2897d8a7bd4e (diff) | |
| download | openembedded-core-contrib-a044db9527f2182918745260c914e71a3cb3f3a5.tar.gz | |
multilib: let pkg-config find architecture-independent .pc files
If a multilib package depends on an allarch recipe that installs an
architecture-independent .pc file it will not be able to find the .pc file as
the recipe gets installed into the MACHINE sysroot but pkg-config looks in the
MLPREFIX-prefixed sysroot.
Solve this by extending PKG_CONFIG_PATH in multilib environments to include the
architecture-independent path in the MACHINE sysroot
(sysroots/MACHINE/usr/share/pkgconfig/).
(From OE-Core rev: 6a6dd4eb53dbf8a0c31ac2d68af5befebe727596)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/multilib.conf')
| -rw-r--r-- | meta/conf/multilib.conf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 37e8481112..89a8e9096f 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -17,3 +17,10 @@ BBCLASSEXTEND_append = " ${MULTILIBS}" MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" OPKG_ARGS_append = " --force-maintainer --force-overwrite" + +# When multilib is enabled, allarch recipes will be installed into the MACHINE +# sysroot, not MLPREFIXMACHINE. This means that anything using pkg-config to +# find an allarch pkgconfig file will fail as the PKG_CONFIG_PATH only looks +# inside the multilib sysroot. Fix this by explicitly adding the MACHINE's +# architecture-independent pkgconfig location to PKG_CONFIG_PATH. +PKG_CONFIG_PATH .= ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig" |