git: 6df38243af67 - main - graphics/mesa-devel: drop --native-file after c4f8add41d7a
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 10 Dec 2022 18:18:48 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6df38243af67ebf9ec15e7a39cb60d7e82d007bc
commit 6df38243af67ebf9ec15e7a39cb60d7e82d007bc
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-12-10 18:08:24 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-12-10 18:13:35 +0000
graphics/mesa-devel: drop --native-file after c4f8add41d7a
https://github.com/mesonbuild/meson/commit/2c1ac8ac1ddb
This reverts commit b460e08f936590cd10b51f35bafcab0df1063386.
---
graphics/mesa-devel/Makefile | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index e9dc2756c18f..5f0bad00a309 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -43,7 +43,6 @@ MESON_ARGS= -Dgallium-omx=disabled \
-Dgallium-xa=disabled \
-Dglvnd=true \
-Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \
- ${BINARY_ALIAS:D--native-file=binary_alias.ini} \
${NULL}
PLIST_SUB= ARCH=${ARCH:S/amd/x86_/}
@@ -97,8 +96,8 @@ LIBUNWIND_MESON_ENABLED= libunwind
LLVM_DESC= Build with LLVM support (see implies)
LLVM_LIB_DEPENDS= libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/:S/-devel/16git/}.so:devel/llvm${LLVM_DEFAULT}
+LLVM_CONFIGURE_ENV= LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
LLVM_MESON_ENABLED= llvm
-LLVM_BINARY_ALIAS= llvm-config=llvm-config${LLVM_DEFAULT}
.for i in r600 radeonsi radv
${i}_IMPLIES+= LLVM
.endfor
@@ -140,15 +139,6 @@ ZSTD_MESON_ENABLED= zstd
LLVM_DEFAULT= 15 # chase mesa-dri
.endif
-post-extract:
-# Work around Meson lookup order e.g., llvm-config
-.if defined(BINARY_ALIAS)
- @${ECHO_CMD} '[binaries]' >${WRKSRC}/binary_alias.ini
- @for f in ${BINARY_ALIAS}; do \
- ${ECHO_CMD} "$${f%%=*} = '$${f#*=}'"; \
- done >>${WRKSRC}/binary_alias.ini
-.endif
-
post-patch:
# Extract (snapshot) version from the port instead of empty string
@${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \