From 64f9316bd8c0d76d46cfd079bc79f839f33d8153 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Thu, 6 Jul 2017 05:34:14 +0000 Subject: MFH: r445053 Only use enable-ec_nistp_64_gcc_128 on amd64 since it requires a 64-bit little-endian architecture and fix the build on !amd64 ecp_nistp224.c:43:9: error: unknown type name '__uint128_t' typedef __uint128_t uint128_t; /* nonstandard; implemented by gcc on 64-bit ^ PR: 220403 Reported by: dewayne@heuristicsystems.com.au Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D11436 Approved by: ports-secteam (blanket) --- security/testssl.sh/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/security/testssl.sh/Makefile b/security/testssl.sh/Makefile index efdfb7497c38..a2e52793c41a 100644 --- a/security/testssl.sh/Makefile +++ b/security/testssl.sh/Makefile @@ -2,6 +2,7 @@ PORTNAME= testssl.sh PORTVERSION= 2.8 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org @@ -44,7 +45,6 @@ CONFIGURE_ARGS= --openssldir=${OPENSSLDIR} \ enable-camellia \ enable-idea \ enable-rfc3779 \ - enable-ec_nistp_64_gcc_128 \ experimental-jpake \ -DOPENSSL_USE_IPV6 CONFIGURE_ENV= PERL="${PERL}" @@ -57,6 +57,14 @@ CONFIGURE_WRKSRC= ${WRKSRC_openssl} # unknown reasons. MAKE_JOBS_UNSAFE= yes +.include + +.if ${ARCH} == "amd64" +CONFIGURE_ARGS+= enable-ec_nistp_64_gcc_128 +.else +CONFIGURE_ARGS+= no-ec_nistp_64_gcc_128 +.endif + post-patch: @${REINPLACE_CMD} -e '/elif test_openssl_suffix/d' \ -e 's@: \# 5. we tried.*$$@else OPENSSL="${PREFIX}/libexec/openssl.testssl.sh"@' \ @@ -71,4 +79,4 @@ do-install: @cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/etc @cd ${WRKSRC}/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils -.include +.include -- cgit v1.2.3