diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2024-07-03 12:08:37 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2024-07-03 12:09:54 +0000 |
| commit | b65e6c38fd055e913a4ce458d5c774c715a5ea9b (patch) | |
| tree | 015a6fbe8ac42c267e22ae4c62475ff7c9376224 /emulators | |
| parent | security/tailscale: Update to 1.68.2 (diff) | |
emulators/wine: Firmly depend on LLVM 15
Our devel/llvm18 and devel/llvm17 ports (with commits c56fde6514 and
b21e6b4de1, respectively) now provide C99 include files.[1] This is
a positive and fixes a long standing issue. It significantly changes
what Wine builds, though. For emulators/wine-devel we moved to the new
world order already; for emulators/wine remain a bit more conservative
and stay with status quo ante by firmly using LLVM 15.
For most users this won't make any difference since so far we have
been using LLVM_DEFAULT which currently stands at ... 15.
On the way use the new USES=llvm facility instead of doing things
more manually.
PR: 279677, 274542 [1]
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine/Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index d3634d60a802..af0135ab95e2 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -15,9 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION} +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex -USES= bison cpe desktop-file-utils gmake localbase \ +USES= bison cpe desktop-file-utils gmake \ + llvm:15,build,noexport localbase \ pkgconfig sdl shebangfix tar:xz USE_GCC= yes USE_SDL= sdl2 @@ -60,8 +61,8 @@ USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ tools/winedump/function_grep.pl -BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${_LLVM_VERSION} \ - lld-link=${LOCALBASE}/bin/lld-link${_LLVM_VERSION} +BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${LLVM_VERSION} \ + lld-link=${LOCALBASE}/bin/lld-link${LLVM_VERSION} SUB_FILES= pkg-message @@ -125,12 +126,6 @@ CONFIGURE_ARGS+= --without-gstreamer PLIST_SUB+= GSTREAMER="@comment " .endif -.if ${LLVM_DEFAULT} == 11 -_LLVM_VERSION= 15 -.else -_LLVM_VERSION= ${LLVM_DEFAULT} -.endif - .if ${ARCH} == amd64 # Wine is composed of three parts: # - wine (aka this port on FreeBSD/i386) is the 32-bit component |