Accepting request 1115539 from devel:tools:building

- Add 0007-Revert-rust-apply-global-project-and-environment-C-a.patch: Revert upstream commit (gh#mesonbuild/meson#12326). (forwarded request 1115538 from dimstar) OBS-URL: https://build.opensuse.org/request/show/1115539 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=100
2023-10-05 18:02:20 +00:00 · 2023-10-05 18:02:20 +00:00 · 014035a8bb
commit 014035a8bb
parent 586067b8c3 d50fd86e19
8 changed files with 201 additions and 44 deletions
--- a/0007-Revert-rust-apply-global-project-and-environment-C-a.patch
+++ b/0007-Revert-rust-apply-global-project-and-environment-C-a.patch
@ -0,0 +1,141 @@
+From 9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 3 Oct 2023 16:52:56 +0100
+Subject: [PATCH 7/7] Revert "rust: apply global, project, and environment C
+ args to bindgen"
+
+This reverts commit 36210f64f22dc10d324db76bb1a7988c9cd5b14e.
+
+This ended up not doing what was intended - see https://github.com/mesonbuild/meson/issues/12065#issuecomment-1742263677.
+
+Bug: https://bugs.gentoo.org/914989
+Bug: https://bugs.gentoo.org/915014
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ 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 e6e5c633f..3514412e6 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 e7cb5f3db..c05cc0631 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 6084e8ed6..000000000
+--- 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 10f6676f7..000000000
+--- 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 4b70b1ecc..000000000
+--- 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 b3a758562..f94ee85f9 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]."
+     }
+   ]
+ }
+-- 
+2.42.0
+
--- a/get_llvm_tool_names-llvm17.patch
+++ b/get_llvm_tool_names-llvm17.patch
@ -1,22 +0,0 @@
-From d0b09898c703f6c10ec5a6b2aeace0df2e3570aa Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 23 Sep 2023 17:21:43 +0200
-Subject: [PATCH] get_llvm_tool_names: add llvm 17
-
-this fixes the "frameworks: 15 llvm" tests with llvm 17
---
- mesonbuild/environment.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 53cb1206fef..5c7d78b9028 100644
--- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -157,6 +157,7 @@ def get_llvm_tool_names(tool: str) -> T.List[str]:
-     # unless it becomes a stable release.
-     suffixes = [
-         '', # base (no suffix)
-+        '-17',  '17',
-         '-16',  '16',
-         '-15',  '15',
-         '-14',  '14',
--- a/meson-1.2.1.tar.gz
+++ b/meson-1.2.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1db3a153087549497ee52b1c938d2134e0338214fe14f7efd16fecd57b639f5
-size 2182126
--- a/meson-1.2.1.tar.gz.asc
+++ b/meson-1.2.1.tar.gz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmTRhO0ACgkQwk5jG6ux
-/nAhGg/9EI0RSiqodhwX90X92D5LGm9e6AFjfpo7wTJ36us1fVlW4JY16QQWUIJD
-/MXWy7+KZQFdqZzyEdGU8IvB5z1Lx/qOXJlb7TUZ7P41UR555afeodTIjc2MFn9R
-0ps6uAN8RH17CJJfTPWTe7VUZdrJUio2dh1QznI5dyyZ+9RNg2Za/qksQ86v//Vj
-KhBDiMvVjPc+p1+cWjhXL5Nq9eE14VlCBZ4EseCc6Sfu42HnFozTwDiIlhG8XsTy
-Mqzd1LCpOeAIslU4D8q+8nzY7DntrLHA6JhEaaOQX34ygESCK+cdGPO3vHbcQx0v
-CrLvrDRvDCkRPqtwC/3fZr1SDWaRP27bDePt+DW88KPYjcMw7mwLO8saOE/96Yi3
-boos4ia4OFc1xcuvhVBtDg+HXb3Mi4lkbrdIABfC6h/FGhqnEtfaV+MLIXja30ph
-Uw9XEgE7uN6TPpNRCjjeFOyQwPA/xoQ82Dnrys/Wuwsd3UIhLjzZrvvZcnTHghCZ
-tmuD2HUuLNmNC8tZ5JDE/vG1djMNtE4Aj95PVg8F4qcuacjSS8CGVX+eVVkxMOqh
-C+u25yAkjFQqqnWye1WI2EGlGQQ8n5Bg4EUYlgqbYTdN2hxka71f7c23nBcRSMhF
-DXddnkJoCmE50qKmPadV9EHmDNJ4pkIYk4eJMag1zbnaudHlGWs=
-=t/Mx
-----END PGP SIGNATURE-----
--- a/meson-1.2.2.tar.gz
+++ b/meson-1.2.2.tar.gz
--- a/meson-1.2.2.tar.gz.asc
+++ b/meson-1.2.2.tar.gz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmUWn/oACgkQwk5jG6ux
+/nDSZA//Yu372PjppqIJ0JXyS6krSFD6huPLo40SE0dKKbrDs1EUdhZp8DI8Dpz8
+kGKZtNuYrFZk6Fnp0B8HBt8FeJptxLeNutsJ/y92cwiMYWbLliC6Go9/bCptbqPk
+P23KfmpBDF4D3qu7iZvLZJKoDQVgl+U2o1W8jrqA8ymyCApP79DhxExGnQ492gV2
+XCZwnMm7LkOkf+PplkfnMDjKmRVGzIiq4t830CVLJ3JT8qDO4/Ka6Dhf0wj7lGDJ
+pJzQ7NypiIO/GaxM9erq9zoU7kpplXP73yL4zCvd3WeNcBUFFovcXOp1Wj2Io+h+
+1QFfzEk9d2nKfi1ibv1ury9BJi+6NSKKtmEjL8NetyMCGjhM1+XPmQlqp/xebQ0q
+3Ak57qcjXtUAXkZ7h0SSCUokKgBMauD7PHhYhl4EDpTJqcfQK4a69Fuznnz1DLpD
+h+8ZuhA4cAyDhCTZpMsMskk9oUcB6llAPbOP9s5uTOEU8IvEw6RCEpJ6bXLptovP
+SLXiFrOoRW0wtjMW6iuCLNUh2NotRn8JtMDrQLkARBbDfsBVv/RNrI8yZcKRj9+U
+06bWF3UAO8xkRJVyDa7RYcU2rNuLgY7zOenJd9z8i5/Z/lRDBheOlvx8XPlbZPz/
+EoSaK1QTLPMvr7tDwZl2gWREszEfgMLNzruW+0LnCFDdwFSeWi4=
+=Ewma
+-----END PGP SIGNATURE-----
--- a/meson.changes
+++ b/meson.changes
@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Wed Oct  4 07:30:44 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add
+  0007-Revert-rust-apply-global-project-and-environment-C-a.patch:
+  Revert upstream commit (gh#mesonbuild/meson#12326).
+
+-------------------------------------------------------------------
+Mon Oct  2 01:02:34 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
+
+- Update to version 1.2.2:
+  + ninja backend: fix the automatic restat of outputs when
+    reconfiguring.
+  + Fix completely broken support for static: true with
+    dependency('cuda').
+  + Use cudart_static by default in dependency('cuda').
+  + gnome:
+    - Fix crash in gtkdoc and generate_gir in C++ projects.
+    - Fix glib tool lookup consistency.
+  + compilers: fix compiler detection when the "ccache" string is
+    in the path.
+  + Fix crash when installing a vala library and python sources.
+  + Fix bug with openssl when cmake is missing.
+  + msubprojects: Speedup subproject_dir extraction.
+  + Allow unit test to parse testcase blocks.
+  + Fix assertion raised with invalid option name.
+  + rust:
+    - properly rematerialize static dependencies as well as dynamic
+      ones.
+    - apply global, project, and environment C args to bindgen.
+  + get_llvm_tool_names: add llvm 17.
+  + openmp: add 5.1/5.2, fixes openmp with llvm v17.
+  + Fix bug where all java builds & tests fail to run SanityCheck
+    on JDK11.
+  + Add support for sw_64 CPU family.
+- Drop merged upstream patch: get_llvm_tool_names-llvm17.patch.
+
 -------------------------------------------------------------------
 Sat Sep 23 20:58:26 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>

--- a/meson.spec
+++ b/meson.spec
@ -35,7 +35,7 @@
 %bcond_with     setuptools
 %bcond_without  mono
 Name:           meson%{name_ext}
-Version:        1.2.1
+Version:        1.2.2
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@ -50,8 +50,9 @@ Patch0:         meson-test-installed-bin.patch
 Patch1:         extend-test-timeout-on-qemu-builds.patch
 # PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available
 Patch2:         meson-distutils.patch
-# PATCH-FIX-UPSTREAM get_llvm_tool_names-llvm17.patch -- Accept LLVM 17.
-Patch3:         get_llvm_tool_names-llvm17.patch
+# PATCH-FIX-UPSTREAM 0007-Revert-rust-apply-global-project-and-environment-C-a.patch gh#mesonbuild/meson#12326 -- Fix Mesa build
+Patch3:         0007-Revert-rust-apply-global-project-and-environment-C-a.patch
+
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros