From owner-svn-ports-all@freebsd.org  Sun Jan  1 11:45:30 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1198DC9AC88;
 Sun,  1 Jan 2017 11:45:30 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C846B14D1;
 Sun,  1 Jan 2017 11:45:29 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v01BjSdW062320;
 Sun, 1 Jan 2017 11:45:28 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v01BjSc4062319;
 Sun, 1 Jan 2017 11:45:28 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201701011145.v01BjSc4062319@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 1 Jan 2017 11:45:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r430248 - head/devel/boost-libs
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jan 2017 11:45:30 -0000

Author: jbeich
Date: Sun Jan  1 11:45:28 2017
New Revision: 430248
URL: https://svnweb.freebsd.org/changeset/ports/430248

Log:
  devel/boost-libs: oops, work around ${CC} usage after r430247
  
  $ make -V '${MAKE_ARGS:M--toolset*}'
  /bin/sh: clang39: not found
  make: "/usr/ports/Mk/Uses/compiler.mk" line 69: warning: "clang39 --version" returned non-zero status
  make: "/usr/ports/Mk/Uses/compiler.mk" line 120: warning: "clang++39 -### /dev/null 2>&1" returned non-zero status
  --toolset=gcc
  
  PR:		213867
  MFH:		2016Q4 (r430247 followup)

Modified:
  head/devel/boost-libs/Makefile   (contents, props changed)

Modified: head/devel/boost-libs/Makefile
==============================================================================
--- head/devel/boost-libs/Makefile	Sun Jan  1 10:50:47 2017	(r430247)
+++ head/devel/boost-libs/Makefile	Sun Jan  1 11:45:28 2017	(r430248)
@@ -32,10 +32,11 @@ ICU_MAKE_ARGS_OFF=	boost.locale.icu=off
 MAKE_ARGS+=	--without-python
 ALL_TARGET=	stage
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-# XXX Avoid bsd.port.(pre|post).mk dance by only working around base compiler
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 && ${ARCH} == aarch64 && ${CXX} == c++
+# 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+=	${CC}:devel/llvm${LLVM_VER}
 CC=		clang${LLVM_VER}
 CXX=		clang++${LLVM_VER}
@@ -64,4 +65,4 @@ post-install:
 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>