Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/meson-0.58.2.tar.gz
|
/meson-*.tar.gz
|
||||||
|
@ -1 +0,0 @@
|
|||||||
4058a574a8a1335102b24981d049fd82ccdb4150 SOURCES/meson-0.58.2.tar.gz
|
|
@ -1,149 +1,219 @@
|
|||||||
%global libname mesonbuild
|
* Tue Apr 26 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.62.1-1
|
||||||
|
- Update to 0.62.1
|
||||||
|
|
||||||
# Don’t run the tests by default, since they are rather flaky.
|
* Tue Mar 15 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.61.3-1
|
||||||
# I’ll get to getting them running eventually, but free time is sparse.
|
- Update to 0.61.3
|
||||||
# — ekulik
|
- Install zsh & bash completion
|
||||||
%bcond_with check
|
|
||||||
|
|
||||||
Name: meson
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.60.3-2
|
||||||
Version: 0.58.2
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
Release: 2%{?dist}
|
|
||||||
Summary: High productivity build system
|
|
||||||
|
|
||||||
License: ASL 2.0
|
* Sun Dec 26 2021 Kalev Lember <klember@redhat.com> - 0.60.3-1
|
||||||
URL: https://mesonbuild.com/
|
- Update to 0.60.3
|
||||||
Source: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz
|
|
||||||
|
|
||||||
BuildArch: noarch
|
* Mon Dec 06 2021 Kalev Lember <klember@redhat.com> - 0.60.2-1
|
||||||
|
- Update to 0.60.2
|
||||||
|
|
||||||
BuildRequires: python3-devel
|
* Fri Nov 12 2021 Neal Gompa <ngompa@fedoraproject.org> - 0.60.1-1
|
||||||
BuildRequires: python3-setuptools
|
- Update to 0.60.1
|
||||||
Requires: python%{python3_version}dist(setuptools)
|
|
||||||
Requires: ninja-build
|
|
||||||
Requires: python3-devel
|
|
||||||
|
|
||||||
%if %{with check}
|
* Thu Oct 28 2021 Kalev Lember <klember@redhat.com> - 0.59.4-1
|
||||||
BuildRequires: ninja-build
|
- Update to 0.59.4
|
||||||
# Some tests expect the unversioned executable
|
|
||||||
BuildRequires: /usr/bin/python
|
|
||||||
# Various languages
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: libasan
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: gcc-gfortran
|
|
||||||
BuildRequires: gcc-objc
|
|
||||||
BuildRequires: gcc-objc++
|
|
||||||
BuildRequires: java-devel
|
|
||||||
BuildRequires: libomp-devel
|
|
||||||
BuildRequires: mono-core mono-devel
|
|
||||||
BuildRequires: rust
|
|
||||||
# Since the build is noarch, we can't use %%ifarch
|
|
||||||
#%%ifarch %%{ldc_arches}
|
|
||||||
#BuildRequires: ldc
|
|
||||||
#%%endif
|
|
||||||
# Various libs support
|
|
||||||
BuildRequires: boost-devel
|
|
||||||
BuildRequires: gtest-devel
|
|
||||||
BuildRequires: gmock-devel
|
|
||||||
BuildRequires: qt5-qtbase-devel
|
|
||||||
BuildRequires: qt5-qtbase-private-devel
|
|
||||||
BuildRequires: qt5-linguist
|
|
||||||
BuildRequires: vala
|
|
||||||
BuildRequires: python3-gobject-base
|
|
||||||
BuildRequires: wxGTK3-devel
|
|
||||||
BuildRequires: flex
|
|
||||||
BuildRequires: bison
|
|
||||||
BuildRequires: gettext
|
|
||||||
BuildRequires: gnustep-base-devel
|
|
||||||
BuildRequires: %{_bindir}/gnustep-config
|
|
||||||
BuildRequires: git-core
|
|
||||||
BuildRequires: pkgconfig(protobuf)
|
|
||||||
BuildRequires: pkgconfig(glib-2.0)
|
|
||||||
BuildRequires: pkgconfig(glib-sharp-2.0)
|
|
||||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
|
||||||
BuildRequires: gtk-doc
|
|
||||||
BuildRequires: itstool
|
|
||||||
BuildRequires: pkgconfig(zlib)
|
|
||||||
BuildRequires: python3dist(cython)
|
|
||||||
BuildRequires: pkgconfig(sdl2)
|
|
||||||
BuildRequires: %{_bindir}/pcap-config
|
|
||||||
BuildRequires: pkgconfig(vulkan)
|
|
||||||
BuildRequires: llvm-devel
|
|
||||||
BuildRequires: cups-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
* Sat Oct 23 2021 Kalev Lember <klember@redhat.com> - 0.59.3-1
|
||||||
Meson is a build system designed to optimize programmer
|
- Update to 0.59.3
|
||||||
productivity. It aims to do this by providing simple, out-of-the-box
|
|
||||||
support for modern software development tools and practices, such as
|
|
||||||
unit tests, coverage reports, Valgrind, CCache and the like.
|
|
||||||
|
|
||||||
%prep
|
* Sat Aug 21 2021 Kalev Lember <klember@redhat.com> - 0.59.1-1
|
||||||
%autosetup -p1
|
- Update to 0.59.1
|
||||||
# Macro should not change when we are redefining bindir
|
|
||||||
sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name}
|
|
||||||
|
|
||||||
%build
|
* Tue Aug 17 2021 Adam Williamson <awilliam@redhat.com> - 0.59.0-2
|
||||||
%py3_build
|
- Backport PR #9027 to fix a bug that broke some test suites (#1994006)
|
||||||
|
|
||||||
%install
|
* Fri Jul 23 2021 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.59.0-1
|
||||||
%py3_install
|
- new version
|
||||||
install -Dpm0644 -t %{buildroot}%{rpmmacrodir} data/macros.%{name}
|
|
||||||
|
|
||||||
%if %{with check}
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.58.0-5
|
||||||
%check
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
# 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
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files
|
* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 0.58.0-4
|
||||||
%license COPYING
|
- Rebuilt for Python 3.10
|
||||||
%{_bindir}/%{name}
|
|
||||||
%{python3_sitelib}/%{libname}/
|
|
||||||
%{python3_sitelib}/%{name}-*.egg-info/
|
|
||||||
%{_mandir}/man1/%{name}.1*
|
|
||||||
%{rpmmacrodir}/macros.%{name}
|
|
||||||
%dir %{_datadir}/polkit-1
|
|
||||||
%dir %{_datadir}/polkit-1/actions
|
|
||||||
%{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
|
|
||||||
|
|
||||||
|
* Tue May 25 2021 Ondrej Holy <oholy@redhat.com> - 0.58.0-3
|
||||||
|
- Backport upstream patch to fix environment variable regression
|
||||||
|
|
||||||
%changelog
|
* Thu May 20 2021 Kalev Lember <klember@redhat.com> - 0.58.0-2
|
||||||
* Tue Nov 16 2021 Tomas Pelka <tpelka@redhat.com> - 0.58.2-2
|
- Backport upstream patch to fix gtkdoc generation
|
||||||
- Bump release and rebuild in -candidate target to fix gating issues
|
|
||||||
Resolves: rhbz#2006519
|
|
||||||
|
|
||||||
* Mon Oct 18 2021 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 0.58.2-1
|
* Wed May 05 2021 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.58.0-1
|
||||||
- Update meson to 0.58-2
|
- new version
|
||||||
Resolves: rhbz#2006519
|
|
||||||
|
|
||||||
* Tue Dec 15 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 0.55.3-3
|
* Sun Apr 11 2021 Kalev Lember <klember@redhat.com> - 0.57.2-1
|
||||||
- build: use PIE objects for static libraries
|
- Update to 0.57.2
|
||||||
Resolves: rhbz#1899620
|
|
||||||
(meson builds QEMU with PIC objects instead of PIE)
|
|
||||||
|
|
||||||
* Thu Oct 15 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 0.55.3-2
|
* Fri Mar 05 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.57.1-1
|
||||||
- Add python3-devel dependency, as asked by the BZ..
|
- Update to 0.57.1
|
||||||
- Resolves: rhbz#1872692
|
|
||||||
|
|
||||||
* Thu Oct 08 2020 Danilo de Paula <ddepaula@redhat.com> - 0.55.3-1
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.2-2
|
||||||
- Update to 0.55.3, based on upstream Fedora
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
- Resolves: rhbz#1872692
|
|
||||||
|
|
||||||
* Mon Feb 04 2019 Stephen Gallagher <sgallagh@redhat.com> - 0.49.2-1
|
* Thu Jan 21 2021 Kalev Lember <klember@redhat.com> - 0.56.2-1
|
||||||
|
- Update to 0.56.2
|
||||||
|
|
||||||
|
* Tue Nov 10 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.56.0-1
|
||||||
|
- Update to latest version (#1889242)
|
||||||
|
|
||||||
|
* Fri Nov 06 2020 Jeff Law <law@redhat.com> - 0.55.3-2
|
||||||
|
- Avoid bogus volatile in gnome modules support code caught by gcc-11
|
||||||
|
|
||||||
|
* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 0.55.3-1
|
||||||
|
- Update to 0.55.3
|
||||||
|
|
||||||
|
* Thu Sep 10 2020 Kalev Lember <klember@redhat.com> - 0.55.2-1
|
||||||
|
- Update to 0.55.2
|
||||||
|
|
||||||
|
* Thu Aug 20 2020 Kalev Lember <klember@redhat.com> - 0.55.1-1
|
||||||
|
- Update to 0.55.1
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.55.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jul 12 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.55.0-1
|
||||||
|
- Update to 0.55.0
|
||||||
|
|
||||||
|
* Mon Jul 06 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.55.0~rc2-1
|
||||||
|
- Update to 0.55.0rc2
|
||||||
|
|
||||||
|
* Fri Jul 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.55.0~rc1-1
|
||||||
|
- Update to 0.55.0rc1
|
||||||
|
|
||||||
|
* Thu Jun 18 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.54.3-2
|
||||||
|
- Use verbose mode for meson compile
|
||||||
|
|
||||||
|
* Mon Jun 15 2020 Kalev Lember <klember@redhat.com> - 0.54.3-1
|
||||||
|
- Update to 0.54.3
|
||||||
|
|
||||||
|
* Mon Jun 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.54.2-3
|
||||||
|
- Switch to meson compile / meson install
|
||||||
|
|
||||||
|
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 0.54.2-2
|
||||||
|
- Rebuilt for Python 3.9
|
||||||
|
|
||||||
|
* Fri May 15 2020 Kalev Lember <klember@redhat.com> - 0.54.2-1
|
||||||
|
- Update to 0.54.2
|
||||||
|
|
||||||
|
* Thu May 07 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.54.1-1
|
||||||
|
- Update to 0.54.1
|
||||||
|
|
||||||
|
* Mon Mar 30 2020 - Ernestas Kulik <ekulik@redhat.com> - 0.54.0-1
|
||||||
|
- Update to 0.54.0
|
||||||
|
|
||||||
|
* Sat Mar 14 2020 - Ernestas Kulik <ekulik@redhat.com> - 0.53.2-1.git88e40c7
|
||||||
|
- Update to snapshot of 0.53.2 with D fixes
|
||||||
|
|
||||||
|
* Fri Feb 07 2020 - Ernestas Kulik <ekulik@redhat.com> - 0.53.1-1
|
||||||
|
- Update to 0.53.1
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.52.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Dec 26 2019 Björn Esser <besser82@fedoraproject.org> - 0.52.1-1
|
||||||
|
- Update to 0.52.1
|
||||||
|
|
||||||
|
* Wed Oct 09 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.52.0-1
|
||||||
|
- Update to 0.52.0
|
||||||
|
|
||||||
|
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.51.2-2
|
||||||
|
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||||
|
|
||||||
|
* Mon Aug 26 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.51.2-1
|
||||||
|
- Update to 0.51.2
|
||||||
|
|
||||||
|
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 0.51.1-3
|
||||||
|
- Rebuilt for Python 3.8
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.51.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 10 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.51.1-1
|
||||||
|
- Update to 0.51.1
|
||||||
|
|
||||||
|
* Mon Jun 17 10:03:21 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.51.0-1
|
||||||
|
- Update to 0.51
|
||||||
|
|
||||||
|
* Wed Apr 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.50.1-1
|
||||||
|
- Update to 0.50.1
|
||||||
|
|
||||||
|
* Mon Apr 15 2019 Adam Williamson <awilliam@redhat.com> - 0.50.0-4
|
||||||
|
- Backport patch to revert ld binary method change (#1699099)
|
||||||
|
|
||||||
|
* Mon Apr 08 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.50.0-3
|
||||||
|
- Drop -Db_ndebug=true and just fix it instead
|
||||||
|
|
||||||
|
* Mon Mar 25 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.50.0-2
|
||||||
|
- Set -Db_ndebug=true
|
||||||
|
|
||||||
|
* Sun Mar 10 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.50.0-1
|
||||||
|
- Update to 0.50.0
|
||||||
|
|
||||||
|
* Mon Feb 04 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.49.2-1
|
||||||
- Update to 0.49.2
|
- Update to 0.49.2
|
||||||
- Drop upstreamed patch
|
|
||||||
- Resolves: rhbz#1666733
|
|
||||||
|
|
||||||
* Mon Dec 10 2018 Stephen Gallagher <sgallagh@redhat.com> - 0.45.1-3
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.49.1-2
|
||||||
- Backport patch to fix gnome.mkenums_simple() when used with file() arguments
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
* Mon Aug 13 2018 Troy Dawson <tdawson@redhat.com> - 0.45.1-2
|
* Wed Jan 23 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.49.1-1
|
||||||
- Add Requires python3-devel
|
- Update to 0.49.1
|
||||||
|
|
||||||
|
* Sun Dec 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.49.0-1
|
||||||
|
- Update to 0.49.0
|
||||||
|
|
||||||
|
* Sat Nov 17 2018 Kalev Lember <klember@redhat.com> - 0.48.2-1
|
||||||
|
- Update to 0.48.2
|
||||||
|
|
||||||
|
* Sun Oct 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.48.1-1
|
||||||
|
- Update to 0.48.1
|
||||||
|
|
||||||
|
* Wed Sep 26 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.48.0-2
|
||||||
|
- Add missing dependency on setuptools
|
||||||
|
|
||||||
|
* Tue Sep 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.48.0-1
|
||||||
|
- Update to 0.48.0
|
||||||
|
|
||||||
|
* Sat Aug 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.2-1
|
||||||
|
- Update to 0.47.2
|
||||||
|
|
||||||
|
* Wed Jul 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-5
|
||||||
|
- Backport more patches for "feature" option type
|
||||||
|
|
||||||
|
* Tue Jul 24 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-4
|
||||||
|
- Don't sneak auto-features patch yet
|
||||||
|
|
||||||
|
* Tue Jul 24 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-3
|
||||||
|
- Macros improvements
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.47.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-1
|
||||||
|
- Update to 0.47.1
|
||||||
|
|
||||||
|
* Mon Jul 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.0-1
|
||||||
|
- Update to 0.47.0
|
||||||
|
|
||||||
|
* Thu Jun 28 2018 Miro Hrončok <mhroncok@redhat.com> - 0.46.1-3
|
||||||
|
- Fix error on Python 3.7 (#1596230)
|
||||||
|
|
||||||
|
* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 0.46.1-2
|
||||||
|
- Rebuilt for Python 3.7
|
||||||
|
|
||||||
|
* Thu May 17 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.46.1-1
|
||||||
|
- Update to 0.46.1
|
||||||
|
|
||||||
|
* Fri May 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.46.0-2
|
||||||
|
- Backport upstream fixes
|
||||||
|
|
||||||
|
* Tue Apr 24 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.46.0-1
|
||||||
|
- Update to 0.46.0
|
||||||
|
|
||||||
* Wed Mar 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.45.1-1
|
* Wed Mar 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.45.1-1
|
||||||
- Update to 0.45.1
|
- Update to 0.45.1
|
66
f233b7b98dc77937ba3448488fe7c66575c20aa6.patch
Normal file
66
f233b7b98dc77937ba3448488fe7c66575c20aa6.patch
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
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)
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-10
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
122
meson.spec
Normal file
122
meson.spec
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
%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
|
||||||
|
|
||||||
|
Name: meson
|
||||||
|
Version: 1.4.1
|
||||||
|
Release: %autorelease
|
||||||
|
Summary: High productivity build system
|
||||||
|
|
||||||
|
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
|
||||||
|
BuildRequires: python3-setuptools
|
||||||
|
Requires: python%{python3_version}dist(setuptools)
|
||||||
|
Requires: ninja-build
|
||||||
|
|
||||||
|
%if %{with check}
|
||||||
|
BuildRequires: ninja-build
|
||||||
|
# Some tests expect the unversioned executable
|
||||||
|
BuildRequires: /usr/bin/python
|
||||||
|
# Various languages
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: libasan
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: gcc-gfortran
|
||||||
|
BuildRequires: gcc-objc
|
||||||
|
BuildRequires: gcc-objc++
|
||||||
|
BuildRequires: java-devel
|
||||||
|
BuildRequires: libomp-devel
|
||||||
|
BuildRequires: mono-core mono-devel
|
||||||
|
BuildRequires: rust
|
||||||
|
# Since the build is noarch, we can't use %%ifarch
|
||||||
|
#%%ifarch %%{ldc_arches}
|
||||||
|
#BuildRequires: ldc
|
||||||
|
#%%endif
|
||||||
|
# Various libs support
|
||||||
|
BuildRequires: boost-devel
|
||||||
|
BuildRequires: gtest-devel
|
||||||
|
BuildRequires: gmock-devel
|
||||||
|
BuildRequires: qt5-qtbase-devel
|
||||||
|
BuildRequires: qt5-qtbase-private-devel
|
||||||
|
BuildRequires: qt5-linguist
|
||||||
|
BuildRequires: vala
|
||||||
|
BuildRequires: python3-gobject-base
|
||||||
|
BuildRequires: wxGTK3-devel
|
||||||
|
BuildRequires: flex
|
||||||
|
BuildRequires: bison
|
||||||
|
BuildRequires: gettext
|
||||||
|
BuildRequires: gnustep-base-devel
|
||||||
|
BuildRequires: %{_bindir}/gnustep-config
|
||||||
|
BuildRequires: git-core
|
||||||
|
BuildRequires: pkgconfig(protobuf)
|
||||||
|
BuildRequires: pkgconfig(glib-2.0)
|
||||||
|
BuildRequires: pkgconfig(glib-sharp-2.0)
|
||||||
|
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||||
|
BuildRequires: gtk-doc
|
||||||
|
BuildRequires: itstool
|
||||||
|
BuildRequires: pkgconfig(zlib)
|
||||||
|
BuildRequires: zlib-static
|
||||||
|
BuildRequires: python3dist(cython)
|
||||||
|
BuildRequires: pkgconfig(sdl2)
|
||||||
|
BuildRequires: %{_bindir}/pcap-config
|
||||||
|
BuildRequires: pkgconfig(vulkan)
|
||||||
|
BuildRequires: llvm-devel
|
||||||
|
BuildRequires: cups-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description
|
||||||
|
Meson is a build system designed to optimize programmer
|
||||||
|
productivity. It aims to do this by providing simple, out-of-the-box
|
||||||
|
support for modern software development tools and practices, such as
|
||||||
|
unit tests, coverage reports, Valgrind, CCache and the like.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -p1 -n meson-%{version_no_tilde %{quote:}}
|
||||||
|
# Macro should not change when we are redefining bindir
|
||||||
|
sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name}
|
||||||
|
|
||||||
|
%build
|
||||||
|
%py3_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%py3_install
|
||||||
|
install -Dpm0644 -t %{buildroot}%{rpmmacrodir} data/macros.%{name}
|
||||||
|
install -Dpm0644 -t %{buildroot}%{_datadir}/bash-completion/completions/ data/shell-completions/bash/meson
|
||||||
|
install -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions/ data/shell-completions/zsh/_meson
|
||||||
|
|
||||||
|
%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
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files
|
||||||
|
%license COPYING
|
||||||
|
%{_bindir}/%{name}
|
||||||
|
%{python3_sitelib}/%{libname}/
|
||||||
|
%{python3_sitelib}/%{name}-*.egg-info/
|
||||||
|
%{_mandir}/man1/%{name}.1*
|
||||||
|
%{rpmmacrodir}/macros.%{name}
|
||||||
|
%dir %{_datadir}/polkit-1
|
||||||
|
%dir %{_datadir}/polkit-1/actions
|
||||||
|
%{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
|
||||||
|
%{_datadir}/bash-completion/completions/meson
|
||||||
|
%{_datadir}/zsh/site-functions/_meson
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
%autochangelog
|
32
packit.yaml
Normal file
32
packit.yaml
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
# See the documentation for more information:
|
||||||
|
# https://packit.dev/docs/configuration/
|
||||||
|
|
||||||
|
upstream_project_url: https://github.com/mesonbuild/meson
|
||||||
|
copy_upstream_release_description: false
|
||||||
|
|
||||||
|
# do not sync release candidate versions
|
||||||
|
upstream_tag_exclude: ".*rc\\d+"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
- job: pull_from_upstream
|
||||||
|
trigger: release
|
||||||
|
dist_git_branches:
|
||||||
|
- fedora-rawhide
|
||||||
|
actions:
|
||||||
|
commit-message:
|
||||||
|
- bash -c 'echo "Update to ${PACKIT_PROJECT_VERSION}"'
|
||||||
|
- bash -c '[ -z "$PACKIT_RESOLVED_BUGS" ] || echo ${PACKIT_RESOLVED_BUGS} | tr " " "\n" | sed "s/^/- Resolves /"'
|
||||||
|
- bash -c 'echo "- Upstream tag: ${PACKIT_UPSTREAM_TAG}"'
|
||||||
|
- bash -c 'echo "- Upstream commit: ${PACKIT_UPSTREAM_COMMIT}"'
|
||||||
|
|
||||||
|
|
||||||
|
- job: koji_build
|
||||||
|
trigger: commit
|
||||||
|
allowed_committers: ['packit']
|
||||||
|
dist_git_branches:
|
||||||
|
- fedora-all
|
||||||
|
|
||||||
|
- job: bodhi_update
|
||||||
|
trigger: commit
|
||||||
|
dist_git_branches:
|
||||||
|
- fedora-branched
|
Loading…
Reference in New Issue
Block a user