git: 114dca16a306 - main - emulators/wine-devel: Keep USE_GCC to fix runtimes issue

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sun, 20 Sep 2026 16:19:35 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=114dca16a3067a633af30b5b8d32a9d0482f54f1

commit 114dca16a3067a633af30b5b8d32a9d0482f54f1
Author:     Thibault Payet <monwarez@mailoo.org>
AuthorDate: 2026-09-20 16:17:50 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-09-20 16:19:31 +0000

    emulators/wine-devel: Keep USE_GCC to fix runtimes issue
    
    err:virtual:try_map_free_area mmap() error Cannot allocate memory, range 0x7fffffee0000-0x7fffffff0000, unix_prot 0x3.
    err:virtual:map_free_area couldn't map free area in range 0x100000000-0x7fffffff0000, size 0x110000
    Assertion failed: (!status), function virtual_alloc_first_thread_data, file dlls/ntdll/unix/virtual.c, line 4130.
    Abort trap (core dumped)
    
    PR:             298678
    Sponsored by:   UNIS Labs (vvd, commit patch)
---
 emulators/wine-devel/Makefile                 |   2 +
 emulators/wine-devel/files/patch-configure.ac |   6 +-
 emulators/wine-devel/pkg-plist                | 247 ++++++++++++++++++++++++++
 3 files changed, 252 insertions(+), 3 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index ea7d903a2599..cbbe367ad8f6 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	wine
 DISTVERSION=	11.18
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/11.x/
@@ -33,6 +34,7 @@ FLAVOR?=	default
 USES=		autoreconf bison cpe desktop-file-utils gmake llvm:min=17,build,noexport \
 		localbase pkgconfig sdl shebangfix tar:xz
 CPE_VENDOR=	winehq
+USE_GCC=	yes
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/wine
 USE_SDL=	sdl2
 
diff --git a/emulators/wine-devel/files/patch-configure.ac b/emulators/wine-devel/files/patch-configure.ac
index bd79e803f323..651193e430d3 100644
--- a/emulators/wine-devel/files/patch-configure.ac
+++ b/emulators/wine-devel/files/patch-configure.ac
@@ -1,7 +1,7 @@
 The intention of this patch is to keep FreeBSD shared libs out of the first 4 GiB of memory in a non-aslr mode (rtld seems to always place them after the executable).
 In aslr-mode the system does that implicitly (probably because that benefits randomization).
 The downside is that we fix the entry main address in the aslr-mode as well, making it entirely predictable, which is against the spirit of aslr.
-Note: -Text-segment is for gcc, --image-base is for clang
+Note: -Text-segment is for gcc, --image-base isn't a strict equivalent for clang
 
 --- configure.ac.orig	2026-09-18 20:36:23 UTC
 +++ configure.ac
@@ -13,12 +13,12 @@ Note: -Text-segment is for gcc, --image-base is for clang
 +        case $HOST_ARCH in
 +          i386|arm)
 +            WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x60000000],
