From a2a34451c933ce0084c5f59dba6c125b9d32eb6a Mon Sep 17 00:00:00 2001 From: Tomasz Dziendzielski Date: Sun, 24 Jan 2021 10:55:46 +0100 Subject: meta: Fix native inheritance order in recipes Classes native/nativesdk should be inherited last to prevent unexpected behaviour. See [YOCTO #5729] for details. (From OE-Core rev: 217a8974765693192cbead51ebd9845a383ef7cc) Signed-off-by: Tomasz Dziendzielski Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/cross-localedef-native_2.32.bb | 2 +- meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.32.bb b/meta/recipes-core/glibc/cross-localedef-native_2.32.bb index 5a0abbb70f..ec59c6ba10 100644 --- a/meta/recipes-core/glibc/cross-localedef-native_2.32.bb +++ b/meta/recipes-core/glibc/cross-localedef-native_2.32.bb @@ -14,8 +14,8 @@ require glibc-version.inc # AUTOTOOLS_SCRIPT_PATH = "${S}/localedef" -inherit native inherit autotools +inherit native FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb index 7fdc4c86d9..8778cab124 100644 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb @@ -1,7 +1,7 @@ include meson.inc -inherit nativesdk inherit siteinfo +inherit nativesdk SRC_URI += "file://meson-setup.py \ file://meson-wrapper" diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index aa5c9b9a72..54e49d8bc6 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -1,7 +1,7 @@ -inherit native - require qemu.inc +inherit native + EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" LDFLAGS_append = " -fuse-ld=bfd" -- cgit v1.2.3-54-g00ecf