mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] glib: version bump 2.52.1 -> 2.54.2
Date: Wed, 22 Nov 2017 00:18:07 +0100	[thread overview]
Message-ID: <20171121231807.ecgkufmtlpefhapp@lenoch> (raw)

Update to latest stable version.

Also it turned out that package install stage is using GTKDOC tools
found on build host, so add empty ac_cv_path_* to avoid that.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 Note: See also previous mail. Perhaps it would be worth to create
 some global for disabling gtk-doc and ac_cv_path_* overriding...
 I'll leave this for later; consider this patch a bugfix ;)

 rules/glib.make      | 18 ++++++++++++++----
 rules/host-glib.make | 10 ++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/rules/glib.make b/rules/glib.make
index 8592618fc..5d2c11fe6 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
 #
 # Paths and names
 #
-GLIB_VERSION	:= 2.52.1
-GLIB_MD5	:= 36b4c7bf4f2b398ac8ad90578d05c950
+GLIB_VERSION	:= 2.54.2
+GLIB_MD5	:= 50f83e08f080f99b1e2f0ad2b760fb81
 GLIB		:= glib-$(GLIB_VERSION)
 GLIB_SUFFIX	:= tar.xz
 GLIB_SOURCE	:= $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX)
@@ -32,14 +32,21 @@ GLIB_LICENSE	:= LGPL-2.0+
 # Prepare
 # ----------------------------------------------------------------------------
 
+# If one of GTKDOC tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc as this option controls
+# generating documentation, while in tarballs it is already generated
+# and providing empty paths to GTKDOC tools avoids doc installation.
 GLIB_CONF_ENV	:= \
 	$(CROSS_ENV) \
 	glib_cv_uscore=no \
 	glib_cv_stack_grows=no \
 	glib_cv_have_qsort_r=yes \
 	ac_cv_func_statfs=yes \
-	ac_cv_path_MSGFMT=: \
-	ac_cv_path_XGETTEXT=no
+	ac_cv_path_MSGFMT="" \
+	ac_cv_path_XGETTEXT="" \
+	ac_cv_prog_GTKDOC_CHECK="" \
+	ac_cv_path_GTKDOC_REBASE="" \
+	ac_cv_path_GTKDOC_MKPDF=""
 
 #
 # autoconf
@@ -51,6 +58,7 @@ GLIB_CONF_ENV	:= \
 GLIB_CONF_TOOL	:= autoconf
 GLIB_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-maintainer-mode \
 	--enable-debug=minimum \
 	--disable-gc-friendly \
 	--enable-mem-pools \
@@ -67,6 +75,8 @@ GLIB_CONF_OPT	:= \
 	--disable-libelf \
 	--disable-libmount \
 	--disable-gtk-doc \
+	--disable-gtk-doc-html \
+	--disable-gtk-doc-pdf \
 	--disable-man \
 	--disable-dtrace \
 	--disable-systemtap \
diff --git a/rules/host-glib.make b/rules/host-glib.make
index 8e0e42c6b..534fd3453 100644
--- a/rules/host-glib.make
+++ b/rules/host-glib.make
@@ -24,8 +24,11 @@ HOST_GLIB_DIR	= $(HOST_BUILDDIR)/$(GLIB)
 
 HOST_GLIB_CONF_ENV	:= \
 	$(HOST_ENV) \
-	ac_cv_path_MSGFMT=: \
-	ac_cv_path_XGETTEXT=no
+	ac_cv_path_MSGFMT="" \
+	ac_cv_path_XGETTEXT="" \
+	ac_cv_prog_GTKDOC_CHECK="" \
+	ac_cv_path_GTKDOC_REBASE="" \
+	ac_cv_path_GTKDOC_MKPDF=""
 
 #
 # autoconf
@@ -33,6 +36,7 @@ HOST_GLIB_CONF_ENV	:= \
 HOST_GLIB_CONF_TOOL	:= autoconf
 HOST_GLIB_CONF_OPT	:= \
 	$(HOST_AUTOCONF) \
+	--disable-maintainer-mode \
 	--disable-debug \
 	--disable-gc-friendly \
 	--enable-mem-pools \
@@ -48,6 +52,8 @@ HOST_GLIB_CONF_OPT	:= \
 	--disable-libelf \
 	--disable-libmount \
 	--disable-gtk-doc \
+	--disable-gtk-doc-html \
+	--disable-gtk-doc-pdf \
 	--disable-man \
 	--disable-dtrace \
 	--disable-systemtap \
-- 
2.15.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2017-11-21 23:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-21 23:18 Ladislav Michl [this message]
2017-11-22  9:05 ` Michael Olbrich
2017-11-22 10:16   ` Ladislav Michl
2017-11-22 10:20   ` Ian Abbott

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=20171121231807.ecgkufmtlpefhapp@lenoch \
    --to=ladis@linux-mips.org \
    --cc=ptxdist@pengutronix.de \
    /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