diff mbox series

meson: Update to 0.50.1

Message ID 20190621113123.18666-1-stefan.schantl@ipfire.org
State Accepted
Commit e1187e5093f5de084248354e194119e1bcd65c45
Headers
Series meson: Update to 0.50.1 |

Commit Message

Stefan Schantl June 21, 2019, 9:31 p.m. UTC 
  * Also add macro file for pakfire.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 meson/meson.macro | 42 ++++++++++++++++++++++++++++++++++++++++++
 meson/meson.nm    |  8 +++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 meson/meson.macro
diff mbox series

Patch

diff --git a/meson/meson.macro b/meson/meson.macro
new file mode 100644
index 000000000..f26c7af21
--- /dev/null
+++ b/meson/meson.macro
@@ -0,0 +1,42 @@ 
+#
+# Meson macros
+#
+
+
+__meson = %{bindir}/meson
+__meson_wrap_mode = nodownload
+__meson_auto_features = enabled
+
+_smp_mesonflags = %{PARALLELISMFLAGS}
+
+meson = \
+    %{__meson} \
+	--buildtype=plain \
+	--prefix=%{prefix} \
+	--libdir=%{libdir} \
+	--libexecdir=%{libexecdir} \
+	--bindir=%{bindir} \
+	--sbindir=%{sbindir} \
+	--includedir=%{includedir} \
+	--datadir=%{datadir} \
+	--mandir=%{mandir} \
+	--infodir=%{infodir} \
+	--localedir=%{datadir}/locale \
+	--sysconfdir=%{sysconfdir} \
+	--localstatedir=%{localstatedir} \
+	--sharedstatedir=%{sharedstatedir} \
+	--wrap-mode=%{__meson_wrap_mode} \
+	--auto-features=%{__meson_auto_features} \
+        . %{DISTRO_MACHINE}
+
+meson_build = \
+	%{ninja_build} -C %{DISTRO_MACHINE}
+
+meson_install = \
+	%{ninja_install} -C %{DISTRO_MACHINE}
+
+meson_test = \
+    %{__meson} test \
+	-C %{DISTRO_MACHINE} \
+	%{PARALLELISMFLAGS} \
+	--print-errorlogs
diff --git a/meson/meson.nm b/meson/meson.nm
index 208966a79..b7a687155 100644
--- a/meson/meson.nm
+++ b/meson/meson.nm
@@ -4,7 +4,7 @@ 
 ###############################################################################
 
 name       = meson
-version    = 0.48.1
+version    = 0.50.1
 release    = 1
 arch	   = noarch
 
@@ -40,12 +40,18 @@  build
 
 	install
 		%{python3} setup.py install -O1 --skip-build --root %{BUILDROOT}
+
+		# 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
 
 packages
 	package %{name}
 		requires
+			ninja-build >= 1.9.0
 			python3-setuptools
 		end
 	end