diff options
| -rw-r--r-- | meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/meson/meson_1.5.2.bb (renamed from meta/recipes-devtools/meson/meson_1.5.1.bb) | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 04abb8b314..b272fd45b0 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 33bc81d5a262e0fa1a346ac1667a3679a17c0997 Mon Sep 17 00:00:00 2001 | 1 | From 13e05ca933a572c1caf93372df808a30976f99cd Mon Sep 17 00:00:00 2001 |
| 2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
| 3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 | 3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 |
| 4 | Subject: [PATCH] Make CPU family warnings fatal | 4 | Subject: [PATCH] Make CPU family warnings fatal |
| @@ -26,10 +26,10 @@ index 86bad9b..9703315 100644 | |||
| 26 | endian = literal['endian'] | 26 | endian = literal['endian'] |
| 27 | if endian not in ('little', 'big'): | 27 | if endian not in ('little', 'big'): |
| 28 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 28 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
| 29 | index 5bccb90..6aa4b15 100644 | 29 | index 484ef45..cf4a3ba 100644 |
| 30 | --- a/mesonbuild/environment.py | 30 | --- a/mesonbuild/environment.py |
| 31 | +++ b/mesonbuild/environment.py | 31 | +++ b/mesonbuild/environment.py |
| 32 | @@ -387,10 +387,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: | 32 | @@ -389,10 +389,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: |
| 33 | if compilers and not any_compiler_has_define(compilers, '__mips64'): | 33 | if compilers and not any_compiler_has_define(compilers, '__mips64'): |
| 34 | trial = 'mips' | 34 | trial = 'mips' |
| 35 | 35 | ||
diff --git a/meta/recipes-devtools/meson/meson_1.5.1.bb b/meta/recipes-devtools/meson/meson_1.5.2.bb index 4f68a22fa9..beb1751e6f 100644 --- a/meta/recipes-devtools/meson/meson_1.5.1.bb +++ b/meta/recipes-devtools/meson/meson_1.5.2.bb | |||
| @@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ | |||
| 15 | file://0001-Make-CPU-family-warnings-fatal.patch \ | 15 | file://0001-Make-CPU-family-warnings-fatal.patch \ |
| 16 | file://0002-Support-building-allarch-recipes-again.patch \ | 16 | file://0002-Support-building-allarch-recipes-again.patch \ |
| 17 | " | 17 | " |
| 18 | SRC_URI[sha256sum] = "567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed" | 18 | SRC_URI[sha256sum] = "f955e09ab0d71ef180ae85df65991d58ed8430323de7d77a37e11c9ea630910b" |
| 19 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" | 19 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" |
| 20 | 20 | ||
| 21 | inherit python_setuptools_build_meta github-releases | 21 | inherit python_setuptools_build_meta github-releases |
