From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2] libgtk2: skip tutorial and faq build
Date: Thu, 26 Feb 2015 00:17:12 +0100 [thread overview]
Message-ID: <877fv57f9j.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <20150224235024.844FBE0447@smtp.hushmail.com> (justin swartz's message of "Wed, 25 Feb 2015 01:50:24 +0200")
>>>>> "justin" == justin swartz <justin.swartz@nym.hush.com> writes:
> Fixes: http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/65165
> Credit to Yann E. MORIN for discovering and describing a fix for the
> HAVE_DOCBOOK bug in "configure.ac", as well as the
> "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" additions to
> LIBGTK2_CONF_OPTS.
> Signed-off-by: Justin Swartz <justin.swartz@nym.hush.com>
> ---
> Changes v1 -> v2:
> - Commit log added to the head of "0002-configure-have_docbook.patch"
> - Moved "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" to the
> end of LIBGTK2_CONF_OPTS
> ---
> package/libgtk2/0002-configure-have_docbook.patch | 15 +++++++++++++++
> package/libgtk2/libgtk2.mk | 9 +++++++--
> 2 files changed, 22 insertions(+), 2 deletions(-)
> create mode 100644 package/libgtk2/0002-configure-have_docbook.patch
> diff --git a/package/libgtk2/0002-configure-have_docbook.patch b/package/libgtk2/0002-configure-have_docbook.patch
> new file mode 100644
> index 0000000..aece8f1
> --- /dev/null
> +++ b/package/libgtk2/0002-configure-have_docbook.patch
> @@ -0,0 +1,15 @@
> +Improvement of the HAVE_DOCBOOK test criteria.
> +
> +Signed-off-by: Justin Swartz <justin.swartz@nym.hush.com>
> +
> +--- libgtk2-2.24.18/configure.ac.orig 2015-02-24 00:28:18.128745222 +0200
> ++++ libgtk2-2.24.18/configure.ac 2015-02-24 00:29:10.739087501 +0200
> +@@ -1612,7 +1612,7 @@
> + GTK_DOC_CHECK([1.11])
> +
> + AC_CHECK_PROG(DB2HTML, db2html, true, false)
> +-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
> ++AM_CONDITIONAL([HAVE_DOCBOOK], [test ! "$DB2HTML" = "no"])
Why not just pass DB2HTML=false in LIBGTK2_CONF_ENV?
> +
> + AC_ARG_ENABLE(man,
> + [AC_HELP_STRING([--enable-man],
> diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
> index dfc1f5b..d468117 100644
> --- a/package/libgtk2/libgtk2.mk
> +++ b/package/libgtk2/libgtk2.mk
> @@ -69,9 +69,14 @@ LIBGTK2_CONF_ENV = \
> ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
> ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
> ac_cv_prog_F77=no \
> - ac_cv_path_CUPS_CONFIG=no
> + ac_cv_path_CUPS_CONFIG=no \
> + ac_cv_prog_DB2HTML=no
> -LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
> +LIBGTK2_CONF_OPTS = \
> + --disable-glibtest \
> + --enable-explicit-deps=no \
> + --disable-gtk-doc-pdf \
> + --disable-gtk-doc-html
What does that buy us? gtk-doc is disabled unless --enable-gtk-doc is
passed (which we don't), so these shouldn't change anything.
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2015-02-25 23:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 23:50 [Buildroot] [PATCH v2] libgtk2: skip tutorial and faq build justin.swartz at nym.hush.com
2015-02-25 17:21 ` Yann E. MORIN
2015-02-25 23:17 ` Peter Korsgaard [this message]
2015-02-26 16:34 ` justin.swartz at nym.hush.com
2015-02-26 21:16 ` Peter Korsgaard
2015-02-26 21:50 ` Yann E. MORIN
2015-02-26 22:10 ` Peter Korsgaard
2015-02-26 16:55 ` [Buildroot] [PATCH v3] " justin.swartz at nym.hush.com
2015-02-26 20:04 ` Yann E. MORIN
2015-02-26 22:00 ` Peter Korsgaard
2015-02-26 17:35 ` [Buildroot] [PATCH v2] " Yann E. MORIN
2015-02-26 21:58 ` Peter Korsgaard
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=877fv57f9j.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/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