pool/meson
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1098647 from GNOME:Next

Browse Source 
- Be leaner with the build deps:
  + Do not buildrequire python-pip and -wheel: being part of ring0
    we have to be extra careful.
  + Use python_build/python_install instead of
    pyproject_wheel/pyproject_install.

OBS-URL: https://build.opensuse.org/request/show/1098647
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=252
This commit is contained in:
Dominique Leuenberger 2023-07-14 10:04:47 +00:00 committed by Git OBS Bridge
parent 37308b9c8b
commit a86c3422a5
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meson.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jul 14 10:01:09 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Be leaner with the build deps:
+ Do not buildrequire python-pip and -wheel: being part of ring0
we have to be extra careful.
+ Use python_build/python_install instead of
pyproject_wheel/pyproject_install.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 29 07:26:32 UTC 2023 - Andreas Schneider <asn@cryptomilk.org> Thu Jun 29 07:26:32 UTC 2023 - Andreas Schneider <asn@cryptomilk.org>

14
meson.spec
View File

@ -50,8 +50,6 @@ Patch0: meson-test-installed-bin.patch
Patch1: extend-test-timeout-on-qemu-builds.patch Patch1: extend-test-timeout-on-qemu-builds.patch
# PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available # PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available
Patch2: meson-distutils.patch Patch2: meson-distutils.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
%if %{with setuptools} %if %{with setuptools}
@ -198,7 +196,7 @@ rm -rf test\ cases/failing/85\ gtest\ dependency\ with\ version
%build %build
%if %{without test} %if %{without test}
%pyproject_wheel %python_build
%else %else
# Ensure we have no mesonbuild / meson in CWD, thus guaranteeing we use meson in $PATH # Ensure we have no mesonbuild / meson in CWD, thus guaranteeing we use meson in $PATH
rm -r meson.py mesonbuild rm -r meson.py mesonbuild
@ -207,8 +205,7 @@ rm -r meson.py mesonbuild
%install %install
# If this is the test suite, we don't need anything else but the meson package # If this is the test suite, we don't need anything else but the meson package
%if %{without test} %if %{without test}
%pyproject_install %python_install
%fdupes %{buildroot}%{python_sitelib}
install -Dpm 0644 data/macros.meson \ install -Dpm 0644 data/macros.meson \
%{buildroot}%{_rpmconfigdir}/macros.d/macros.meson %{buildroot}%{_rpmconfigdir}/macros.d/macros.meson
@ -230,7 +227,12 @@ import sys
sys.exit(main()) sys.exit(main())
""" > %{buildroot}%{_bindir}/%{name} """ > %{buildroot}%{_bindir}/%{name}
chmod +x %{buildroot}%{_bindir}/%{name} chmod +x %{buildroot}%{_bindir}/%{name}
%{python_expand %{$python_fix_shebang}} %{python_expand %{$python_fix_shebang}
# ensure egg-info is a directory
rm %{buildroot}%{$python_sitelib}/*.egg-info
cp -r meson.egg-info %{buildroot}%{$python_sitelib}/meson-%{version}-py%{$python_version}.egg-info
}
# Fix missing data files with distutils # Fix missing data files with distutils
while read line; do while read line; do