diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/conf/multilib.conf | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/conf/multilib.conf')
-rw-r--r-- | poky/meta/conf/multilib.conf | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/poky/meta/conf/multilib.conf b/poky/meta/conf/multilib.conf new file mode 100644 index 000000000..e74dec81a --- /dev/null +++ b/poky/meta/conf/multilib.conf @@ -0,0 +1,28 @@ + +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 = "${WORKDIR}/${MLPREFIX}recipe-sysroot" +STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" +RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" + +INHERIT += "multilib_global" + +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 .= ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" +PKG_CONFIG_PATH[vardepsexclude] = "datadir WORKDIR" +PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" |