pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/orc orc: Fix installation if gtk-doc package is ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/50c3aeddfe5e
branches:  trunk
changeset: 370702:50c3aeddfe5e
user:      leot <leot%pkgsrc.org@localhost>
date:      Mon Oct 23 10:11:21 2017 +0000

description:
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.

diffstat:

 devel/orc/Makefile |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r f78db4488fa3 -r 50c3aeddfe5e devel/orc/Makefile
--- a/devel/orc/Makefile        Mon Oct 23 09:46:46 2017 +0000
+++ b/devel/orc/Makefile        Mon Oct 23 10:11:21 2017 +0000
@@ -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_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