Date: Sun, 15 May 2016 14:08:35 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415230 - branches/2016Q2/emulators/wine Message-ID: <201605151408.u4FE8ZC6054091@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605151408.u4FE8ZC6054091>