svn commit: r431495 - branches/2017Q1/security/gnutls

[Jan Beich]

Author: jbeich
Date: Sat Jan 14 20:53:21 2017
New Revision: 431495
URL: https://svnweb.freebsd.org/changeset/ports/431495

Log:
  MFH: r431494
  
  security/gnutls: unbreak aarch64 after r431214
  
  lib/accelerated/aarch64/elf/aes-aarch64.s.tmp.S:5:1: error: unknown directive
  .arch armv8-a+crypto
  ^
  lib/accelerated/aarch64/elf/aes-aarch64.s.tmp.S:49:2: error: instruction requires: crypto
   aese v6.16b,v0.16b
   ^
  
  PR:		216045
  Approved by:	tijl (maintainer)
  Approved by:	ports-secteam blanket

Modified:
  branches/2017Q1/security/gnutls/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/security/gnutls/Makefile
==============================================================================
--- branches/2017Q1/security/gnutls/Makefile	Sat Jan 14 20:51:32 2017	(r431494)
+++ branches/2017Q1/security/gnutls/Makefile	Sat Jan 14 20:53:21 2017	(r431495)
@@ -20,8 +20,8 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 BUILD_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-USES=		cpe gmake iconv libtool localbase makeinfo pathfix pkgconfig \
-		tar:xz
+USES=		compiler cpe gmake iconv libtool localbase makeinfo \
+		pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-guile \
@@ -64,6 +64,15 @@ ZLIB_CONFIGURE_WITH=	zlib
 
 INFO=		gnutls gnutls-guile
 
+.include <bsd.port.pre.mk>
+
+# XXX CHOSEN_COMPILER_VERSION isn't supported, so check CC hasn't changed
+.if ${ARCH} == aarch64 && ${CC} == cc && \
+    ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40
+BUILD_DEPENDS+=	as:devel/binutils
+CFLAGS+=	-no-integrated-as
+.endif
+
 post-patch:
 	@${RM} ${WRKSRC}/doc/*.info*
 
@@ -71,4 +80,4 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>