pkgsrc-WIP-changes archive

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

wip/gnunet: Adjust libidn2 detection, thanks nros@.



Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Thu Oct 31 08:25:17 2019 +0000
Changeset:	8d5f6bb676fd7719c49f3130aa1d42f1e4a3f851

Modified Files:
	gnunet/options.mk

Log Message:
wip/gnunet: Adjust libidn2 detection, thanks nros@.

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

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

diffstat:
 gnunet/options.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diffs:
diff --git a/gnunet/options.mk b/gnunet/options.mk
index a4ff9e2b4c..f50b520d4c 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -12,7 +12,7 @@ PKG_SUPPORTED_OPTIONS+=		zbar
 # mdoc should be fixed in 0.11.9, missing files were included
 # post-0.11.8.
 # in 0.11.9 when fixed for pkgsrc, add back idn.
-PKG_SUGGESTED_OPTIONS+=		doc sqlite3 json opus ogg gstreamer zbar
+PKG_SUGGESTED_OPTIONS+=		doc sqlite3 json opus ogg gstreamer zbar idn
 
 # bluez is still in pkgsrc-wip, and I should test this
 # before claiming bluez from pkgsrc-wip on Linux works.
@@ -59,10 +59,11 @@ CONFIGURE_ARGS+=	--disable-texi2mdoc-generation
 .endif
 
 # idn is mandatory but idn or idn2 can be used with a preference
-# for idn2.
+# for idn2. Use different option content once
+# https://bugs.gnunet.org/view.php?id=5948 is fixed.
 .if !empty(PKG_OPTIONS:Midn)
 .include "../../devel/libidn2/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-libidn2=${BUILDLINK_PREFIX.libidn2}
+CONFIGURE_ARGS+=	--with-libidn=no
 .else
 .include "../../devel/libidn/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn}


Home | Main Index | Thread Index | Old Index