From nobody Sat Dec 10 18:18:48 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NTx3X4m20z4k6GR; Sat, 10 Dec 2022 18:18:48 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NTx3X45rBz3LlX; Sat, 10 Dec 2022 18:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670696328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uai/GS7yaMFmXs7YsoLQbKbIn2JwGXZ1NjQgfX+KmtA=; b=g4ZVPGKB/B2DtKiXNQj7b3Xqvu8suD0hv9Mpv0CxndMOkWwZsSEjx31vwveU8Gy5iPbxi0 4HsCWw8N58KMPwGspJa5t5R0i3Mjd+iz0d7XxGqTVJYlYhuLjG4AoUY6/x7dwMRIA4J8Uj xf+uQpCIOQIJqW8KHK3pGVF46fasfcW29RZtGV0ZsudKQR7JiVNDZ0CnO6nTUm5WQLWmaT XMnq8t84IKblJ/pVTPSeTqNx7r0zgDwmJdVtojUcLzEM1oBuzKoy+x5TEJfA8Guvya1lB/ tgBmyWJDb7xpWQL0nrA6fsSxFTnbFUIm+uMIQqigDHe7l0Dc/H1AJ39oodDy8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670696328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uai/GS7yaMFmXs7YsoLQbKbIn2JwGXZ1NjQgfX+KmtA=; b=bOCNYc9pOZyCt6h0eJld7aDi2g1RN8PxDqCq05qp4hgfqpttxLcS+vh8lWaW2wSNvlqYpo sXwhgB5colEVSDSwjZMxvt2eQTolJJ5gxmU3jqiAKcJu//fDcRzpVoY2ciF3pnXtAyXn67 Ms5NscoIh4R2B9qoyEzYWAztmKmP7Au37pa/X3WTetmYKjaD4V5mX266ybq9PxVdcbIffm INJ67Yj6FXFkvWzdsyI3FHta4hIwBjQtIaoE/i9UyPr2qD9zBsRNcAzs8NAQg8tDvnhRYR AZHQQIai36ZfSAp+Vp8DpZsck5V91Czzn51NPKq1nz5A+gV6F/NZ0zz2Sk1xxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670696328; a=rsa-sha256; cv=none; b=JuS9nTSBMS6D4HONOgMPkXrO29u8q2wVtUfxmR10rL4vcN00yTFTDVlf8eJreVvIXUtWZb T5jy8TfPVnIukdfTClrsGVLfYpnEBKM6bjdHkxraz2m+I1m1hGA61meM0WaOOilDP1xttA 1upcTiPGWK0XMGAvGU930SYvZ+MaTqj4Z3/qu95OkEROUFT0BZ0m0EbLqGM8b9/Mhrz936 hJyvKGBM+z7CSRHWXFXzAsB2ObCLBYAzRQ+Ssn08qTITEdW+GEXePQVPa78GBD8LL9Nl/t CfQ2UFv8aJbRMxn5epCEMUCtkPyt4J7frwe3jhE6JcciAD23bvSZWHrpbvycbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NTx3X2tnrzPyd; Sat, 10 Dec 2022 18:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BAIImWp061181; Sat, 10 Dec 2022 18:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BAIIms7061180; Sat, 10 Dec 2022 18:18:48 GMT (envelope-from git) Date: Sat, 10 Dec 2022 18:18:48 GMT Message-Id: <202212101818.2BAIIms7061180@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 6df38243af67 - main - graphics/mesa-devel: drop --native-file after c4f8add41d7a List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6df38243af67ebf9ec15e7a39cb60d7e82d007bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6df38243af67ebf9ec15e7a39cb60d7e82d007bc commit 6df38243af67ebf9ec15e7a39cb60d7e82d007bc Author: Jan Beich AuthorDate: 2022-12-10 18:08:24 +0000 Commit: Jan Beich 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//})"/' \