summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-03-26 22:34:17 -0700
committerKhem Raj <raj.khem@gmail.com>2021-03-28 12:12:58 -0700
commitcf7af7942753b5f6a3881e05a7ec4d9967ec3624 (patch)
treea2402aa267b6db3b4deedc71a10da042c68d686f
parent8ac832ceb9a99792ef7cb7ed0cee6d87ca09ae48 (diff)
downloadmeta-openembedded-cf7af7942753b5f6a3881e05a7ec4d9967ec3624.tar.gz
gnome-settings-daemon: Do not generate meson.native
OE-core now uses native-file instead of environment variables so its not needed Fixes ERROR: Multiple producers for Ninja target "TOPDIR/build/tmpfs/work/armv7vet2hf-neon-yoe-linux-gnueabi/gnome-settings-daemon/3.36.1-r0/meson.native". Please rename your targets. Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Andreas Müller <schnitzeltony@gmail.com> Cc: Ross Burton <ross.burton@arm.com>
-rw-r--r--meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb9
1 files changed, 0 insertions, 9 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb
index e14891a236..a532ae7494 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb
@@ -29,15 +29,6 @@ SRC_URI[archive.sha256sum] = "3e33dbd319b562a5ab602dcab6de3ca81b85f8346672e90ec6
29 29
30UNKNOWN_CONFIGURE_WHITELIST = "introspection" 30UNKNOWN_CONFIGURE_WHITELIST = "introspection"
31 31
32# allow cross build mixed with build of native tools
33do_write_config_append() {
34 cat >${WORKDIR}/meson.native <<EOF
35[binaries]
36pkgconfig = 'pkg-config-native'
37EOF
38}
39EXTRA_OEMESON = "--native-file ${WORKDIR}/meson.native"
40
41PACKAGECONFIG ??= " \ 32PACKAGECONFIG ??= " \
42 cups nm \ 33 cups nm \
43 alsa gudev \ 34 alsa gudev \