Tue Feb 28 11:25:48 2012 UTC ()
Override configure checks for gmp and iconv, seems --without-gmp and
--without-iconv is not enough.


(hans)
diff -r1.16 -r1.17 pkgsrc/devel/silc-toolkit/Makefile
cvs diff -r1.16 -r1.17 pkgsrc/devel/silc-toolkit/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/silc-toolkit/Makefile 2010/08/30 11:17:16 1.16
+++ pkgsrc/devel/silc-toolkit/Makefile 2012/02/28 11:25:48 1.17
@@ -1,40 +1,43 @@ @@ -1,40 +1,43 @@
1# $NetBSD: Makefile,v 1.16 2010/08/30 11:17:16 adam Exp $ 1# $NetBSD: Makefile,v 1.17 2012/02/28 11:25:48 hans Exp $
2 2
3DISTNAME= silc-toolkit-1.1.10 3DISTNAME= silc-toolkit-1.1.10
4CATEGORIES= devel chat security 4CATEGORIES= devel chat security
5MASTER_SITES= http://www.silcnet.org/download/toolkit/sources/ \ 5MASTER_SITES= http://www.silcnet.org/download/toolkit/sources/ \
6 ftp://ftp.silcnet.org/silc/toolkit/sources/ 6 ftp://ftp.silcnet.org/silc/toolkit/sources/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= salo@NetBSD.org 9MAINTAINER= salo@NetBSD.org
10HOMEPAGE= http://www.silcnet.org/ 10HOMEPAGE= http://www.silcnet.org/
11COMMENT= Secure Internet Live Conferencing (SILC) protocol Toolkit 11COMMENT= Secure Internet Live Conferencing (SILC) protocol Toolkit
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15CONFLICTS+= silc-client<1.0.1nb1 15CONFLICTS+= silc-client<1.0.1nb1
16 16
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --disable-optimizations 19CONFIGURE_ARGS+= --disable-optimizations
20CONFIGURE_ARGS+= --includedir=${PREFIX}/include/silc 20CONFIGURE_ARGS+= --includedir=${PREFIX}/include/silc
21CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/silc/modules 21CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/silc/modules
22CONFIGURE_ARGS+= --without-gmp 22CONFIGURE_ARGS+= --without-gmp
23CONFIGURE_ARGS+= --without-iconv 23CONFIGURE_ARGS+= --without-iconv
24#.if ${MACHINE_ARCH} != "i386" 24#.if ${MACHINE_ARCH} != "i386"
25#CONFIGURE_ARGS+= --disable-asm 25#CONFIGURE_ARGS+= --disable-asm
26#.endif 26#.endif
27 27
 28CONFIGURE_ENV+= ac_cv_lib_gmp___gmpz_init=no
 29CONFIGURE_ENV+= ac_cv_func_iconv=no
 30
28PKGCONFIG_OVERRIDE+= lib/silc.pc.in 31PKGCONFIG_OVERRIDE+= lib/silc.pc.in
29PKGCONFIG_OVERRIDE+= lib/silcclient.pc.in 32PKGCONFIG_OVERRIDE+= lib/silcclient.pc.in
30PKGCONFIG_OVERRIDE+= lib/silcserver.pc.in 33PKGCONFIG_OVERRIDE+= lib/silcserver.pc.in
31 34
32.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
33 36
34# lib/silcclient/client_attrs.c causes an ICE with xlc on Darwin. 37# lib/silcclient/client_attrs.c causes an ICE with xlc on Darwin.
35NOT_FOR_COMPILER= xlc 38NOT_FOR_COMPILER= xlc
36 39
37.include "options.mk" 40.include "options.mk"
38 41
39.include "../../devel/libgetopt/buildlink3.mk" 42.include "../../devel/libgetopt/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"