209c74e
From 314e5bcb7a26dec4f9eb2a5915ba2dffe3aba405 Mon Sep 17 00:00:00 2001
7692299
From: Igor Raits <i.gnatenko.brain@gmail.com>
7692299
Date: Mon, 15 Jun 2020 19:36:47 +0200
209c74e
Subject: [PATCH 2/3] macros.meson: Switch to meson compile / install
7692299
7692299
Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
209c74e
(cherry picked from commit 0a61f511aa1960ac0d3f9b5e50e35f5f603b99b7)
7692299
---
7692299
 data/macros.meson | 12 +++++++++---
7692299
 1 file changed, 9 insertions(+), 3 deletions(-)
7692299
7692299
diff --git a/data/macros.meson b/data/macros.meson
7692299
index 25601aad3..8a66c9657 100644
7692299
--- a/data/macros.meson
7692299
+++ b/data/macros.meson
7692299
@@ -22,13 +22,19 @@
7692299
         --wrap-mode=%{__meson_wrap_mode} \
7692299
         --auto-features=%{__meson_auto_features} \
7692299
         %{_vpath_srcdir} %{_vpath_builddir} \
7692299
-	%{nil}}
7692299
+        %{nil}}
7692299
 
7692299
 %meson_build \
7692299
-    %ninja_build -C %{_vpath_builddir}
7692299
+    %{shrink:%{__meson} compile \
7692299
+        -C %{_vpath_builddir} \
7692299
+        -j %{_smp_build_ncpus} \
7692299
+        %{nil}}
7692299
 
7692299
 %meson_install \
7692299
-    %ninja_install -C %{_vpath_builddir}
7692299
+    %{shrink:DESTDIR=%{buildroot} %{__meson} install \
7692299
+        -C %{_vpath_builddir} \
7692299
+        --no-rebuild \
7692299
+        %{nil}}
7692299
 
7692299
 %meson_test \
7692299
     %{shrink:%{__meson} test \
7692299
-- 
7692299
2.27.0
7692299