pkgsrc-Changes archive

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

CVS commit: pkgsrc/devel/orc



Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Oct 23 10:11:21 UTC 2017

Modified Files:
        pkgsrc/devel/orc: Makefile

Log Message:
orc: Fix installation if gtk-doc package is already installed

By default orc 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 <martin> via PR pkg/52632.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/orc/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/orc/Makefile
diff -u pkgsrc/devel/orc/Makefile:1.11 pkgsrc/devel/orc/Makefile:1.12
--- pkgsrc/devel/orc/Makefile:1.11      Thu Jul 20 13:18:42 2017
+++ pkgsrc/devel/orc/Makefile   Mon Oct 23 10:11:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/07/20 13:18:42 adam Exp $
+# $NetBSD: Makefile,v 1.12 2017/10/23 10:11:21 leot Exp $
 
 DISTNAME=      orc-0.4.27
 CATEGORIES=    devel
@@ -14,7 +14,16 @@ USE_LIBTOOL=         yes
 USE_TOOLS=             gmake
 GNU_CONFIGURE=         yes
 PKGCONFIG_OVERRIDE+=   orc.pc.in
+
+# 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=
+
 TEST_TARGET=           check
 
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index