Date: Mon, 21 Jan 2019 01:12:27 +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: r490816 - head/emulators/wine Message-ID: <201901210112.x0L1CRpS068421@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Mon Jan 21 01:12:27 2019 New Revision: 490816 URL: https://svnweb.freebsd.org/changeset/ports/490816 Log: Add a new option, GCC, that controls the use of GCC instead of the system compiler (usually clang these days) as we have been doing since r334935 in 2013-11-26. And make that the default, both since there've been user reports about Wine not working properly with the toolchain in FreeBSD 12 and there may be other challenges given that upstream and in other distributions GCC is being used all along. [1] Also backport part of r488645 | gerald | 2018-12-29 01:53:56 from emulators/wine-devel: Create a proper USES block in Makefile, moving the existing USES statement there. PR: 231010 [1] Modified: head/emulators/wine/Makefile Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Sun Jan 20 23:47:35 2019 (r490815) +++ head/emulators/wine/Makefile Mon Jan 21 01:12:27 2019 (r490816) @@ -3,7 +3,7 @@ PORTNAME= wine DISTVERSION= 3.0.4 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -21,6 +21,8 @@ ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex LIB_DEPENDS= libxml2.so:textproc/libxml2 +USES= bison desktop-file-utils gmake localbase shebangfix tar:xz + CONFLICTS_INSTALL= wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \ i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* @@ -41,7 +43,6 @@ CONFIGURE_ARGS+=--verbose \ --without-udev CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" WINELIBDIR?= ${PREFIX}/lib -USES= bison compiler:c11 desktop-file-utils gmake localbase shebangfix tar:xz .if !defined(USE_LDCONFIG32) USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine .endif @@ -52,8 +53,8 @@ SUB_FILES= pkg-message PORTDATA= l_intl.nls wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO -OPTIONS_DEFAULT=GNUTLS X11 +OPTIONS_DEFINE= CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO +OPTIONS_DEFAULT=GCC GNUTLS X11 OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs @@ -106,6 +107,12 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig libpng.so:graphics/png .include <bsd.port.pre.mk> + +.if empty(PORT_OPTIONS:MGCC) +USES+= compiler:c11 +.else +USE_GCC= yes +.endif .if ${ARCH} == amd64 # Wine is composed of three parts:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901210112.x0L1CRpS068421>