svn commit: r561610 - head/emulators/wine-devel

[Gerald Pfeifer]

Author: gerald
Date: Thu Jan 14 22:58:34 2021
New Revision: 561610
URL: https://svnweb.freebsd.org/changeset/ports/561610

Log:
  Forward port r560399 | gerald | 2021-01-05 from emulators/wine:
  
    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-devel/Makefile

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Thu Jan 14 22:55:27 2021	(r561609)
+++ head/emulators/wine-devel/Makefile	Thu Jan 14 22:58:34 2021	(r561610)
@@ -24,6 +24,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-[0-9]* i386-wine-[0-9]* i386-wine-devel-[0-9]*
 
@@ -58,8 +59,8 @@ SUB_FILES=	pkg-message
 
 PORTDATA=	wine.inf
 
-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL SDL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
-OPTIONS_DEFAULT=GCC GNUTLS X11
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL SDL STAGING 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.2-x86.msi:emulators/wine-gecko-devel