Re: [ptxdist] [PATCH] glib: version bump 2.52.1 -> 2.54.2

[Ladislav Michl <ladis@linux-mips.org>]

On Wed, Nov 22, 2017 at 10:05:32AM +0100, Michael Olbrich wrote:
> On Wed, Nov 22, 2017 at 12:18:07AM +0100, Ladislav Michl wrote:
> > 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 ;)
> 
> Can you check if other packages are affected too? I think gnutls or
> gstreamer1 might be from what I can tell from reading the Makefiles.

Yes, all those using gtk-doc, although only glib fails building
as install stage is looking for glib installed. Configure finds:
checking for gtkdoc-check... /usr/bin/gtkdoc-check
checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase
checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf

And gtkdoc-rebase in Debian unstable is currently buggy one (see
previous mail).

> If they are affected, then I'll work on a more general solution.

As we do not use gtk-doc at all, I guess adding empty
ac_cv_path_GTKDOC_REBASE etc would do the trick.

	ladis

> Michael
> 
> >  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
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de