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