[packages/rpm-build-macros] 1.724; initial version of %meson/%ninja macros

[atler]

commit f72d45c480d57de5802d8280d622aa27cab71e8f
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jul 25 00:59:41 2017 +0200

    1.724; initial version of %meson/%ninja macros

 rpm-build-macros.spec |  4 ++--
 rpm.macros            | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index e1635c4..554555d 100644
--- 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 1efd2fd..de484b2 100644
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/f72d45c480d57de5802d8280d622aa27cab71e8f