[packages/meson] - pld-ize rpm macros, rel 3

baggins baggins at pld-linux.org
Mon Feb 3 19:14:00 CET 2025


commit ae243799a84dd579ff16f0b8a311462dedff1c92
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Feb 3 19:53:03 2025 +0100

    - pld-ize rpm macros, rel 3

 meson.spec           |  4 +++-
 rpm-macros-pld.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/meson.spec b/meson.spec
index de1e94f..f6dae33 100644
--- a/meson.spec
+++ b/meson.spec
@@ -2,7 +2,7 @@ Summary:	High productivity build system
 Summary(pl.UTF-8):	System budowania o dużej produktywności
 Name:		meson
 Version:	1.6.1
-Release:	2
+Release:	3
 License:	Apache v2.0
 Group:		Development/Tools
 #Source0Download: https://github.com/mesonbuild/meson/releases/
@@ -11,6 +11,7 @@ Source0:	https://github.com/mesonbuild/meson/releases/download/%{version}/%{name
 Patch0:		%{name}-gtkdocdir.patch
 Patch1:		rust-proc-macro-filter-out-target.patch
 Patch2:		allow-arm-on-arm64.patch
+Patch3:		rpm-macros-pld.patch
 URL:		https://mesonbuild.com/
 BuildRequires:	ninja >= 1.8.2
 BuildRequires:	python3 >= 1:3.7
@@ -58,6 +59,7 @@ Mesona.
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1 -R
+%patch -P3 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
 	meson.py
diff --git a/rpm-macros-pld.patch b/rpm-macros-pld.patch
new file mode 100644
index 0000000..71300e6
--- /dev/null
+++ b/rpm-macros-pld.patch
@@ -0,0 +1,26 @@
+--- meson-1.6.1/data/macros.meson.orig	2024-12-16 21:34:40.000000000 +0100
++++ meson-1.6.1/data/macros.meson	2025-02-03 19:49:15.223330453 +0100
+@@ -22,13 +22,14 @@
+         --sharedstatedir=%{_sharedstatedir} \
+         --wrap-mode=%{__meson_wrap_mode} \
+         --auto-features=%{__meson_auto_features} \
++        --default-library=both \
+         %{_vpath_srcdir} %{_vpath_builddir} \
+         %{nil}}
+ 
+ %meson_build \
+     %{shrink:%{__meson} compile \
+         -C %{_vpath_builddir} \
+-        -j %{_smp_build_ncpus} \
++        %{?_smp_mflags}
+         %{?__meson_verbose:--verbose} \
+         %{nil}}
+ 
+@@ -42,6 +43,6 @@
+ %meson_test \
+     %{shrink:%{__meson} test \
+         -C %{_vpath_builddir} \
+-        --num-processes %{_smp_build_ncpus} \
++        %{?_smp_mflags}
+         --print-errorlogs \
+         %{nil}}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meson.git/commitdiff/ae243799a84dd579ff16f0b8a311462dedff1c92



More information about the pld-cvs-commit mailing list