summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2017-01-14 20:51:32 +0000
committerjbeich <jbeich@FreeBSD.org>2017-01-14 20:51:32 +0000
commit063d2bb0410bb9444d14c1aa7477de4d8a40314d (patch)
tree0a392022a2d90a9d6a6589635431e097dfb01630
parent6b102b4c113db2fb9ef2b1b0d4f1086270a116b0 (diff)
downloadFreeBSD-ports-063d2bb0410bb9444d14c1aa7477de4d8a40314d.zip
FreeBSD-ports-063d2bb0410bb9444d14c1aa7477de4d8a40314d.tar.gz
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)
-rw-r--r--security/gnutls/Makefile15
1 files changed, 12 insertions, 3 deletions
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 1f31e36..4ed724a 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -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>
OpenPOWER on IntegriCloud