Sync from SUSE:SLFO:Main meson revision 1471df765e63caa5a14ff9cc625183e1
This commit is contained in:
parent
edfa4882d3
commit
9dd3c8895c
@ -1,141 +0,0 @@
|
||||
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
|
||||
|
BIN
meson-1.2.2.tar.gz
(Stored with Git LFS)
BIN
meson-1.2.2.tar.gz
(Stored with Git LFS)
Binary file not shown.
@ -1,16 +0,0 @@
|
||||
-----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-----
|
BIN
meson-1.6.0.tar.gz
(Stored with Git LFS)
Normal file
BIN
meson-1.6.0.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
16
meson-1.6.0.tar.gz.asc
Normal file
16
meson-1.6.0.tar.gz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmcVUvAACgkQwk5jG6ux
|
||||
/nAxlw/9FujH49x68WLJb/vjBBQrA5GOGBy9Qt2iet559auLySqlWNr5PGWDNlRo
|
||||
2rvdCC0NfJOQkqgHqDpGE8+f0MxL670AHyDYxfwXb3NxR+bCzxSbr/isYeei0Ejq
|
||||
0GlbpuViZH3gC/pWWrkbcdgBbewk8g3CfdWcywUkrSPh5LGv+NFE7thMd5K/+w2h
|
||||
ePDS87s2NUxOProX+kTav6yMcS8vnRFUpg6AY/UIODVNbAs/fqy4a53m+kF4C1+1
|
||||
z70UGug3x4tRnmPNiUZ9yV0S/HWrrPNWifq/4neB8PNjrRWbzkgsYyuIQkS6sPD2
|
||||
z0ZnccTb3l0le/6r+sCJqA/LGPK/hji6uP3YUxPy+FrdCm2Lhq7zVsT0By0VsmcO
|
||||
heJeNx83rZDZjY+aTL3KHKTU5H83xK3MCwgbv9rzFytY+AzNrLpKQ9Iv5eUo4jgN
|
||||
HMabygqyKY2FQEVCmHPAKyA5PyW/qWNkft2fRuxvEl1f7sf51jqaYlvNyIwolnGB
|
||||
eN3uaY99X/FWGgkl4zIIMQDZ6UUlrfYZJwpZ6m9m/0euT7auSBTcxJE+IQz+LTMC
|
||||
ysfBpsMblYR0gu5epwBQTY10N6DpfEXEs8SKalWhM5zu0TDfwgmJ4Yrd5sxA0ri4
|
||||
wcyy1mjc5n/mHZL91uJKOmXknQzDms6ohWhVYD0ZOPXLvZj56/A=
|
||||
=Ga7S
|
||||
-----END PGP SIGNATURE-----
|
255
meson.changes
255
meson.changes
@ -1,3 +1,251 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 21 06:52:57 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update ro version 1.6.0:
|
||||
+ Support for OpenXL compiler in AIX.
|
||||
+ Default to printing deprecations when no minimum version is
|
||||
specified.
|
||||
+ Cargo subprojects is experimental.
|
||||
+ Dependencies from CMake subprojects now use only PUBLIC link
|
||||
flags.
|
||||
+ New built-in option for default both_libraries.
|
||||
+ New as_static and as_shared methods on internal dependencies.
|
||||
+ Support for DIA SDK.
|
||||
+ Support for LLVM-based flang compiler.
|
||||
+ nvc and nvc++ now support setting std.
|
||||
+ Tools can be selected when calling has_tools() on the Qt
|
||||
modules.
|
||||
+ Simple tool to test build reproducibility.
|
||||
+ Support for variable in system dependencies.
|
||||
+ test() and benchmark() functions accept new types.
|
||||
+ Zig 0.11 can be used as a C/C++ compiler frontend.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 23 06:03:36 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.5.2:
|
||||
+ compilers: do not strip '-isystem' from C build arguments.
|
||||
+ Prevent raw exception during project().
|
||||
+ compilers: Pass mode to determine_args, not its string value.
|
||||
+ nasm: Use different test sources for x86 and x86_64.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 19 11:34:30 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- BuildRequire gettext-devel instead of gettext: allow OBS to
|
||||
shortcut through gettext-runtime-mini.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jul 27 20:50:09 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- Update to version 1.5.1:
|
||||
+ Bug fixes for ARM build and cross-compilation
|
||||
+ rust: recursively pull proc-macro deps for rust targets
|
||||
+ fix gnome.compile_resources() install: true and no install_dir
|
||||
+ test suite fixes and bug fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jul 20 07:02:57 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- Update to version 1.5.0:
|
||||
+ Support for bztar in meson dist
|
||||
+ Cargo dependencies names now include the API version
|
||||
+ Added support Cargo.lock file
|
||||
+ Meson now propagates its build type to CMake
|
||||
+ compiler.run() method is now available for all languages
|
||||
+ dependencies created by compiler.find_library implement the
|
||||
name() method
|
||||
+ New version_argument kwarg for find_program
|
||||
+ Meson configure handles changes to options in more cases
|
||||
+ New meson format command
|
||||
+ Added support for GCC's null_terminated_string_arg function
|
||||
attribute
|
||||
+ A new dependency for ObjFW is now supported
|
||||
+ Support of indexed @PLAINNAME@ and @BASENAME@
|
||||
+ Required kwarg on more compiler methods
|
||||
+ The Meson test program supports a new "--interactive" argument
|
||||
+ meson test now sets the MESON_TEST_ITERATION environment
|
||||
variable
|
||||
+ The Meson test program supports a new "--max-lines" argument
|
||||
+ Basic support for TI Arm Clang (tiarmclang)
|
||||
+ Support for Texas Instruments C6000 C/C++ compiler
|
||||
+ Wayland stable protocols can be versioned
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 11 16:36:11 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- Update to version 1.4.2:
|
||||
+ cuda: avoid test failure without GPU available
|
||||
+ BUG: Use an F77 snippet for sanity testing Fortran
|
||||
+ compilers: cpp: fix header name and return value use in header
|
||||
check
|
||||
+ nasm: Add -mms-bitfields to the list of ignored flags
|
||||
+ limit wrapped-due-to-env special case for env to only apply for
|
||||
env.set
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 3 11:16:52 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.4.1:
|
||||
+ compilers: cpp: improve libc++ vs libstdc++ detection (again).
|
||||
+ compilers: cpp: reduce macro pollution for stdlib macros.
|
||||
+ Fix builds with Ninja 12 and remove a 5 year old workaround.
|
||||
+ rust: Fix warning_level=everything case.
|
||||
+ environment: fix LLVM 18 support in get_llvm_tool_names().
|
||||
- Drop get_llvm_tool_names-llvm18.patch and
|
||||
compatibility-ninja-1.12.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 2 16:53:21 UTC 2024 - Christoph G <foss@grueninger.de>
|
||||
|
||||
- Add compatibility-ninja-1.12.patch from upstream to restore
|
||||
compatibility with latest Ninja release, back-ported to 1.4.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 15 10:35:55 UTC 2024 - Yifan Jiang <yfjiang@suse.com>
|
||||
|
||||
- Set the latest supported gcc13 to build meson:test on SLE/Leap.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 13 07:29:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.4.0:
|
||||
+ Added support for build_tgt, custom_tgt, and custom_idx to
|
||||
certain FS module functions.
|
||||
+ Meson now reads the project version of cmake subprojects.
|
||||
+ ndebug setting now controls C++ stdlib assertions.
|
||||
+ stldebug gains Clang support.
|
||||
+ New unset() method on environment objects.
|
||||
+ File object now has full_path() method.
|
||||
+ New numpy custom dependency.
|
||||
+ depends kwarg now supported by compiler.preprocess().
|
||||
+ Added preserve_paths keyword argument to qt module functions.
|
||||
+ Bindgen will now use Meson's heuristic for what is a C++
|
||||
header.
|
||||
+ Overriding bindgen language setting.
|
||||
+ Bindgen now uses the same C/C++ std as the project as a whole.
|
||||
+ Tests now abort on errors by default under more sanitizers.
|
||||
+ Use custom_target as test executable.
|
||||
+ Support for Texas Instruments C6000 C/C++ compiler.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 12 12:33:04 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.4.0rc2:
|
||||
Changelog to follow with final release.
|
||||
- Rebase get_llvm_tool_names-llvm18.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 12 12:32:53 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.4.0rc1:
|
||||
Changelog to follow with final release.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 11 22:48:56 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
|
||||
|
||||
- Add get_llvm_tool_names-llvm18.patch to accept LLVM 18.1.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 14 07:42:56 UTC 2024 - ecsos <ecsos@opensuse.org>
|
||||
|
||||
- Update to version 1.3.2:
|
||||
Changelog see:
|
||||
https://github.com/mesonbuild/meson/compare/1.3.1...1.3.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 4 16:37:38 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.3.1:
|
||||
+ Make the Requires.private line in generated .pkgconfig files
|
||||
reproducible.
|
||||
+ Always use posix paths when retrieving link name.
|
||||
+ dependencies/llvm: strip default include dirs also for
|
||||
config-tool version.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 12 01:47:37 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
|
||||
|
||||
- Make BuildRequires libstdc++6-devel-gcc11 more precise, for
|
||||
SLE 15 SP4 and SLE 15 SP5 only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 11 10:31:25 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
|
||||
|
||||
- Specify clang and llvm versions in SLE/Leap.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 11 10:25:14 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
|
||||
|
||||
- Fix shebang replacement for ninja test cases. The curly brackets
|
||||
are necessary for the macro expansion in the splitted lines
|
||||
worked correctly.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 27 14:29:20 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 14 15:18:10 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.3.0:
|
||||
+ Clarify of implicitly-included headers in C-like compiler
|
||||
checks.
|
||||
+ Treat warnings as error in compiler checks.
|
||||
+ Compilers now have a has_define method.
|
||||
+ configure_file() now has a macro_name parameter.
|
||||
+ c_std and cpp_std options now accepts a list of values.
|
||||
+ More meaningful description of many generative tasks.
|
||||
+ Deprecate 'jar' as a build_target type.
|
||||
+ generator.process() gains 'env' keyword argument.
|
||||
+ Target names for executables now take into account suffixes.
|
||||
+ Executable gains vs_module_defs keyword.
|
||||
+ find_program() now supports the 'default_options' argument.
|
||||
+ Added follow_symlinks arg to install_data, install_header, and
|
||||
install_subdir.
|
||||
+ Added 'fill' kwarg to int.to_string().
|
||||
+ Added 'json' output_format to configure_file().
|
||||
+ @GLOBAL_SOURCE_ROOT@ and @DIRNAME@ in machine files.
|
||||
+ clang-tidy-fix target.
|
||||
+ Meson compile command now accepts suffixes for TARGET.
|
||||
+ New environment variable MESON_PACKAGE_CACHE_DIR.
|
||||
+ Update options with meson setup <builddir> -Dopt=value.
|
||||
+ Clear persistent cache with meson setup --clearcache.
|
||||
+ pkg-config dependencies can now get a variable with multiple
|
||||
replacements.
|
||||
+ Machine files: pkgconfig field deprecated and replaced by
|
||||
pkg-config.
|
||||
+ Support targeting Python's limited C API.
|
||||
+ All compiler has_* methods support the required keyword.
|
||||
+ Deprecated rust_crate_type and replaced by rust_abi.
|
||||
+ Tests now abort on errors by default under sanitizers.
|
||||
+ <lang>_(shared|static)_args for both_library, library, and
|
||||
build_target.
|
||||
+ -j shorthand for --num-processes.
|
||||
+ Unified message(), str.format() and f-string formatting.
|
||||
+ Subprojects excluded from scan-build reports.
|
||||
+ vs_module_defs keyword now supports indexes of custom_target.
|
||||
+ Automatic fallback to cmake and cargo subproject
|
||||
- BuildRequire clang-tools to run the test suite: new dependency.
|
||||
- Run test suite only on x86_64.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 23 09:17:22 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.2.3:
|
||||
+ Allow share/cmake/ as cmake_prefix_path.
|
||||
+ find_tool: don't assume the pkgconfig variable is a valid
|
||||
command.
|
||||
+ python dependency: ensure that setuptools doesn't inject
|
||||
itself into distutils.
|
||||
+ Allow c++23 in gcc-11.
|
||||
+ Revert "rust: apply global, project, and environment C args to
|
||||
bindgen".
|
||||
- Drop
|
||||
0007-Revert-rust-apply-global-project-and-environment-C-a.patch:
|
||||
fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 4 07:30:44 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
@ -152,6 +400,13 @@ Sat Feb 25 16:14:07 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
+ clang-cl (13) now accepts cpp_std=c++20
|
||||
+ a sizable collection of bug fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 16 01:36:31 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
|
||||
|
||||
- Add BuildRequires libstdc++6-devel-gcc11 for SLE 15 SP4 and
|
||||
version above, which is necessary to make clang-tiny unit test
|
||||
run.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 5 04:43:00 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
|
||||
|
||||
|
60
meson.spec
60
meson.spec
@ -1,7 +1,8 @@
|
||||
#
|
||||
# spec file
|
||||
# spec file for package meson
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -35,7 +36,7 @@
|
||||
%bcond_with setuptools
|
||||
%bcond_without mono
|
||||
Name: meson%{name_ext}
|
||||
Version: 1.2.2
|
||||
Version: 1.6.0
|
||||
Release: 0
|
||||
Summary: Python-based build system
|
||||
License: Apache-2.0
|
||||
@ -50,8 +51,6 @@ 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 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
|
||||
@ -67,25 +66,30 @@ Provides: meson-gui = %{version}
|
||||
Obsoletes: meson-gui < %{version}
|
||||
BuildArch: noarch
|
||||
%else
|
||||
ExclusiveArch: %{ix86} x86_64
|
||||
ExclusiveArch: x86_64
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: bison
|
||||
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
|
||||
BuildRequires: clang17
|
||||
%else
|
||||
BuildRequires: clang >= 15
|
||||
%endif
|
||||
BuildRequires: clang-tools >= 15
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: distribution-release
|
||||
BuildRequires: flex
|
||||
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
|
||||
BuildRequires: gcc12-c++
|
||||
BuildRequires: gcc12-fortran
|
||||
BuildRequires: gcc12-obj-c++
|
||||
BuildRequires: gcc12-objc
|
||||
BuildRequires: gcc13-c++
|
||||
BuildRequires: gcc13-fortran
|
||||
BuildRequires: gcc13-obj-c++
|
||||
BuildRequires: gcc13-objc
|
||||
%else
|
||||
BuildRequires: gcc-c++ >= 12
|
||||
BuildRequires: gcc-fortran >= 12
|
||||
BuildRequires: gcc-obj-c++ >= 12
|
||||
BuildRequires: gcc-objc >= 12
|
||||
%endif
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: git
|
||||
BuildRequires: gmock
|
||||
BuildRequires: gnustep-make
|
||||
@ -98,6 +102,8 @@ BuildRequires: libboost_python3-devel
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module gobject}
|
||||
BuildRequires: %{python_module pytest-xdist}
|
||||
BuildRequires: libboost_python3-devel
|
||||
BuildRequires: libboost_regex-devel
|
||||
BuildRequires: libboost_system-devel
|
||||
BuildRequires: libboost_test-devel
|
||||
BuildRequires: libboost_thread-devel
|
||||
@ -105,8 +111,15 @@ BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: libqt5-qtbase-common-devel
|
||||
BuildRequires: libqt5-qtbase-private-headers-devel
|
||||
%if 0%{?sle_version} == 150400 || 0%{?sle_version} == 150500
|
||||
BuildRequires: libstdc++6-devel-gcc11
|
||||
%endif
|
||||
BuildRequires: libwmf-devel
|
||||
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
|
||||
BuildRequires: llvm17-devel
|
||||
%else
|
||||
BuildRequires: llvm-devel
|
||||
%endif
|
||||
BuildRequires: meson = %{version}
|
||||
BuildRequires: ninja
|
||||
BuildRequires: pkgconfig
|
||||
@ -169,13 +182,12 @@ This package provides meson.build syntax highlighting support for
|
||||
Vim/NeoVim.
|
||||
|
||||
%prep
|
||||
%setup -q -n meson-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%autosetup -N -n meson-%{version}
|
||||
%patch -P 0 -p1
|
||||
%patch -P 1 -p1
|
||||
%if !%{with setuptools}
|
||||
%patch2 -p1
|
||||
%patch -P 2 -p1
|
||||
%endif
|
||||
%patch3 -p1
|
||||
|
||||
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
|
||||
# AddressSanitizer fails here because of ulimit.
|
||||
@ -253,19 +265,19 @@ done < meson.egg-info/SOURCES.txt
|
||||
%check
|
||||
|
||||
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
|
||||
# Use gcc-12 for clang-tidy
|
||||
# Use gcc-13 for clang-tidy
|
||||
install -d -m 0755 bin
|
||||
ln -s /usr/bin/cpp-12 bin/cpp
|
||||
ln -s /usr/bin/g++-12 bin/c++
|
||||
ln -s /usr/bin/g++-12 bin/g++
|
||||
ln -s /usr/bin/gcc-12 bin/cc
|
||||
ln -s /usr/bin/gcc-12 bin/gcc
|
||||
ln -s /usr/bin/cpp-13 bin/cpp
|
||||
ln -s /usr/bin/g++-13 bin/c++
|
||||
ln -s /usr/bin/g++-13 bin/g++
|
||||
ln -s /usr/bin/gcc-13 bin/cc
|
||||
ln -s /usr/bin/gcc-13 bin/gcc
|
||||
export PATH="${PWD}/bin:${PATH}"
|
||||
c++ --version
|
||||
|
||||
# Fix shebang in test cases getting executed by ninja
|
||||
%python_expand find test\ cases -type f -name "*.py" \
|
||||
-exec sed -i "1s@#!.*python.*@#!$(realpath %{_bindir}/$python)@" {} +
|
||||
%{python_expand find test\ cases -type f -name "*.py" \
|
||||
-exec sed -i "1s@#!.*python.*@#!$(realpath %{_bindir}/$python)@" {} +}
|
||||
%endif
|
||||
|
||||
export LANG=C.UTF-8
|
||||
|
Loading…
Reference in New Issue
Block a user