diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/conf/multilib.conf')
| -rw-r--r-- | import-layers/yocto-poky/meta/conf/multilib.conf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/import-layers/yocto-poky/meta/conf/multilib.conf b/import-layers/yocto-poky/meta/conf/multilib.conf index 1403a034a..e74dec81a 100644 --- a/import-layers/yocto-poky/meta/conf/multilib.conf +++ b/import-layers/yocto-poky/meta/conf/multilib.conf @@ -1,14 +1,14 @@ -baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or d.getVar('BASELIB', True)}" +baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" MULTILIBS ??= "multilib:lib32" -STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" -STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" -PKGDATA_DIR = "${STAGING_DIR}/${MACHINE}/pkgdata" +STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" +STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" +RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" INHERIT += "multilib_global" @@ -23,6 +23,6 @@ OPKG_ARGS_append = " --force-maintainer --force-overwrite" # 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" -PKG_CONFIG_PATH[vardepsexclude] = "MACHINE datadir STAGING_DIR" -PKG_CONFIG_PATH[vardepvalueexclude] = ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig" +PKG_CONFIG_PATH .= ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" +PKG_CONFIG_PATH[vardepsexclude] = "datadir WORKDIR" +PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" |