On Tue, Nov 21, 2017 at 09:57:19PM +0100, Ladislav Michl wrote:
[snip]
> This is just a bug report with possibility of providing fix later...

As analysis is the most time consuming part, here's a patch. It is quick and
dirty and includes Emmanuele Bassi's suggestion to use gtk-doc-stub instead
of gtk-doc. Comments welcome, I'll create proper patches based on them.

diff --git a/rules/glib.make b/rules/glib.make
index 8592618fc..914e010b0 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)
@@ -38,8 +38,11 @@ GLIB_CONF_ENV        := \
        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 +54,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 +71,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 \
diff --git a/rules/host-gtk-doc.make b/rules/host-gtk-doc.make
index 6b927e8be..2f5f88d4e 100644
--- a/rules/host-gtk-doc.make
+++ b/rules/host-gtk-doc.make
@@ -16,51 +16,20 @@ HOST_PACKAGES-$(PTXCONF_HOST_GTK_DOC) += host-gtk-doc
 #
 # Paths and names
 #
-HOST_GTK_DOC_VERSION   := 1.13
-HOST_GTK_DOC_MD5       := 27940d6cd5c9dcda8fc003043d8c299a
-HOST_GTK_DOC           := gtk-doc-$(HOST_GTK_DOC_VERSION)
-HOST_GTK_DOC_SUFFIX    := tar.bz2
-HOST_GTK_DOC_URL       := 
http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/$(HOST_GTK_DOC_VERSION)/$(HOST_GTK_DOC).$(HOST_GTK_DOC_SUFFIX)
+HOST_GTK_DOC_VERSION   := 25f3d018176622f722d63a1ef62d63f402a03660
+HOST_GTK_DOC_MD5       := 177d1e906107d10105f8fe97ffe2c214
+HOST_GTK_DOC           := gtk-doc-stub-$(HOST_GTK_DOC_VERSION)
+HOST_GTK_DOC_SUFFIX    := zip
+HOST_GTK_DOC_URL       := 
https://github.com/GNOME/gtk-doc-stub/archive/$(HOST_GTK_DOC_VERSION).zip
 HOST_GTK_DOC_SOURCE    := $(SRCDIR)/$(HOST_GTK_DOC).$(HOST_GTK_DOC_SUFFIX)
 HOST_GTK_DOC_DIR       := $(HOST_BUILDDIR)/$(HOST_GTK_DOC)
-HOST_GTK_DOC_LICENSE   := GPL-3.0, GFDL-1.1
+HOST_GTK_DOC_LICENSE   := GPL-2.0
 HOST_GTK_DOC_LICENSE_FILES := \
-       file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-       file://COPYING-DOCS;md5=18ba770020b624031bc7c8a7b055d776
-
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/host-gtk-doc.prepare:
-       @$(call targetinfo)
-       @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/host-gtk-doc.compile:
-       @$(call targetinfo)
-       @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/host-gtk-doc.install:
-       @$(call targetinfo)
-       install -D "$(HOST_GTK_DOC_DIR)/gtk-doc.m4" 
"$(PTXDIST_SYSROOT_HOST)/share/aclocal"
-       @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
+       file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
 #
 # autoconf
 #
 HOST_GTK_DOC_CONF_TOOL := autoconf
+HOST_GTK_DOC_CONF_OPT  := $(HOST_AUTOCONF_SYSROOT)
 
 # vim: syntax=make

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to