Patchwork cross: Update PKG_CONFIG variables after recent changes

login
register
mail settings
Submitter Richard Purdie
Date May 1, 2014, 2:41 p.m.
Message ID <1398955272.30460.82.camel@ted>
Download mbox | patch
Permalink /patch/71363/
State Accepted
Commit 53ea37413dd834f8a39d2e83fef1901c8bac7f40
Headers show

Comments

Richard Purdie - May 1, 2014, 2:41 p.m.
The PKG_CONFIG definitions should now more closely match those from native.bbclass.
We can't use ${libdir} here since it contains the target arch prefix.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index a8f3b60..28fd211 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -21,8 +21,8 @@  STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
 
 PACKAGE_ARCH = "${BUILD_ARCH}"
 
-export PKG_CONFIG_DIR = "${STAGING_DIR}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${libdir}/pkgconfig"
-export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
+export PKG_CONFIG_DIR = "${exec_prefix}/lib/pkgconfig"
+export PKG_CONFIG_SYSROOT_DIR = ""
 
 CPPFLAGS = "${BUILD_CPPFLAGS}"
 CFLAGS = "${BUILD_CFLAGS}"