[PATCHv2] ninja: Update to 1.9.0

Stefan Schantl stefan.schantl at ipfire.org
Fri Jun 21 12:29:50 BST 2019


* Also add macro file for pakfire.

Signed-off-by: Stefan Schantl <stefan.schantl at ipfire.org>
---
 ninja/ninja.macro | 21 +++++++++++++++++++++
 ninja/ninja.nm    |  8 +++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 ninja/ninja.macro

diff --git a/ninja/ninja.macro b/ninja/ninja.macro
new file mode 100644
index 000000000..8d2d0c75c
--- /dev/null
+++ b/ninja/ninja.macro
@@ -0,0 +1,21 @@
+#
+# ninja-build macros
+#
+
+
+__ninja = %{bindir}/ninja
+__ninja_common_opts = -v %{PARALLELISMFLAGS}
+
+ninja_build = \
+	%{__ninja} \
+	%{__ninja_common_opts}
+
+ninja_install = \
+	DESTDIR=%{BUILDROOT} \
+	%{__ninja} install \
+	%{__ninja_common_opts}
+
+ninja_test = \
+	%{__ninja} test \
+	%{__ninja_common_opts}
+
diff --git a/ninja/ninja.nm b/ninja/ninja.nm
index e0793d8a0..ef54e5d99 100644
--- a/ninja/ninja.nm
+++ b/ninja/ninja.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = ninja
-version    = 1.8.2
+version    = 1.9.0
 release    = 1
 
 groups     = Applications/System
@@ -55,6 +55,12 @@ build
 
 		# Install ninja syntax highlighting for vim.
 		install -Dpm0644 misc/ninja.vim %{BUILDROOT}%{datadir}/vim/vimfiles/syntax/ninja.vim
+
+		# Install pakfire macro.
+		mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros
+		install -v -m 644 %{DIR_SOURCE}/%{name}.macro \
+			%{BUILDROOT}/usr/lib/pakfire/macros
+
 	end
 end
 
-- 
2.20.1



More information about the Development mailing list