From owner-svn-ports-branches@freebsd.org  Sun May 15 14:08:36 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@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 2789AB3BCC8;
 Sun, 15 May 2016 14:08:36 +0000 (UTC)
 (envelope-from gerald@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 DEEBD18D1;
 Sun, 15 May 2016 14:08:35 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FE8ZfH054092;
 Sun, 15 May 2016 14:08:35 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FE8ZC6054091;
 Sun, 15 May 2016 14:08:35 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <201605151408.u4FE8ZC6054091@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gerald set sender to
 gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sun, 15 May 2016 14:08:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r415230 - branches/2016Q2/emulators/wine
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 May 2016 14:08:36 -0000

Author: gerald
Date: Sun May 15 14:08:34 2016
New Revision: 415230
URL: https://svnweb.freebsd.org/changeset/ports/415230

Log:
  Fix the build on FreeBSD 9.x by backporting r413495 and r413496 from
  mainline after a month:
  
    Force the use of GCC where it is the system compiler since
    COMPILER_VERSION will be 42 (the GCC version) even if clang
    is CHOSEN_COMPILER_TYPE in that case.
  
  PR:		206527
  Approved by:	portmgr (blanket for build fixes)

Modified:
  branches/2016Q2/emulators/wine/Makefile

Modified: branches/2016Q2/emulators/wine/Makefile
==============================================================================
--- branches/2016Q2/emulators/wine/Makefile	Sun May 15 13:07:43 2016	(r415229)
+++ branches/2016Q2/emulators/wine/Makefile	Sun May 15 14:08:34 2016	(r415230)
@@ -119,11 +119,18 @@ X11_LIB_DEPENDS=	libfontconfig.so:x11-fo
 CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
 PLIST_SUB+=		WINE32="@comment " WINE64=""
 
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38
+# Force the use of GCC where it is the system compiler since
+# COMPILER_VERSION will be 42 (the GCC version) even if clang
+# is CHOSEN_COMPILER_TYPE in that case.
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
+USE_GCC=		yes
+.else
+. if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38
 CPPFLAGS+=		-D__builtin_ms_va_list=__builtin_va_list \
 			-D__builtin_ms_va_start=__builtin_va_start \
 			-D__builtin_ms_va_end=__builtin_va_end \
 			-D__builtin_ms_va_copy=__builtin_va_copy
+. endif
 .endif
 
 # Wine assumes a WoW64 package is available however WoW64 is not yet available on FreeBSD.