pkgsrc-WIP-changes archive

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

zbar: attempt to address the test failure through devel/argp.



Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Tue Dec 3 12:40:01 2019 +0000
Changeset:	1d00be01d457aff692fe05e9e2aa5f34f134d241

Modified Files:
	zbar/Makefile
	zbar/TODO
	zbar/options.mk

Log Message:
zbar: attempt to address the test failure through devel/argp.

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

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

diffstat:
 zbar/Makefile   | 2 ++
 zbar/TODO       | 9 +++++++++
 zbar/options.mk | 6 +++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diffs:
diff --git a/zbar/Makefile b/zbar/Makefile
index 27c0c040c4..da1c700406 100644
--- a/zbar/Makefile
+++ b/zbar/Makefile
@@ -31,6 +31,8 @@ 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/TODO b/zbar/TODO
index e5a2e66377..3cbd416c53 100644
--- a/zbar/TODO
+++ b/zbar/TODO
@@ -7,4 +7,13 @@
  | #include <argp.h>
 
    investigate further!
+
+   * devel/argp leads to:
+   | ld: test/test_decode-test_decode.o: in function `parse_opt':
+   | test_decode.c:(.text+0x5f8): undefined reference to `argp_state_help'
+   | ld: test_decode.c:(.text+0x626): undefined reference to `argp_state_help'
+   | ld: test/test_decode-test_decode.o: in function `main':
+   | test_decode.c:(.text.startup+0x17): undefined reference to `argp_parse'
+   | ld: test_decode.c:(.text.startup+0x2f5): undefined reference to `argp_help'
+
 * python2 is (probably) accidentally picked up
diff --git a/zbar/options.mk b/zbar/options.mk
index 16e709403d..28d04253e1 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
+PKG_SUPPORTED_OPTIONS=	imagemagick x11 tests
 PKG_SUGGESTED_OPTIONS=	imagemagick x11
 
 .include "../../mk/bsd.options.mk"
@@ -35,3 +35,7 @@ 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