commit 9cfca9d17ef73e31f8be0fbaf28a0f79391f4d26
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat Oct 21 10:16:28 2017 +0200
Up to 1.726.
More meson macros. Usage:
%meson \
some-options \
-Dvariable=value \
more-options \
<srcdir (use current dir mostly: .)> <builddir (like '-C builddir'
in make)>
%meson_build -C build
%meson_install -C build
%meson_test -C build
Ninja macros also adjusted.
rpm-build-macros.spec | 2 +-
rpm.macros | 26 +++++++++++++++++---------
2 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index bec7c67..3e0802a 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 1.725
+%define rpm_macros_rev 1.726
%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
diff --git a/rpm.macros b/rpm.macros
index 188b0c8..487d64b 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -35,7 +35,9 @@
%__waf /usr/bin/waf %{?_smp_mflags}
%__cmake /usr/bin/cmake
%__meson /usr/bin/meson
-%__ninja /usr/bin/ninja %{?_smp_mflags}
+%__meson_wrap_mode nodownload
+%__ninja /usr/bin/ninja
+%__ninja_common_opts -v %{?_smp_mflags}
%__gettextize { \
if grep -qs 'AM_GNU_GETTEXT.*external' configure.{ac,in} ; then \
@@ -329,25 +331,31 @@ CFLAGS="${CFLAGS:-%{rpmcflags}}" \
CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \
CXXFLAGS="${CXXFLAGS:-%{rpmcxxflags}}" \
LDFLAGS="${LDFLAGS:-%{rpmldflags}}" \
-%{__meson} \
+LC_ALL=en_GB.UTF-8 %{__meson} \
--buildtype=plain \
- --prefix=%{_prefix} \
--bindir=%{_bindir} \
- --sbindir=%{_sbindir} \
- --sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--includedir=%{_includedir} \
+ --infodir=%{_infodir} \
--libdir=%{_libdir} \
--libexecdir=%{_libexecdir} \
+ --localedir=%{_localedir} \
--localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
--mandir=%{_mandir} \
- --infodir=%{_infodir} \
- --localedir=%{_localedir} \
+ --prefix=%{_prefix} \
+ --sbindir=%{_sbindir} \
+ --sharedstatedir=%{_sharedstatedir} \
+ --sysconfdir=%{_sysconfdir} \
+ --wrap-mode=%{__meson_wrap_mode} \
}
+%meson_build %ninja_build
+%meson_install %ninja_install
+%meson_test %ninja_test
# ninja
-%ninja %{__ninja} -v
+%ninja_build %{__ninja} %{__ninja_common_opts}
+%ninja_install DESTDIR=%{buildroot} %{__ninja} install %{__ninja_common_opts}
+%ninja_test %{__ninja} test %{__ninja_common_opts}
#----------------------------------------------------------------
#%configure_cache 0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/9cfca9d17ef73e31f8be0fbaf28a0f79391f4d26
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
