From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] meson: Update to 0.50.1
Date: Fri, 21 Jun 2019 13:31:23 +0200 [thread overview]
Message-ID: <20190621113123.18666-1-stefan.schantl@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2175 bytes --]
* Also add macro file for pakfire.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
meson/meson.macro | 42 ++++++++++++++++++++++++++++++++++++++++++
meson/meson.nm | 8 +++++++-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 meson/meson.macro
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
--
2.20.1
reply other threads:[~2019-06-21 11:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190621113123.18666-1-stefan.schantl@ipfire.org \
--to=stefan.schantl@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox