Sun Aug 19 06:28:39 2018 UTC ()
gnutls: build-depend on bash for the tests.

Replace interpreter in more shell scripts. Gets tests further along.


(wiz)
diff -r1.184 -r1.185 pkgsrc/security/gnutls/Makefile
cvs diff -r1.184 -r1.185 pkgsrc/security/gnutls/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gnutls/Makefile 2018/08/16 11:05:47 1.184
+++ pkgsrc/security/gnutls/Makefile 2018/08/19 06:28:39 1.185
@@ -1,63 +1,65 @@ @@ -1,63 +1,65 @@
1# $NetBSD: Makefile,v 1.184 2018/08/16 11:05:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.185 2018/08/19 06:28:39 wiz Exp $
2 2
3DISTNAME= gnutls-3.6.3 3DISTNAME= gnutls-3.6.3
4CATEGORIES= security devel 4CATEGORIES= security devel
5MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/ 5MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnutls.org/ 9HOMEPAGE= http://www.gnutls.org/
10COMMENT= GNU Transport Layer Security library 10COMMENT= GNU Transport Layer Security library
11LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 11LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_TOOLS+= gmake gsed perl pkg-config 16USE_TOOLS+= gmake gsed perl pkg-config bash:build
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18# this library duplicates (and conflicts with) openssl 18# this library duplicates (and conflicts with) openssl
19CONFIGURE_ARGS+= --disable-openssl-compatibility 19CONFIGURE_ARGS+= --disable-openssl-compatibility
20CONFIGURE_ARGS+= --disable-guile 20CONFIGURE_ARGS+= --disable-guile
21CONFIGURE_ARGS+= --disable-libdane 21CONFIGURE_ARGS+= --disable-libdane
22CONFIGURE_ARGS+= --without-tpm 22CONFIGURE_ARGS+= --without-tpm
23CONFIGURE_ARGS+= --disable-destructive-tests 23CONFIGURE_ARGS+= --disable-destructive-tests
24CONFIGURE_ARGS+= --disable-valgrind-tests 24CONFIGURE_ARGS+= --disable-valgrind-tests
25CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext} 25CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
26CONFIGURE_ARGS+= --enable-local-libopts 26CONFIGURE_ARGS+= --enable-local-libopts
27# Assembler support is broken for SunOS in 3.2.9. 27# Assembler support is broken for SunOS in 3.2.9.
28CONFIGURE_ARGS.SunOS+= --disable-hardware-acceleration 28CONFIGURE_ARGS.SunOS+= --disable-hardware-acceleration
29CONFIGURE_ARGS.FreeBSD+= ac_cv_type_max_align_t=yes 29CONFIGURE_ARGS.FreeBSD+= ac_cv_type_max_align_t=yes
30 30
31# as of 3.5.8, 0 test failures 31# as of 3.5.8, 0 test failures
32TEST_TARGET= check 32TEST_TARGET= check
33# without the USE_TOOLS line below, the fastopen.sh test fails 33# without the USE_TOOLS line below, the fastopen.sh test fails
34# but when this line is added, the tool path for bash is embedded 34# but when this line is added, the tool path for bash is embedded
35# in to the binaries, so only enable this for testing and 35# in to the binaries, so only enable this for testing and
36# disable before commit 36# disable before commit
37#USE_TOOLS+= bash 37#USE_TOOLS+= bash
38 38
39INFO_FILES= yes 39INFO_FILES= yes
40 40
 41REPLACE_BASH+= tests/cert-tests/certtool
41REPLACE_BASH+= tests/danetool.sh 42REPLACE_BASH+= tests/danetool.sh
 43REPLACE_BASH+= tests/fastopen.sh
42REPLACE_BASH+= tests/gnutls-cli-debug.sh 44REPLACE_BASH+= tests/gnutls-cli-debug.sh
43REPLACE_BASH+= tests/ocsp-tests/ocsp-must-staple-connection 45REPLACE_BASH+= tests/ocsp-tests/ocsp-must-staple-connection
44REPLACE_BASH+= tests/ocsp-tests/ocsp-tls-connection 46REPLACE_BASH+= tests/ocsp-tests/ocsp-tls-connection
45REPLACE_BASH+= tests/suite/testcompat-main-polarssl 
46REPLACE_BASH+= tests/suite/testcompat-main-openssl 
47REPLACE_BASH+= tests/fastopen.sh 
48REPLACE_BASH+= tests/starttls.sh 47REPLACE_BASH+= tests/starttls.sh
 48REPLACE_BASH+= tests/suite/cbc-record-check.sh
 49REPLACE_BASH+= tests/suite/testcompat-main-openssl
 50REPLACE_BASH+= tests/suite/testcompat-main-polarssl
49 51
50REPLACE_PERL+= doc/scripts/gdoc doc/scripts/sort2.pl 52REPLACE_PERL+= doc/scripts/gdoc doc/scripts/sort2.pl
51 53
52PKGCONFIG_OVERRIDE= lib/gnutls.pc.in 54PKGCONFIG_OVERRIDE= lib/gnutls.pc.in
53PKGCONFIG_OVERRIDE+= libdane/gnutls-dane.pc.in 55PKGCONFIG_OVERRIDE+= libdane/gnutls-dane.pc.in
54 56
55MAKE_ENV+= RM=${RM:Q} 57MAKE_ENV+= RM=${RM:Q}
56MAKE_ENV+= TZ=UTC 58MAKE_ENV+= TZ=UTC
57 59
58EGDIR= ${PREFIX}/share/examples/gnutls 60EGDIR= ${PREFIX}/share/examples/gnutls
59 61
60INSTALLATION_DIRS= ${EGDIR} include/gnutls 62INSTALLATION_DIRS= ${EGDIR} include/gnutls
61 63
62post-install: 64post-install:
63 cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${DESTDIR}${EGDIR} 65 cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${DESTDIR}${EGDIR}