From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] glib2: Update to 2.61
Date: Fri, 21 Jun 2019 13:33:49 +0200 [thread overview]
Message-ID: <20190621113349.18871-1-stefan.schantl@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1441 bytes --]
glib2 now uses meson as build system
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
glib2/glib2.nm | 32 +++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/glib2/glib2.nm b/glib2/glib2.nm
index 8d2f2558c..328d57aaa 100644
--- a/glib2/glib2.nm
+++ b/glib2/glib2.nm
@@ -4,7 +4,7 @@
###############################################################################
name = glib2
-ver_major = 2.55
+ver_major = 2.61
ver_minor = 1
version = %{ver_major}.%{ver_minor}
release = 1
@@ -29,18 +29,40 @@ sources = %{thisapp}.tar.xz
build
requires
+ docbook-xsl
gettext
libffi-devel
- libmount-devel
+ libmount-devel >= 2.34-2
+ meson >= 0.50.1
pcre-devel
pkg-config
zlib-devel
end
- configure_options += \
- --with-pcre=system
+ prepare_cmds
+ # Explicitly remove PCRE sources since we use --with-pcre=system
+ rm glib/pcre/*.[ch]
+ end
+
+ build
+ %{meson} \
+ --default-library=both \
+ -Dselinux=disabled \
+ -Dman=true \
+ -Ddtrace=false \
+ -Delf=false \
+ -Dfam=false \
+ -Dsystemtap=true \
+ -Dgtk_doc=false \
+ -Dinstalled_tests=false
+
+
+ %{meson_build}
+ end
+
+ install
+ %{meson_install}
- install_cmds
mkdir -pv %{BUILDROOT}/etc/profile.d/
cp -vf %{DIR_SOURCE}/glib2-locale.sh %{BUILDROOT}/etc/profile.d/
end
--
2.20.1
reply other threads:[~2019-06-21 11:33 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=20190621113349.18871-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