Update to 1.7.2
Based on F42 packaging + extra changes to avoid some dependencies for tests which are not presented in RHEL 10 which was done in https://src.fedoraproject.org/rpms/meson/c/59d3cd3 Resolves: RHEL-127783
This commit is contained in:
Tomas Popela
parent
52e4aa283c
commit
59ebd60c68
@ -1,66 +0,0 @@
|
||||
From 91caf7aa56ba622926f7056d4a42083a75c24e5a Mon Sep 17 00:00:00 2001
|
||||
From: U2FsdGVkX1 <U2FsdGVkX1@gmail.com>
|
||||
Date: Sun, 4 Feb 2024 14:07:54 +0800
|
||||
Subject: [PATCH 1/2] Fix ninja cannot find the library when libraries contain
|
||||
symlinks.
|
||||
|
||||
---
|
||||
mesonbuild/compilers/mixins/gnu.py | 11 ++++-------
|
||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py
|
||||
index 9c0c3f290531..ef7f120f8956 100644
|
||||
--- a/mesonbuild/compilers/mixins/gnu.py
|
||||
+++ b/mesonbuild/compilers/mixins/gnu.py
|
||||
@@ -469,16 +469,13 @@ def _split_fetch_real_dirs(self, pathstr: str) -> T.List[str]:
|
||||
# paths under /lib would be considered not a "system path",
|
||||
# which is wrong and breaks things. Store everything, just to be sure.
|
||||
pobj = pathlib.Path(p)
|
||||
- unresolved = pobj.as_posix()
|
||||
if pobj.exists():
|
||||
+ resolved = pobj.resolve().as_posix()
|
||||
+ if resolved not in result:
|
||||
+ result.append(resolved)
|
||||
+ unresolved = pobj.as_posix()
|
||||
if unresolved not in result:
|
||||
result.append(unresolved)
|
||||
- try:
|
||||
- resolved = pathlib.Path(p).resolve().as_posix()
|
||||
- if resolved not in result:
|
||||
- result.append(resolved)
|
||||
- except FileNotFoundError:
|
||||
- pass
|
||||
return result
|
||||
|
||||
def get_compiler_dirs(self, env: 'Environment', name: str) -> T.List[str]:
|
||||
|
||||
From 7a60218dcaf0e11694ff1cb0531168fe576dc390 Mon Sep 17 00:00:00 2001
|
||||
From: U2FsdGVkX1 <U2FsdGVkX1@gmail.com>
|
||||
Date: Mon, 5 Feb 2024 17:24:21 +0800
|
||||
Subject: [PATCH 2/2] Turn on strict mode, as it is no longer the default since
|
||||
Python 3.6
|
||||
|
||||
---
|
||||
mesonbuild/compilers/mixins/gnu.py | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py
|
||||
index ef7f120f8956..79f271607434 100644
|
||||
--- a/mesonbuild/compilers/mixins/gnu.py
|
||||
+++ b/mesonbuild/compilers/mixins/gnu.py
|
||||
@@ -470,9 +470,12 @@ def _split_fetch_real_dirs(self, pathstr: str) -> T.List[str]:
|
||||
# which is wrong and breaks things. Store everything, just to be sure.
|
||||
pobj = pathlib.Path(p)
|
||||
if pobj.exists():
|
||||
- resolved = pobj.resolve().as_posix()
|
||||
- if resolved not in result:
|
||||
- result.append(resolved)
|
||||
+ try:
|
||||
+ resolved = pobj.resolve(True).as_posix()
|
||||
+ if resolved not in result:
|
||||
+ result.append(resolved)
|
||||
+ except FileNotFoundError:
|
||||
+ pass
|
||||
unresolved = pobj.as_posix()
|
||||
if unresolved not in result:
|
||||
result.append(unresolved)
|
||||
50
meson.spec
50
meson.spec
@ -1,12 +1,9 @@
|
||||
%global libname mesonbuild
|
||||
|
||||
# Don’t run the tests by default, since they are rather flaky.
|
||||
# I’ll get to getting them running eventually, but free time is sparse.
|
||||
# — ekulik
|
||||
%bcond_with check
|
||||
%bcond check 1
|
||||
|
||||
Name: meson
|
||||
Version: 1.4.1
|
||||
Version: 1.7.2
|
||||
Release: %autorelease
|
||||
Summary: High productivity build system
|
||||
|
||||
@ -14,9 +11,6 @@ License: Apache-2.0
|
||||
URL: https://mesonbuild.com/
|
||||
Source: https://github.com/mesonbuild/meson/releases/download/%{version_no_tilde .}/meson-%{version_no_tilde %{quote:}}.tar.gz
|
||||
|
||||
# Upstream fix for symlinks on riscv64
|
||||
Patch: https://github.com/mesonbuild/meson/commit/f233b7b98dc77937ba3448488fe7c66575c20aa6.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python3-devel
|
||||
@ -33,11 +27,15 @@ BuildRequires: gcc
|
||||
BuildRequires: libasan
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc-gfortran
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: gcc-objc
|
||||
BuildRequires: gcc-objc++
|
||||
%endif
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: libomp-devel
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: mono-core mono-devel
|
||||
%endif
|
||||
BuildRequires: rust
|
||||
# Since the build is noarch, we can't use %%ifarch
|
||||
#%%ifarch %%{ldc_arches}
|
||||
@ -45,34 +43,57 @@ BuildRequires: rust
|
||||
#%%endif
|
||||
# Various libs support
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: /usr/bin/clang-format
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: clippy
|
||||
%endif
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: gmock-devel
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
BuildRequires: qt5-linguist
|
||||
%endif
|
||||
BuildRequires: vala
|
||||
BuildRequires: python3-gobject-base
|
||||
BuildRequires: wxGTK3-devel
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: wxGTK-devel
|
||||
BuildRequires: bindgen
|
||||
%endif
|
||||
BuildRequires: binutils-gold
|
||||
BuildRequires: flex
|
||||
BuildRequires: bison
|
||||
BuildRequires: gettext
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: gnustep-base-devel
|
||||
BuildRequires: %{_bindir}/gnustep-config
|
||||
BuildRequires: /usr/bin/gnustep-config
|
||||
%endif
|
||||
BuildRequires: git-core
|
||||
BuildRequires: pkgconfig(protobuf)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: pkgconfig(glib-sharp-2.0)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: itstool
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: mercurial
|
||||
BuildRequires: gcovr
|
||||
%endif
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
BuildRequires: zlib-static
|
||||
BuildRequires: python3dist(cython)
|
||||
BuildRequires: python3dist(fastjsonschema)
|
||||
BuildRequires: pkgconfig(sdl2)
|
||||
BuildRequires: %{_bindir}/pcap-config
|
||||
BuildRequires: /usr/bin/pcap-config
|
||||
BuildRequires: pkgconfig(vulkan)
|
||||
BuildRequires: llvm-devel
|
||||
BuildRequires: cups-devel
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: /usr/bin/wx-config
|
||||
%endif
|
||||
BuildRequires: /usr/bin/sdl2-config
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -97,12 +118,9 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions/ data/shell-compl
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
# Remove Boost tests for now, because it requires Python 2
|
||||
rm -rf "test cases/frameworks/1 boost"
|
||||
# Remove MPI tests for now because it is complicated to run
|
||||
rm -rf "test cases/frameworks/17 mpi"
|
||||
export MESON_PRINT_TEST_OUTPUT=1
|
||||
%{__python3} ./run_tests.py
|
||||
%{python3} ./run_unittests.py -v
|
||||
%{python3} ./run_meson_command_tests.py -v
|
||||
%endif
|
||||
|
||||
%files
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (meson-1.4.1.tar.gz) = 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
|
||||
SHA512 (meson-1.7.2.tar.gz) = c3c71ae0e0c31d8d72e200bb5fd5e6584ce41aabe1e85575d50371f82ed02c6e346da3b0b4a2786199b9410daaa1622807a88bfc8ac991cf134bad4a53b3c863
|
||||
|
||||
Loading…
Reference in New Issue
Block a user