diff --git a/extra/meson/.SRCINFO b/extra/meson/.SRCINFO index fb96b2c9a..36b939b2d 100644 --- a/extra/meson/.SRCINFO +++ b/extra/meson/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = meson pkgdesc = High productivity build system - pkgver = 1.2.2 - pkgrel = 2 + pkgver = 1.2.3 + pkgrel = 1 url = https://mesonbuild.com/ arch = any license = Apache @@ -55,26 +55,24 @@ pkgbase = meson depends = ninja depends = python-tqdm depends = python-typing_extensions - source = https://github.com/mesonbuild/meson/releases/download/1.2.2/meson-1.2.2.tar.gz - source = https://github.com/mesonbuild/meson/releases/download/1.2.2/meson-1.2.2.tar.gz.asc - source = meson-reference-1.2.2.3::https://github.com/mesonbuild/meson/releases/download/1.2.2/meson-reference.3 - source = meson-reference-1.2.2.json::https://github.com/mesonbuild/meson/releases/download/1.2.2/reference_manual.json + source = https://github.com/mesonbuild/meson/releases/download/1.2.3/meson-1.2.3.tar.gz + source = https://github.com/mesonbuild/meson/releases/download/1.2.3/meson-1.2.3.tar.gz.asc + source = meson-reference-1.2.3.3::https://github.com/mesonbuild/meson/releases/download/1.2.3/meson-reference.3 + source = meson-reference-1.2.3.json::https://github.com/mesonbuild/meson/releases/download/1.2.3/reference_manual.json source = arch-meson source = cross-lib32 source = native-clang source = 0001-Skip-broken-tests.patch source = 0002-Use-C-17-for-protobuf-tests.patch - source = 0003-Revert-rust-apply-global-project-and-environment-C-a.patch validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 - b2sums = b355c8e5ab7508fca51dbe5c95eea68f91b995a670ad20eb9b7e93d3c97ad5363afe3fbd39cd554d1a6953a07166851257d16706acc9db6d5265e6452e40a857 + b2sums = 7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8 b2sums = SKIP - b2sums = 5c512645bb5017e3e28fc8fbafcc782c55c491a8a2bce7bfda77d23d6d568a449f78e9ccf78d138827c3aad8e88120357c0a65a74adf8b849bd8fa99ea60fb97 - b2sums = 698c3c7c0084639185b0869c68a769295848c229cef3a43ea4a4a5ee33e2fb9ab8f60343c6477ca27ad4c7ce9d65bcad89bce7f3ed6d2bf7cf91f71f68dd86ab + b2sums = e08aca9bb2f72276f43d52ae254a39216ba2e1fa7568d929ec9286aa341c995b207c9f82e2bcbe9f1de656d38ac7c7bbb3d97ae54aa294e341d39d2e521b842a + b2sums = a60fdc7d2fedfdd505338369d75c89dc07ae35bd563d0f3aecaed60b25982c8a9874f29e331a135363be6c145833bc0edf32ef3c2b89a563cd25906509eb86e7 b2sums = 211cee61f117fd1d582d7a613a8634f044e9e307791c4154c6da72bccd5f06856801b14bcb26157ee682b5935c48ffd2098a5fabab2232726d7758cf091c07f7 b2sums = e56c75dd9122d866e8a92381f1f8a3fa268451d13a18b73906c0089601d3e6edf28602b36f40d8a32758e9958a167a1bdccd70283581e19b2ed39863640daf95 b2sums = 7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e - b2sums = c2a1c6ea016fca855b949dba286e966404a2ce44dfc4e55542b201719ab7654c0176a97e1d5b906043ca4cd741dfd2fe3554a520116c26ceb4ba313f78548380 + b2sums = e178221d00456dcfd5b04d2df7c23a9d19108e210f834fa42350dbdc5f90206a0143178fe6e8b145ac28cd1c335b5dacac8ea408f3bf5f51aa46d46a5e77505a b2sums = c0154434fefb00aebb66b276c3b871b9ec629adc8f3c5b020a21b4662667c0bdaa2c48c6a7498d0c7ab901bb9c3911bd0bb82fbae5e5f3ae2da006e3849e0ff0 - b2sums = 623539918a5a265e521c2bff50e66a4c9d59a684131d32a8f568aa167db6feeaa21627f362bf3bd0995a46960405e9802ddacff251a8a6b85ba3da3eadeb200f pkgname = meson diff --git a/extra/meson/0001-Skip-broken-tests.patch b/extra/meson/0001-Skip-broken-tests.patch index 944e35300..0acf1cff5 100644 --- a/extra/meson/0001-Skip-broken-tests.patch +++ b/extra/meson/0001-Skip-broken-tests.patch @@ -10,11 +10,11 @@ Subject: [PATCH] Skip broken tests 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json -index 66ecd43552f6..1519155e3405 100644 +index f9d730514220..3d70077acd02 100644 --- a/test cases/frameworks/15 llvm/test.json +++ b/test cases/frameworks/15 llvm/test.json @@ -7,7 +7,6 @@ - { "val": "combination", "skip_on_jobname": ["msys2-gcc"]} + { "val": "combination", "skip_on_jobname": ["msys2"] } ], "link-static": [ - { "val": true, "skip_on_jobname": ["opensuse"] }, @@ -35,7 +35,7 @@ index f612e1d52d6d..d0e0d079a069 100644 dep = dependency('ZLIB', version : '>=1.2', method : 'cmake') diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py -index b5c9b4ee3146..089ef385f584 100644 +index 1899cb48ccc6..0f1094243a5c 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -359,6 +359,7 @@ class LinuxlikeTests(BasePlatformTests): @@ -46,7 +46,7 @@ index b5c9b4ee3146..089ef385f584 100644 testdir = os.path.join(self.framework_test_dir, '7 gnome') self.init(testdir, extra_args=['-Db_sanitize=address', '-Db_lundef=false']) -@@ -1014,6 +1015,7 @@ class LinuxlikeTests(BasePlatformTests): +@@ -1024,6 +1025,7 @@ class LinuxlikeTests(BasePlatformTests): raise SkipTest('asan not available on Cygwin') if is_openbsd(): raise SkipTest('-fsanitize=address is not supported on OpenBSD') diff --git a/extra/meson/0003-Revert-rust-apply-global-project-and-environment-C-a.patch b/extra/meson/0003-Revert-rust-apply-global-project-and-environment-C-a.patch deleted file mode 100644 index 6c98acbca..000000000 --- a/extra/meson/0003-Revert-rust-apply-global-project-and-environment-C-a.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Wed, 4 Oct 2023 21:57:36 +0200 -Subject: [PATCH] Revert "rust: apply global, project, and environment C args - to bindgen" - -Applying CFLAGS from the project (which were tested against GCC) to -bindgen (which uses Clang) breaks Mesa's build, see -https://github.com/mesonbuild/meson/issues/12326. - -This reverts commit 36210f64f22dc10d324db76bb1a7988c9cd5b14e. ---- - mesonbuild/modules/rust.py | 6 ------ - test cases/rust/12 bindgen/meson.build | 18 ------------------ - .../rust/12 bindgen/src/global-project.h | 10 ---------- - test cases/rust/12 bindgen/src/global.c | 5 ----- - test cases/rust/12 bindgen/src/global.rs | 14 -------------- - test cases/rust/12 bindgen/test.json | 5 +---- - 6 files changed, 1 insertion(+), 57 deletions(-) - delete mode 100644 test cases/rust/12 bindgen/src/global-project.h - delete mode 100644 test cases/rust/12 bindgen/src/global.c - delete mode 100644 test cases/rust/12 bindgen/src/global.rs - -diff --git a/mesonbuild/modules/rust.py b/mesonbuild/modules/rust.py -index e6e5c633ff11..3514412e65df 100644 ---- a/mesonbuild/modules/rust.py -+++ b/mesonbuild/modules/rust.py -@@ -232,12 +232,6 @@ class RustModule(ExtensionModule): - elif isinstance(s, CustomTarget): - depends.append(s) - -- clang_args.extend(state.global_args.get('c', [])) -- clang_args.extend(state.project_args.get('c', [])) -- cargs = state.get_option('args', state.subproject, lang='c') -- assert isinstance(cargs, list), 'for mypy' -- clang_args.extend(cargs) -- - if self._bindgen_bin is None: - self._bindgen_bin = state.find_program('bindgen') - -diff --git a/test cases/rust/12 bindgen/meson.build b/test cases/rust/12 bindgen/meson.build -index e7cb5f3db2c0..c05cc063136c 100644 ---- a/test cases/rust/12 bindgen/meson.build -+++ b/test cases/rust/12 bindgen/meson.build -@@ -8,9 +8,6 @@ if not prog_bindgen.found() - error('MESON_SKIP_TEST bindgen not found') - endif - --add_project_arguments('-DPROJECT_ARG', language : 'c') --add_global_arguments('-DGLOBAL_ARG', language : 'c') -- - # This seems to happen on windows when libclang.dll is not in path or is not - # valid. We must try to process a header file for this to work. - # -@@ -84,18 +81,3 @@ test('generated header', rust_bin2) - - subdir('sub') - subdir('dependencies') -- --gp = rust.bindgen( -- input : 'src/global-project.h', -- output : 'global-project.rs', --) -- --gp_lib = static_library('gp_lib', 'src/global.c') -- --gp_exe = executable( -- 'gp_exe', -- structured_sources(['src/global.rs', gp]), -- link_with : gp_lib, --) -- --test('global and project arguments', gp_exe) -diff --git a/test cases/rust/12 bindgen/src/global-project.h b/test cases/rust/12 bindgen/src/global-project.h -deleted file mode 100644 -index 6084e8ed6b0b..000000000000 ---- a/test cases/rust/12 bindgen/src/global-project.h -+++ /dev/null -@@ -1,10 +0,0 @@ --#ifndef GLOBAL_ARG --char * success(void); --#endif --#ifndef PROJECT_ARG --char * success(void); --#endif --#ifndef CMD_ARG --char * success(void); --#endif --int success(void); -diff --git a/test cases/rust/12 bindgen/src/global.c b/test cases/rust/12 bindgen/src/global.c -deleted file mode 100644 -index 10f6676f7a1b..000000000000 ---- a/test cases/rust/12 bindgen/src/global.c -+++ /dev/null -@@ -1,5 +0,0 @@ --#include "src/global-project.h" -- --int success(void) { -- return 0; --} -diff --git a/test cases/rust/12 bindgen/src/global.rs b/test cases/rust/12 bindgen/src/global.rs -deleted file mode 100644 -index 4b70b1ecc728..000000000000 ---- a/test cases/rust/12 bindgen/src/global.rs -+++ /dev/null -@@ -1,14 +0,0 @@ --// SPDX-license-identifer: Apache-2.0 --// Copyright © 2023 Intel Corporation -- --#![allow(non_upper_case_globals)] --#![allow(non_camel_case_types)] --#![allow(non_snake_case)] -- --include!("global-project.rs"); -- --fn main() { -- unsafe { -- std::process::exit(success()); -- }; --} -diff --git a/test cases/rust/12 bindgen/test.json b/test cases/rust/12 bindgen/test.json -index b3a758562969..f94ee85f9740 100644 ---- a/test cases/rust/12 bindgen/test.json -+++ b/test cases/rust/12 bindgen/test.json -@@ -1,10 +1,7 @@ - { -- "env": { -- "CFLAGS": "-DCMD_ARG" -- }, - "stdout": [ - { -- "line": "test cases/rust/12 bindgen/meson.build:30: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]." -+ "line": "test cases/rust/12 bindgen/meson.build:27: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]." - } - ] - } diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD index 9147fab5b..cd3952755 100644 --- a/extra/meson/PKGBUILD +++ b/extra/meson/PKGBUILD @@ -6,8 +6,8 @@ # - disable lto in arch-meson pkgname=meson -pkgver=1.2.2 -pkgrel=2 +pkgver=1.2.3 +pkgrel=1 pkgdesc="High productivity build system" url="https://mesonbuild.com/" arch=(any) @@ -77,18 +77,16 @@ source=( native-clang 0001-Skip-broken-tests.patch 0002-Use-C-17-for-protobuf-tests.patch - 0003-Revert-rust-apply-global-project-and-environment-C-a.patch ) -b2sums=('b355c8e5ab7508fca51dbe5c95eea68f91b995a670ad20eb9b7e93d3c97ad5363afe3fbd39cd554d1a6953a07166851257d16706acc9db6d5265e6452e40a857' +b2sums=('7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8' 'SKIP' - '5c512645bb5017e3e28fc8fbafcc782c55c491a8a2bce7bfda77d23d6d568a449f78e9ccf78d138827c3aad8e88120357c0a65a74adf8b849bd8fa99ea60fb97' - '698c3c7c0084639185b0869c68a769295848c229cef3a43ea4a4a5ee33e2fb9ab8f60343c6477ca27ad4c7ce9d65bcad89bce7f3ed6d2bf7cf91f71f68dd86ab' + 'e08aca9bb2f72276f43d52ae254a39216ba2e1fa7568d929ec9286aa341c995b207c9f82e2bcbe9f1de656d38ac7c7bbb3d97ae54aa294e341d39d2e521b842a' + 'a60fdc7d2fedfdd505338369d75c89dc07ae35bd563d0f3aecaed60b25982c8a9874f29e331a135363be6c145833bc0edf32ef3c2b89a563cd25906509eb86e7' '211cee61f117fd1d582d7a613a8634f044e9e307791c4154c6da72bccd5f06856801b14bcb26157ee682b5935c48ffd2098a5fabab2232726d7758cf091c07f7' 'e56c75dd9122d866e8a92381f1f8a3fa268451d13a18b73906c0089601d3e6edf28602b36f40d8a32758e9958a167a1bdccd70283581e19b2ed39863640daf95' '7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e' - 'c2a1c6ea016fca855b949dba286e966404a2ce44dfc4e55542b201719ab7654c0176a97e1d5b906043ca4cd741dfd2fe3554a520116c26ceb4ba313f78548380' - 'c0154434fefb00aebb66b276c3b871b9ec629adc8f3c5b020a21b4662667c0bdaa2c48c6a7498d0c7ab901bb9c3911bd0bb82fbae5e5f3ae2da006e3849e0ff0' - '623539918a5a265e521c2bff50e66a4c9d59a684131d32a8f568aa167db6feeaa21627f362bf3bd0995a46960405e9802ddacff251a8a6b85ba3da3eadeb200f') + 'e178221d00456dcfd5b04d2df7c23a9d19108e210f834fa42350dbdc5f90206a0143178fe6e8b145ac28cd1c335b5dacac8ea408f3bf5f51aa46d46a5e77505a' + 'c0154434fefb00aebb66b276c3b871b9ec629adc8f3c5b020a21b4662667c0bdaa2c48c6a7498d0c7ab901bb9c3911bd0bb82fbae5e5f3ae2da006e3849e0ff0') validpgpkeys=( 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen ) @@ -99,10 +97,6 @@ prepare() { # Pass tests patch -Np1 -i ../0001-Skip-broken-tests.patch patch -Np1 -i ../0002-Use-C-17-for-protobuf-tests.patch - - # Unbreak Mesa build - # https://github.com/mesonbuild/meson/issues/12326 - patch -Np1 -i ../0003-Revert-rust-apply-global-project-and-environment-C-a.patch } build() {