From owner-svn-ports-all@freebsd.org Tue Jan 5 14:26:14 2021
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 356C14E6515;
Tue, 5 Jan 2021 14:26:14 +0000 (UTC)
(envelope-from gerald@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4D9FD610fCz4WrM;
Tue, 5 Jan 2021 14:26:14 +0000 (UTC)
(envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 116125E0D;
Tue, 5 Jan 2021 14:26:14 +0000 (UTC)
(envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 105EQDR7092134;
Tue, 5 Jan 2021 14:26:13 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 105EQDZQ092133;
Tue, 5 Jan 2021 14:26:13 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <202101051426.105EQDZQ092133@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gerald set sender to
gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Tue, 5 Jan 2021 14:26:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r560399 - head/emulators/wine
X-SVN-Group: ports-head
X-SVN-Commit-Author: gerald
X-SVN-Commit-Paths: head/emulators/wine
X-SVN-Commit-Revision: 560399
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2021 14:26:14 -0000
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