summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Dziendzielski <tomasz.dziendzielski@gmail.com>2021-01-24 10:55:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-27 10:17:45 +0000
commita2a34451c933ce0084c5f59dba6c125b9d32eb6a (patch)
treec61f86f4df6a224b056e6cb0ca750c98a4052c00
parent9fa87066bb36ad895ac78b3d40564f83aa7f0d73 (diff)
downloadpoky-a2a34451c933ce0084c5f59dba6c125b9d32eb6a.tar.gz
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 <tomasz.dziendzielski@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.32.bb2
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb2
-rw-r--r--meta/recipes-devtools/qemu/qemu-native.inc4
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
14# 14#
15AUTOTOOLS_SCRIPT_PATH = "${S}/localedef" 15AUTOTOOLS_SCRIPT_PATH = "${S}/localedef"
16 16
17inherit native
18inherit autotools 17inherit autotools
18inherit native
19 19
20FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" 20FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
21 21
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 @@
1include meson.inc 1include meson.inc
2 2
3inherit nativesdk
4inherit siteinfo 3inherit siteinfo
4inherit nativesdk
5 5
6SRC_URI += "file://meson-setup.py \ 6SRC_URI += "file://meson-setup.py \
7 file://meson-wrapper" 7 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 @@
1inherit native
2
3require qemu.inc 1require qemu.inc
4 2
3inherit native
4
5EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" 5EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'"
6 6
7LDFLAGS_append = " -fuse-ld=bfd" 7LDFLAGS_append = " -fuse-ld=bfd"