From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 03:45:57 2014 Return-Path: Delivered-To: svn-ports-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBD5DC2D; Fri, 27 Jun 2014 03:45:57 +0000 (UTC) Received: from i3mail.icecube.wisc.edu (i3mail.icecube.wisc.edu [128.104.255.23]) by mx1.freebsd.org (Postfix) with ESMTP id 8F3E329C9; Fri, 27 Jun 2014 03:45:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by i3mail.icecube.wisc.edu (Postfix) with ESMTP id 5EABD38052; Thu, 26 Jun 2014 22:45:50 -0500 (CDT) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from i3mail.icecube.wisc.edu ([127.0.0.1]) by localhost (i3mail.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id bwhnU03MpSLT; Thu, 26 Jun 2014 22:45:50 -0500 (CDT) Received: from comporellon.tachypleus.net (polaris.tachypleus.net [75.101.50.44]) by i3mail.icecube.wisc.edu (Postfix) with ESMTPSA id A81F738051; Thu, 26 Jun 2014 22:45:49 -0500 (CDT) Message-ID: <53ACE8EC.2060301@freebsd.org> Date: Thu, 26 Jun 2014 20:45:48 -0700 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Bryan Drewery , ports-committers@FreeBSD.org, svn-ports-all@FreeBSD.org, svn-ports-head@FreeBSD.org Subject: Re: svn commit: r359424 - head/Mk/Uses References: <201406262216.s5QMGcd8049387@svn.freebsd.org> <53ACE26E.1080204@FreeBSD.org> In-Reply-To: <53ACE26E.1080204@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: baptiste Daroussin X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 03:45:58 -0000 On 06/26/14 20:18, Bryan Drewery wrote: > > On 6/26/14, 5:16 PM, Nathan Whitehorn wrote: >> Author: nwhitehorn (src committer) >> Date: Thu Jun 26 22:16:37 2014 >> New Revision: 359424 >> URL: http://svnweb.freebsd.org/changeset/ports/359424 >> QAT: https://qat.redports.org/buildarchive/r359424/ >> >> Log: >> On some Tier-2 platforms (e.g. PowerPC), clang kind of works and >> so is >> installed but is not cc. On such platforms, clang is usually not >> default >> for a reason and so using it for C++11 is unwise. Instead, fall >> back to >> newer GCC. On i386 and amd64, clang works even if it isn't the >> default, >> so continue using it there. >> >> This fixes the build for Boost, among other software, on PowerPC. >> >> Approved by: bapt >> >> Modified: >> head/Mk/Uses/compiler.mk >> >> Modified: head/Mk/Uses/compiler.mk >> ============================================================================== >> >> --- head/Mk/Uses/compiler.mk Thu Jun 26 22:08:49 2014 (r359423) >> +++ head/Mk/Uses/compiler.mk Thu Jun 26 22:16:37 2014 (r359424) >> @@ -75,7 +75,9 @@ ALT_COMPILER_VERSION= 0 >> ALT_COMPILER_TYPE= none >> _ALTCCVERSION= >> .if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang) >> +.if ${ARCH} == amd64 || ${ARCH} == i386 # clang often non-default >> for a reason >> _ALTCCVERSION!= /usr/bin/clang --version >> +.endif >> .elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc) >> _ALTCCVERSION!= /usr/bin/gcc --version >> .endif >> @@ -138,7 +140,7 @@ CHOSEN_COMPILER_TYPE= gcc >> >> .if ${_COMPILER_ARGS:Mc++11-lang} >> .if !${COMPILER_FEATURES:Mc++11} >> -.if defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc >> +.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || >> (${ARCH} != amd64 || ${ARCH} != i386) # clang not always supported on >> Tier-2 > > This is wrong. > > This is now requiring gcc on amd64? > > [00:00:51] ====>> Deleting boost-libs-1.55.0_3.txz: new dependency: > lang/gcc > [00:00:52] ====>> Deleting boost-python-libs-1.55.0.txz: new > dependency: lang/gcc > > > This is requiring gcc if arch != i386 or arch != amd64 ... which is > always. Ack. Sorry, the || should be an &&, of course. Could you fix it? Sorry for the breakage. -Nathan