summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/meson/meson.inc7
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch2
-rw-r--r--meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch28
-rw-r--r--meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch2
-rw-r--r--meta/recipes-devtools/meson/meson_0.57.2.bb (renamed from meta/recipes-devtools/meson/meson_0.57.1.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb)0
6 files changed, 3 insertions, 36 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index e186dede92..10e7d8a1ce 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -14,20 +14,15 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
14 file://disable-rpath-handling.patch \ 14 file://disable-rpath-handling.patch \
15 file://cross-prop-default.patch \ 15 file://cross-prop-default.patch \
16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ 16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
17 file://0001-minstall-Correctly-set-uid-gid-of-installed-files.patch \
18 file://gi-target-dep.patch \ 17 file://gi-target-dep.patch \
19 " 18 "
20SRC_URI[sha256sum] = "72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6" 19SRC_URI[sha256sum] = "3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"
21 20
22SRC_URI_append_class-native = " \ 21SRC_URI_append_class-native = " \
23 file://0001-Make-CPU-family-warnings-fatal.patch \ 22 file://0001-Make-CPU-family-warnings-fatal.patch \
24 file://0002-Support-building-allarch-recipes-again.patch \ 23 file://0002-Support-building-allarch-recipes-again.patch \
25" 24"
26 25
27# remove at next version upgrade or when output changes
28PR = "r1"
29HASHEQUIV_HASH_VERSION .= ".1"
30
31UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" 26UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
32UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar" 27UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
33 28
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 0808891a27..300797f9ee 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 @@
1From 76934bcbf2cfa7304e8864e28c51f58adda0392f Mon Sep 17 00:00:00 2001 1From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 3 Jul 2018 13:59:09 +0100 3Date: Tue, 3 Jul 2018 13:59:09 +0100
4Subject: [PATCH] Make CPU family warnings fatal 4Subject: [PATCH] Make CPU family warnings fatal
diff --git a/meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch b/meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch
deleted file mode 100644
index d55b7cc7c7..0000000000
--- a/meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 3f6f4964dc79ae986f44afe1687922381f237edd Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Wed, 3 Mar 2021 12:47:28 +0100
4Subject: [PATCH] minstall: Correctly set uid/gid of installed files
5
6In commit caab4d3d, the uid and gid arguments passed to os.chown() by
7set_chown() were accidentally swapped, causing files to end up with
8incorrect owner/group if the owner and group are not the same.
9
10Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/6226ac26ef63335bfb817db02b3f295c78214a82]
11Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
12---
13 mesonbuild/minstall.py | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
17index 785ff5869..07da408aa 100644
18--- a/mesonbuild/minstall.py
19+++ b/mesonbuild/minstall.py
20@@ -148,7 +148,7 @@ def set_chown(path: str, user: T.Optional[str] = None, group: T.Optional[str] =
21 Use a real function rather than a lambda to help mypy out. Also real
22 functions are faster.
23 """
24- real_os_chown(path, gid, uid, dir_fd=dir_fd, follow_symlinks=follow_symlinks)
25+ real_os_chown(path, uid, gid, dir_fd=dir_fd, follow_symlinks=follow_symlinks)
26
27 try:
28 os.chown = chown
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index ddc34c2f49..f6175a194c 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,4 +1,4 @@
1From 6efb6114836fd4a1e012aa03b37f3beeeb22b466 Mon Sep 17 00:00:00 2001 1From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com> 2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Thu, 26 Jul 2018 16:32:49 +0200 3Date: Thu, 26 Jul 2018 16:32:49 +0200
4Subject: [PATCH] Support building allarch recipes again 4Subject: [PATCH] Support building allarch recipes again
diff --git a/meta/recipes-devtools/meson/meson_0.57.1.bb b/meta/recipes-devtools/meson/meson_0.57.2.bb
index de9b905c12..de9b905c12 100644
--- a/meta/recipes-devtools/meson/meson_0.57.1.bb
+++ b/meta/recipes-devtools/meson/meson_0.57.2.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
index 8778cab124..8778cab124 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb