Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Jan 2021 14:26:13 +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: r560399 - head/emulators/wine
Message-ID:  <202101051426.105EQDZQ092133@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Tue Jan  5 14:26:13 2021
New Revision: 560399
URL: https://svnweb.freebsd.org/changeset/ports/560399

Log:
  Remove the GCC option. which has been the default all along, and simply
  use GCC.
  
  This avoids troubles for users disabling the option and then encountering
  failures without knowing how to go about that. (And there is not much one
  can even do given upstream focuses on GCC.)
  
  PR:		242202

Modified:
  head/emulators/wine/Makefile

Modified: head/emulators/wine/Makefile
==============================================================================
--- head/emulators/wine/Makefile	Tue Jan  5 14:14:48 2021	(r560398)
+++ head/emulators/wine/Makefile	Tue Jan  5 14:26:13 2021	(r560399)
@@ -22,6 +22,7 @@ LIB_DEPENDS=	libFAudio.so:audio/faudio \
 		libxml2.so:textproc/libxml2
 
 USES=		bison desktop-file-utils gmake localbase pkgconfig shebangfix tar:xz
+USE_GCC=	yes
 
 CONFLICTS_INSTALL=	wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \
 			i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
@@ -57,8 +58,8 @@ SUB_FILES=	pkg-message
 
 PORTDATA=	l_intl.nls wine.inf
 
-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL SDL V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
-OPTIONS_DEFAULT=GCC GNUTLS X11
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL SDL V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
+OPTIONS_DEFAULT=GNUTLS X11
 OPTIONS_SUB=	yes
 
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
@@ -76,9 +77,6 @@ CUPS_CONFIGURE_WITH=	cups
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
-
-GCC_USE=		gcc=yes
-GCC_USES_OFF=		compiler:c11
 
 GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine-gecko-2.47.1-x86.msi:emulators/wine-gecko
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101051426.105EQDZQ092133>