Date: Tue, 16 Feb 2016 13:56:25 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408996 - head/emulators/wine-devel Message-ID: <201602161356.u1GDuPS3017648@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Tue Feb 16 13:56:24 2016 New Revision: 408996 URL: https://svnweb.freebsd.org/changeset/ports/408996 Log: On FreeBSD 9.x, even when CHOSEN_COMPILER_TYPE from Mk/Uses/compiler.mk is set to clang, COMPILER_VERSION is still at 42 from the system compiler that is GCC 4.2. Work around this for the time being, while retaining the fix from PR 206527, by special casing this situation. PR: 206527 Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Tue Feb 16 13:46:45 2016 (r408995) +++ head/emulators/wine-devel/Makefile Tue Feb 16 13:56:24 2016 (r408996) @@ -120,7 +120,10 @@ X11_LIB_DEPENDS= libfontconfig.so:${PORT CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib PLIST_SUB+= WINE32="@comment " WINE64="" -.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38 +# On FreeBSD 9.x, even when CHOSEN_COMPILER_TYPE from Mk/Uses/compiler.mk +# is set to clang, COMPILER_VERSION is still at 42 from the system compiler +# that is GCC 4.2. Hack around this a bit. +.if ${CHOSEN_COMPILER_TYPE} == clang && ( ${COMPILER_VERSION} < 38 || ${COMPILER_VERSION} == 42 ) 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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602161356.u1GDuPS3017648>