From b62e86faf98fdb963c6a3415e836610def40af4f Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 7 Jan 2017 06:24:44 +0000
Subject: [PATCH] devel/boost-libs: drop -no-integrated-as on aarch64

PR:		213867
Obtained from:	upstream
MFH:		2017Q1
---
 devel/boost-libs/Makefile             | 12 ++--------
 devel/boost-libs/files/patch-clang-as | 33 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 devel/boost-libs/files/patch-clang-as

diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index a0cbede5ebe7..38d78fb0177e 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	boost-libs
+PORTREVISION=	1
 
 COMMENT=	Free portable C++ libraries (without Boost.Python)
 
@@ -30,15 +31,6 @@ ICU_MAKE_ARGS_OFF=	boost.locale.icu=off
 MAKE_ARGS+=	--without-python
 ALL_TARGET=	stage
 
-.include <bsd.port.pre.mk>
-
-# XXX CHOSEN_COMPILER_VERSION isn't supported, so check CXX hasn't changed
-.if ${ARCH} == aarch64 && ${CXX} == c++ && \
-    ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 39
-BUILD_DEPENDS+=	as:devel/binutils
-CFLAGS+=	-no-integrated-as
-.endif
-
 do-install:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_ARGS:NDESTDIR=*:S,^--prefix=,&${STAGEDIR},} ${INSTALL_TARGET}
@@ -60,4 +52,4 @@ post-install:
 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/boost-libs/files/patch-clang-as b/devel/boost-libs/files/patch-clang-as
new file mode 100644
index 000000000000..569df677eb7a
--- /dev/null
+++ b/devel/boost-libs/files/patch-clang-as
@@ -0,0 +1,33 @@
+https://svn.boost.org/trac/boost/ticket/12551
+https://github.com/boostorg/context/commit/26b61a67cf1d
+
+--- libs/context/src/asm/jump_arm64_aapcs_elf_gas.S.orig	2016-09-21 14:33:22 UTC
++++ libs/context/src/asm/jump_arm64_aapcs_elf_gas.S
+@@ -37,7 +37,6 @@
+  *                                                     *
+  *******************************************************/
+ 
+-.cpu    generic+fp+simd
+ .text
+ .align  2
+ .global jump_fcontext
+--- libs/context/src/asm/make_arm64_aapcs_elf_gas.S.orig	2016-09-21 14:33:22 UTC
++++ libs/context/src/asm/make_arm64_aapcs_elf_gas.S
+@@ -37,7 +37,6 @@
+  *                                                     *
+  *******************************************************/
+ 
+-.cpu    generic+fp+simd
+ .text
+ .align  2
+ .global make_fcontext
+--- libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S.orig	2016-09-21 14:33:22 UTC
++++ libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S
+@@ -37,7 +37,6 @@
+  *                                                     *
+  *******************************************************/
+ 
+-.cpu    generic+fp+simd
+ .text
+ .align  2
+ .global ontop_fcontext