pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/libidn2 libidn2: Fix installation if gtk-doc pac...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0deb2fabfeb5
branches:  trunk
changeset: 370965:0deb2fabfeb5
user:      leot <leot%pkgsrc.org@localhost>
date:      Sun Oct 29 16:47:02 2017 +0000

description:
libidn2: Fix installation if gtk-doc package is already installed

By default libidn2 is configured with `--disable-gtk-doc'. However,
despite that, it will checks several `gtkdoc-*' tools anyway, ending
in a failure during the installation phase because only a couple
of them are available.

Add a kludge via CONFIGURE_ENV to avoid picking up gtkdoc-* tools.

Pointed out by <scole> via PR pkg/52667.

diffstat:

 devel/libidn2/Makefile |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 8784255a808a -r 0deb2fabfeb5 devel/libidn2/Makefile
--- a/devel/libidn2/Makefile    Sun Oct 29 12:13:54 2017 +0000
+++ b/devel/libidn2/Makefile    Sun Oct 29 16:47:02 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/08/30 15:22:30 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2017/10/29 16:47:02 leot Exp $
 
 DISTNAME=      libidn2-2.0.4
 CATEGORIES=    devel
@@ -15,6 +15,13 @@
 PKGCONFIG_OVERRIDE+=   libidn2.pc.in
 INFO_FILES=            yes
 
+# XXX: Kludge to avoid uncoditionally pick up some gtkdoc-* tools if gtk-doc
+# XXX: package is installed and then fails in the installation phase.
+CONFIGURE_ENV+=                ac_cv_prog_GTKDOC_CHECK= \
+                       ac_cv_path_GTKDOC_CHECK_PATH= \
+                       ac_cv_path_GTKDOC_REBASE= \
+                       ac_cv_path_GTKDOC_MKPDF=
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"



Home | Main Index | Thread Index | Old Index