diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
| commit | 98cc5cd6483975b64d80e8323f7f659dd1337d75 (patch) | |
| tree | 5fa64e93d57396bc4c76aa3537156205b4b424ac /poky/meta/classes/cml1.bbclass | |
| parent | 82dbc15a05125a812c140a3c8cff81c366482229 (diff) | |
| parent | 8fc454f9beebdd347403145c991697019a593cff (diff) | |
| download | openbmc-98cc5cd6483975b64d80e8323f7f659dd1337d75.tar.xz | |
Merge tag '0.29' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/classes/cml1.bbclass')
| -rw-r--r-- | poky/meta/classes/cml1.bbclass | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/poky/meta/classes/cml1.bbclass b/poky/meta/classes/cml1.bbclass index 9b9866f4c..d319d66ab 100644 --- a/poky/meta/classes/cml1.bbclass +++ b/poky/meta/classes/cml1.bbclass @@ -40,6 +40,14 @@ python do_menuconfig() { except OSError: mtime = 0 + # setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native) + d.setVar("PKG_CONFIG_DIR", "${STAGING_DIR_NATIVE}${libdir_native}/pkgconfig") + d.setVar("PKG_CONFIG_PATH", "${PKG_CONFIG_DIR}:${STAGING_DATADIR_NATIVE}/pkgconfig") + d.setVar("PKG_CONFIG_LIBDIR", "${PKG_CONFIG_DIR}") + d.setVarFlag("PKG_CONFIG_SYSROOT_DIR", "unexport", "1") + # ensure that environment variables are overwritten with this tasks 'd' values + d.appendVar("OE_TERMINAL_EXPORTS", " PKG_CONFIG_DIR PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR") + oe_terminal("sh -c \"make %s; if [ \\$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"" % d.getVar('KCONFIG_CONFIG_COMMAND'), d.getVar('PN') + ' Configuration', d) |