1.724; initial version of %meson/%ninja macros

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index e1635c4331874adbe12c611eec35cc6d4423621f..554555d3efadd4082313a65aba5acf69e97ccf3b 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,10 +1,10 @@
-%define                rpm_macros_rev  1.723
+%define                rpm_macros_rev  1.724
 %define                find_lang_rev   1.40
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
 Version:       %{rpm_macros_rev}
-Release:       4
+Release:       1
 License:       GPL
 Group:         Development/Building
 Source0:       rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 1efd2fdd0a5dbbc3388182a3ef7ffcf2f7ed4af1..de484b2e125d4e91a3539fabad84ce6dbf3945b3 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -34,6 +34,8 @@
 %__scons       /usr/bin/scons %{?_smp_mflags}
 %__waf         /usr/bin/waf %{?_smp_mflags}
 %__cmake       /usr/bin/cmake
+%__meson       /usr/bin/meson
+%__ninja       /usr/bin/ninja %{?_smp_mflags}
 
 %__gettextize { \
        if grep -qs 'AM_GNU_GETTEXT.*external' configure.{ac,in} ; then \
@@ -319,6 +321,22 @@ LINKFLAGS="%{rpmldflags}" \
 %{__waf} \
 }
 
+# meson
+%meson { \
+%{?__cc:CC="${CC:-%{__cc}}"} \
+%{?__cxx:CXX="${CXX:-%{__cxx}}"} \
+CFLAGS="${CFLAGS:-%{rpmcflags}}" \
+CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \
+CXXFLAGS="${CXXFLAGS:-%{rpmcxxflags}}" \
+LDFLAGS="${LDFLAGS:-%{rpmldflags}}" \
+%{__meson} \
+       --buildtype=plain \
+       --prefix=%{_prefix} \
+}
+
+# ninja
+%ninja %{__ninja} -v
+
 #----------------------------------------------------------------
 #%configure_cache 0
 %configure_cache_file  %{buildroot}.configure.cache