diff options
Diffstat (limited to 'poky/meta/recipes-devtools/meson')
-rw-r--r-- | poky/meta/recipes-devtools/meson/meson.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 2 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch | 6 | ||||
-rwxr-xr-x | poky/meta/recipes-devtools/meson/meson/meson-setup.py | 10 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/meson/meson_0.56.2.bb (renamed from poky/meta/recipes-devtools/meson/meson_0.56.0.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb (renamed from poky/meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb) | 3 |
6 files changed, 14 insertions, 9 deletions
diff --git a/poky/meta/recipes-devtools/meson/meson.inc b/poky/meta/recipes-devtools/meson/meson.inc index 2d3adbdb1..d0ebec991 100644 --- a/poky/meta/recipes-devtools/meson/meson.inc +++ b/poky/meta/recipes-devtools/meson/meson.inc @@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ " -SRC_URI[sha256sum] = "291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213" +SRC_URI[sha256sum] = "3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 3438e6a2f..ec4ecfef5 100644 --- a/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 110a525e5ebed2fca138d72da493c39510311c1f Mon Sep 17 00:00:00 2001 +From 248d17b7221e7ebc9d84154eac11ae4ebb5189ab Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal diff --git a/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 5c16cf501..8fcea08c7 100644 --- a/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From 38f59e256f760aa959c13f4c5713f87ff7addee5 Mon Sep 17 00:00:00 2001 +From 3c0d3d1a32d4a66aa0b7ab9af3e975243855a1db Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <pkj@axis.com> Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again @@ -13,10 +13,10 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index d1be65b..90f3573 100644 +index 5ba3a1a..0bf4969 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -36,6 +36,7 @@ _T = T.TypeVar('_T') +@@ -38,6 +38,7 @@ _T = T.TypeVar('_T') known_cpu_families = ( diff --git a/poky/meta/recipes-devtools/meson/meson/meson-setup.py b/poky/meta/recipes-devtools/meson/meson/meson-setup.py index 808e2a062..7ac4e3ad4 100755 --- a/poky/meta/recipes-devtools/meson/meson/meson-setup.py +++ b/poky/meta/recipes-devtools/meson/meson/meson-setup.py @@ -10,9 +10,13 @@ class Template(string.Template): class Environ(): def __getitem__(self, name): val = os.environ[name] - val = ["'%s'" % x for x in val.split()] - val = ', '.join(val) - val = '[%s]' % val + val = val.split() + if len(val) > 1: + val = ["'%s'" % x for x in val] + val = ', '.join(val) + val = '[%s]' % val + elif val: + val = "'%s'" % val.pop() return val try: diff --git a/poky/meta/recipes-devtools/meson/meson_0.56.0.bb b/poky/meta/recipes-devtools/meson/meson_0.56.2.bb index de9b905c1..de9b905c1 100644 --- a/poky/meta/recipes-devtools/meson/meson_0.56.0.bb +++ b/poky/meta/recipes-devtools/meson/meson_0.56.2.bb diff --git a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb index 67add2c25..8778cab12 100644 --- a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb +++ b/poky/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" @@ -40,6 +40,7 @@ c_args = @CFLAGS c_link_args = @LDFLAGS cpp_args = @CPPFLAGS cpp_link_args = @LDFLAGS +sys_root = @OECORE_TARGET_SYSROOT [host_machine] system = '${SDK_OS}' |