-+                            [AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,--image-base=0x60000000"])],
++                            [AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,-Ttext-segment=0x60000000"])],
 +                            [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x60000400],
 +                                [AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,--section-start,.interp=0x60000400"])])])
 +            ;;
 +          *)
-+            AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,--image-base=0x240000000 -pie"])
++            AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,-Ttext-segment=0x240000000 -pie"])
 +            ;;
 +        esac
 +        ;;
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index d1a3e0d194bf..dc4404f505c1 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -2684,6 +2684,253 @@ lib/wine/%%WINEARCH%%-unix/crypt32.so
 lib/wine/%%WINEARCH%%-unix/ctapi32.so
 lib/wine/%%WINEARCH%%-unix/dnsapi.so
 lib/wine/%%WINEARCH%%-unix/dwrite.so
+lib/wine/%%WINEARCH%%-unix/libaclui.a
+lib/wine/%%WINEARCH%%-unix/libactiveds.a
+lib/wine/%%WINEARCH%%-unix/libadsiid.a
+lib/wine/%%WINEARCH%%-unix/libadvapi32.a
+lib/wine/%%WINEARCH%%-unix/libadvpack.a
+lib/wine/%%WINEARCH%%-unix/libatl.a
+lib/wine/%%WINEARCH%%-unix/libatl100.a
+lib/wine/%%WINEARCH%%-unix/libatl110.a
+lib/wine/%%WINEARCH%%-unix/libatl80.a
+lib/wine/%%WINEARCH%%-unix/libatlthunk.a
+lib/wine/%%WINEARCH%%-unix/libavicap32.a
+lib/wine/%%WINEARCH%%-unix/libavifil32.a
+lib/wine/%%WINEARCH%%-unix/libavrt.a
+lib/wine/%%WINEARCH%%-unix/libbcp47langs.a
+lib/wine/%%WINEARCH%%-unix/libbcrypt.a
+lib/wine/%%WINEARCH%%-unix/libbluetoothapis.a
+lib/wine/%%WINEARCH%%-unix/libcabinet.a
+lib/wine/%%WINEARCH%%-unix/libcards.a
+lib/wine/%%WINEARCH%%-unix/libcfgmgr32.a
+lib/wine/%%WINEARCH%%-unix/libclusapi.a
+lib/wine/%%WINEARCH%%-unix/libcombase.a
+lib/wine/%%WINEARCH%%-unix/libcomctl32.a
+lib/wine/%%WINEARCH%%-unix/libcomdlg32.a
+lib/wine/%%WINEARCH%%-unix/libcoml2.a
+lib/wine/%%WINEARCH%%-unix/libcompstui.a
+lib/wine/%%WINEARCH%%-unix/libcomsvcs.a
+lib/wine/%%WINEARCH%%-unix/libcoremessaging.a
+lib/wine/%%WINEARCH%%-unix/libcredui.a
+lib/wine/%%WINEARCH%%-unix/libcrypt32.a
+lib/wine/%%WINEARCH%%-unix/libcryptdll.a
+lib/wine/%%WINEARCH%%-unix/libcryptnet.a
+lib/wine/%%WINEARCH%%-unix/libcryptsp.a
+lib/wine/%%WINEARCH%%-unix/libcryptui.a
+lib/wine/%%WINEARCH%%-unix/libcryptxml.a
+lib/wine/%%WINEARCH%%-unix/libd2d1.a
+lib/wine/%%WINEARCH%%-unix/libd3d10.a
+lib/wine/%%WINEARCH%%-unix/libd3d10_1.a
+lib/wine/%%WINEARCH%%-unix/libd3d10core.a
+lib/wine/%%WINEARCH%%-unix/libd3d11.a
+lib/wine/%%WINEARCH%%-unix/libd3d12.a
+lib/wine/%%WINEARCH%%-unix/libd3d9.a
+lib/wine/%%WINEARCH%%-unix/libd3dcompiler.a
+lib/wine/%%WINEARCH%%-unix/libd3dcompiler_39.a
+lib/wine/%%WINEARCH%%-unix/libd3dcompiler_42.a
+lib/wine/%%WINEARCH%%-unix/libd3dcompiler_43.a
+lib/wine/%%WINEARCH%%-unix/libd3dcompiler_46.a
+lib/wine/%%WINEARCH%%-unix/libd3drm.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_33.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_34.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_35.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_36.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_37.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_38.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_39.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_40.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_41.a
+lib/wine/%%WINEARCH%%-unix/libd3dx10_42.a
+lib/wine/%%WINEARCH%%-unix/libd3dx11.a
+lib/wine/%%WINEARCH%%-unix/libd3dx11_42.a
+lib/wine/%%WINEARCH%%-unix/libd3dx9.a
+lib/wine/%%WINEARCH%%-unix/libd3dx9_35.a
+lib/wine/%%WINEARCH%%-unix/libd3dx9_42.a
+lib/wine/%%WINEARCH%%-unix/libd3dx9_43.a
+lib/wine/%%WINEARCH%%-unix/libd3dxof.a
+lib/wine/%%WINEARCH%%-unix/libdbgeng.a
+lib/wine/%%WINEARCH%%-unix/libdbghelp.a
+lib/wine/%%WINEARCH%%-unix/libdciman32.a
+lib/wine/%%WINEARCH%%-unix/libddraw.a
+lib/wine/%%WINEARCH%%-unix/libdhcpcsvc.a
+lib/wine/%%WINEARCH%%-unix/libdinput.a
+lib/wine/%%WINEARCH%%-unix/libdinput8.a
+lib/wine/%%WINEARCH%%-unix/libdmoguids.a
+lib/wine/%%WINEARCH%%-unix/libdnsapi.a
+lib/wine/%%WINEARCH%%-unix/libdpnet.a
+lib/wine/%%WINEARCH%%-unix/libdsound.a
+lib/wine/%%WINEARCH%%-unix/libdwmapi.a
+lib/wine/%%WINEARCH%%-unix/libdwrite.a
+lib/wine/%%WINEARCH%%-unix/libdxerr8.a
+lib/wine/%%WINEARCH%%-unix/libdxerr9.a
+lib/wine/%%WINEARCH%%-unix/libdxgi.a
+lib/wine/%%WINEARCH%%-unix/libdxguid.a
+lib/wine/%%WINEARCH%%-unix/libdxva2.a
+lib/wine/%%WINEARCH%%-unix/libevr.a
+lib/wine/%%WINEARCH%%-unix/libfaultrep.a
+lib/wine/%%WINEARCH%%-unix/libfltmgr.a
+lib/wine/%%WINEARCH%%-unix/libgdi32.a
+lib/wine/%%WINEARCH%%-unix/libgdiplus.a
+lib/wine/%%WINEARCH%%-unix/libglu32.a
+lib/wine/%%WINEARCH%%-unix/libhal.a
+lib/wine/%%WINEARCH%%-unix/libhid.a
+lib/wine/%%WINEARCH%%-unix/libhidclass.a
+lib/wine/%%WINEARCH%%-unix/libhidparse.a
+lib/wine/%%WINEARCH%%-unix/libhlink.a
+lib/wine/%%WINEARCH%%-unix/libhtmlhelp.a
+lib/wine/%%WINEARCH%%-unix/libhttpapi.a
+lib/wine/%%WINEARCH%%-unix/libicmui.a
+lib/wine/%%WINEARCH%%-unix/libicu.a
+lib/wine/%%WINEARCH%%-unix/libieframe.a
+lib/wine/%%WINEARCH%%-unix/libiertutil.a
+lib/wine/%%WINEARCH%%-unix/libimagehlp.a
+lib/wine/%%WINEARCH%%-unix/libimm32.a
+lib/wine/%%WINEARCH%%-unix/libinetcomm.a
+lib/wine/%%WINEARCH%%-unix/libiphlpapi.a
+lib/wine/%%WINEARCH%%-unix/libjsproxy.a
+lib/wine/%%WINEARCH%%-unix/libkernel32.a
+lib/wine/%%WINEARCH%%-unix/libkernelbase.a
+lib/wine/%%WINEARCH%%-unix/libloadperf.a
+lib/wine/%%WINEARCH%%-unix/liblz32.a
+lib/wine/%%WINEARCH%%-unix/libmapi32.a
+lib/wine/%%WINEARCH%%-unix/libmf.a
+lib/wine/%%WINEARCH%%-unix/libmfplat.a
+lib/wine/%%WINEARCH%%-unix/libmfplay.a
+lib/wine/%%WINEARCH%%-unix/libmfreadwrite.a
+lib/wine/%%WINEARCH%%-unix/libmfsrcsnk.a
+lib/wine/%%WINEARCH%%-unix/libmfuuid.a
+lib/wine/%%WINEARCH%%-unix/libmlang.a
+lib/wine/%%WINEARCH%%-unix/libmpr.a
+lib/wine/%%WINEARCH%%-unix/libmprapi.a
+lib/wine/%%WINEARCH%%-unix/libmsacm32.a
+lib/wine/%%WINEARCH%%-unix/libmsasn1.a
+lib/wine/%%WINEARCH%%-unix/libmscms.a
+lib/wine/%%WINEARCH%%-unix/libmsdmo.a
+lib/wine/%%WINEARCH%%-unix/libmshtml.a
+lib/wine/%%WINEARCH%%-unix/libmsi.a
+lib/wine/%%WINEARCH%%-unix/libmsimg32.a
+lib/wine/%%WINEARCH%%-unix/libmspatcha.a
+lib/wine/%%WINEARCH%%-unix/libmsvcp140.a
+lib/wine/%%WINEARCH%%-unix/libmsvcr100.a
+lib/wine/%%WINEARCH%%-unix/libmsvcr110.a
+lib/wine/%%WINEARCH%%-unix/libmsvcr120.a
+lib/wine/%%WINEARCH%%-unix/libmsvcr80.a
+lib/wine/%%WINEARCH%%-unix/libmsvcr90.a
+lib/wine/%%WINEARCH%%-unix/libmsvcrt.a
+lib/wine/%%WINEARCH%%-unix/libmsvfw32.a
+lib/wine/%%WINEARCH%%-unix/libmswsock.a
+lib/wine/%%WINEARCH%%-unix/libncrypt.a
+lib/wine/%%WINEARCH%%-unix/libnddeapi.a
+lib/wine/%%WINEARCH%%-unix/libnetapi32.a
+lib/wine/%%WINEARCH%%-unix/libnetio.a
+lib/wine/%%WINEARCH%%-unix/libnetutils.a
+lib/wine/%%WINEARCH%%-unix/libnewdev.a
+lib/wine/%%WINEARCH%%-unix/libninput.a
+lib/wine/%%WINEARCH%%-unix/libnormaliz.a
+lib/wine/%%WINEARCH%%-unix/libnsi.a
+lib/wine/%%WINEARCH%%-unix/libntdll.a
+lib/wine/%%WINEARCH%%-unix/libntdsapi.a
+lib/wine/%%WINEARCH%%-unix/libntoskrnl.a
+lib/wine/%%WINEARCH%%-unix/libodbc32.a
+lib/wine/%%WINEARCH%%-unix/libodbccp32.a
+lib/wine/%%WINEARCH%%-unix/libole32.a
+lib/wine/%%WINEARCH%%-unix/liboleacc.a
+lib/wine/%%WINEARCH%%-unix/liboleaut32.a
+lib/wine/%%WINEARCH%%-unix/liboledlg.a
+lib/wine/%%WINEARCH%%-unix/libolesvr32.a
+lib/wine/%%WINEARCH%%-unix/libopengl32.a
+lib/wine/%%WINEARCH%%-unix/libpdh.a
+lib/wine/%%WINEARCH%%-unix/libpowrprof.a
+lib/wine/%%WINEARCH%%-unix/libprntvpt.a
+lib/wine/%%WINEARCH%%-unix/libpropsys.a
+lib/wine/%%WINEARCH%%-unix/libpsapi.a
+lib/wine/%%WINEARCH%%-unix/libquartz.a
+lib/wine/%%WINEARCH%%-unix/libqwave.a
+lib/wine/%%WINEARCH%%-unix/librasapi32.a
+lib/wine/%%WINEARCH%%-unix/librasdlg.a
+lib/wine/%%WINEARCH%%-unix/libresutils.a
+lib/wine/%%WINEARCH%%-unix/libriched20.a
+lib/wine/%%WINEARCH%%-unix/librometadata.a
+lib/wine/%%WINEARCH%%-unix/librpcrt4.a
+lib/wine/%%WINEARCH%%-unix/librsaenh.a
+lib/wine/%%WINEARCH%%-unix/librtutils.a
+lib/wine/%%WINEARCH%%-unix/librtworkq.a
+lib/wine/%%WINEARCH%%-unix/libscrrun.a
+lib/wine/%%WINEARCH%%-unix/libsechost.a
+lib/wine/%%WINEARCH%%-unix/libsecur32.a
+lib/wine/%%WINEARCH%%-unix/libsensapi.a
+lib/wine/%%WINEARCH%%-unix/libsetupapi.a
+lib/wine/%%WINEARCH%%-unix/libsfc.a
+lib/wine/%%WINEARCH%%-unix/libsfc_os.a
+lib/wine/%%WINEARCH%%-unix/libshcore.a
+lib/wine/%%WINEARCH%%-unix/libshdocvw.a
+lib/wine/%%WINEARCH%%-unix/libshell32.a
+lib/wine/%%WINEARCH%%-unix/libshfolder.a
+lib/wine/%%WINEARCH%%-unix/libshlwapi.a
+lib/wine/%%WINEARCH%%-unix/libslc.a
+lib/wine/%%WINEARCH%%-unix/libsnmpapi.a
+lib/wine/%%WINEARCH%%-unix/libspoolss.a
+lib/wine/%%WINEARCH%%-unix/libsti.a
+lib/wine/%%WINEARCH%%-unix/libstrmbase.a
+lib/wine/%%WINEARCH%%-unix/libstrmiids.a
+lib/wine/%%WINEARCH%%-unix/libstrsafe.a
+lib/wine/%%WINEARCH%%-unix/libsxs.a
+lib/wine/%%WINEARCH%%-unix/libt2embed.a
+lib/wine/%%WINEARCH%%-unix/libtapi32.a
+lib/wine/%%WINEARCH%%-unix/libtdh.a
+lib/wine/%%WINEARCH%%-unix/libtwaindsm.a
+lib/wine/%%WINEARCH%%-unix/libucrtbase.a
+lib/wine/%%WINEARCH%%-unix/libuiautomationcore.a
+lib/wine/%%WINEARCH%%-unix/libunicows.a
+lib/wine/%%WINEARCH%%-unix/liburl.a
+lib/wine/%%WINEARCH%%-unix/liburlmon.a
+lib/wine/%%WINEARCH%%-unix/libusbd.a
+lib/wine/%%WINEARCH%%-unix/libuser32.a
+lib/wine/%%WINEARCH%%-unix/libuserenv.a
+lib/wine/%%WINEARCH%%-unix/libusp10.a
+lib/wine/%%WINEARCH%%-unix/libuuid.a
+lib/wine/%%WINEARCH%%-unix/libuxtheme.a
+lib/wine/%%WINEARCH%%-unix/libvcruntime140.a
+lib/wine/%%WINEARCH%%-unix/libversion.a
+lib/wine/%%WINEARCH%%-unix/libvulkan-1.a
+lib/wine/%%WINEARCH%%-unix/libwbemuuid.a
+lib/wine/%%WINEARCH%%-unix/libwebservices.a
+lib/wine/%%WINEARCH%%-unix/libwer.a
+lib/wine/%%WINEARCH%%-unix/libwevtapi.a
+lib/wine/%%WINEARCH%%-unix/libwin32u.a
+lib/wine/%%WINEARCH%%-unix/libwindowscodecs.a
+lib/wine/%%WINEARCH%%-unix/libwindowscodecsext.a
+lib/wine/%%WINEARCH%%-unix/libwinecrt0.a
+lib/wine/%%WINEARCH%%-unix/libwined3d.a
+lib/wine/%%WINEARCH%%-unix/libwinedmo.a
+lib/wine/%%WINEARCH%%-unix/libwinegstreamer.a
+lib/wine/%%WINEARCH%%-unix/libwinevulkan.a
+lib/wine/%%WINEARCH%%-unix/libwing32.a
+lib/wine/%%WINEARCH%%-unix/libwinhttp.a
+lib/wine/%%WINEARCH%%-unix/libwininet.a
+lib/wine/%%WINEARCH%%-unix/libwinmm.a
+lib/wine/%%WINEARCH%%-unix/libwinnls32.a
+lib/wine/%%WINEARCH%%-unix/libwinspool.a
+lib/wine/%%WINEARCH%%-unix/libwinsqlite3.a
+lib/wine/%%WINEARCH%%-unix/libwintab32.a
+lib/wine/%%WINEARCH%%-unix/libwintrust.a
+lib/wine/%%WINEARCH%%-unix/libwintypes.a
+lib/wine/%%WINEARCH%%-unix/libwkscli.a
+lib/wine/%%WINEARCH%%-unix/libwlanapi.a
+lib/wine/%%WINEARCH%%-unix/libwldap32.a
+lib/wine/%%WINEARCH%%-unix/libwmcodecdspuuid.a
+lib/wine/%%WINEARCH%%-unix/libwmvcore.a
+lib/wine/%%WINEARCH%%-unix/libwnaspi32.a
+lib/wine/%%WINEARCH%%-unix/libwow64.a
+lib/wine/%%WINEARCH%%-unix/libws2_32.a
+lib/wine/%%WINEARCH%%-unix/libwsdapi.a
+lib/wine/%%WINEARCH%%-unix/libwsnmp32.a
+lib/wine/%%WINEARCH%%-unix/libwsock32.a
+lib/wine/%%WINEARCH%%-unix/libwtsapi32.a
+lib/wine/%%WINEARCH%%-unix/libxaudio2_8.a
+lib/wine/%%WINEARCH%%-unix/libxinput.a
+lib/wine/%%WINEARCH%%-unix/libxmllite.a
 lib/wine/%%WINEARCH%%-unix/localspl.so
 lib/wine/%%WINEARCH%%-unix/mountmgr.so
 lib/wine/%%WINEARCH%%-unix/msv1_0.so