pkgsrc-Changes archive

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

CVS commit: pkgsrc/devel/libidn2



Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Oct 29 16:47:02 UTC 2017

Modified Files:
        pkgsrc/devel/libidn2: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libidn2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libidn2/Makefile
diff -u pkgsrc/devel/libidn2/Makefile:1.4 pkgsrc/devel/libidn2/Makefile:1.5
--- pkgsrc/devel/libidn2/Makefile:1.4   Wed Aug 30 15:22:30 2017
+++ pkgsrc/devel/libidn2/Makefile       Sun Oct 29 16:47:02 2017
@@ -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 @@ GNU_CONFIGURE=               yes
 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