Date: Sat, 14 Jan 2017 14:51:55 +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: r431468 - head/emulators/wine-devel Message-ID: <201701141451.v0EEptOb010087@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Sat Jan 14 14:51:55 2017 New Revision: 431468 URL: https://svnweb.freebsd.org/changeset/ports/431468 Log: Remove a hack against CHOSEN_COMPILER_TYPE actually referring to a different compiler (the system compiler), in particular leading to a GCC vs clang confusion on FreeBSD 9. With FreeBSD 9 gone now, this is no longer needed. (A slightly different hack was in emulators/wine and got removed via one of the "FreeBSD 9 gone" sweeps. With this commit, both ports are now in sync again.) Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Sat Jan 14 14:01:59 2017 (r431467) +++ head/emulators/wine-devel/Makefile Sat Jan 14 14:51:55 2017 (r431468) @@ -123,10 +123,7 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fo CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib PLIST_SUB+= WINE32="@comment " WINE64="" -# 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 ) +.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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701141451.v0EEptOb010087>