pkgsrc-WIP-changes archive

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

zbar: Remove tests option



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Dec 3 14:41:03 2019 +0100
Changeset:	1ae4c104cfb9cd7570fcc5e7ff8a6c59114c8bdf

Modified Files:
	zbar/Makefile
	zbar/options.mk

Log Message:
zbar: Remove tests option

Discussed with <ng0>.  It's probably better to investigate first how to deal
with accidental recognition of Python and then investigate how to deal with
argp (and, ideally if that could be avoided completely!).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1ae4c104cfb9cd7570fcc5e7ff8a6c59114c8bdf

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

diffstat:
 zbar/Makefile   | 2 --
 zbar/options.mk | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

diffs:
diff --git a/zbar/Makefile b/zbar/Makefile
index da1c700406..27c0c040c4 100644
--- a/zbar/Makefile
+++ b/zbar/Makefile
@@ -31,8 +31,6 @@ PKGCONFIG_OVERRIDE+=	zbar.pc.in
 
 TEST_TARGET=	check
 
-#TEST_DEPENDS+=	argp-[0-9]*:../../devel/argp
-
 # Examples and tests require python
 # XXX: use big hammer to forcely disable python
 #REPLACE_PYTHON+=		test/barcodetest.py examples/upcrpc.py
diff --git a/zbar/options.mk b/zbar/options.mk
index 28d04253e1..16e709403d 100644
--- a/zbar/options.mk
+++ b/zbar/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.1 2015/07/07 16:24:57 leot1990 Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.zbar
-PKG_SUPPORTED_OPTIONS=	imagemagick x11 tests
+PKG_SUPPORTED_OPTIONS=	imagemagick x11
 PKG_SUGGESTED_OPTIONS=	imagemagick x11
 
 .include "../../mk/bsd.options.mk"
@@ -35,7 +35,3 @@ CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-xshm
 CONFIGURE_ARGS+=	--without-xv
 .endif
-
-.if !empty(PKG_OPTIONS:Mtests)
-.include "../../devel/argp/buildlink3.mk"
-.endif


Home | Main Index | Thread Index | Old Index