From owner-dev-commits-ports-branches@freebsd.org Tue Jun 22 18:26:10 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 5219866147F; Tue, 22 Jun 2021 18:26:10 +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 4G8ZbQ0P82z3mBm; Tue, 22 Jun 2021 18:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EB7481585C; Tue, 22 Jun 2021 18:26:09 +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 15MIQ9o8001917; Tue, 22 Jun 2021 18:26:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15MIQ9OZ001916; Tue, 22 Jun 2021 18:26:09 GMT (envelope-from git) Date: Tue, 22 Jun 2021 18:26:09 GMT Message-Id: <202106221826.15MIQ9OZ001916@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 99d908b22ee6 - 2021Q2 - graphics/mesa-devel: unbreak standalone after e502b6db284d0 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/2021Q2 X-Git-Reftype: branch X-Git-Commit: 99d908b22ee60aff6bad4d92f4b3ec14343d10c4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2021 18:26:10 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=99d908b22ee60aff6bad4d92f4b3ec14343d10c4 commit 99d908b22ee60aff6bad4d92f4b3ec14343d10c4 Author: Jan Beich AuthorDate: 2021-06-22 17:39:44 +0000 Commit: Jan Beich CommitDate: 2021-06-22 18:20:35 +0000 graphics/mesa-devel: unbreak standalone after e502b6db284d0 llvm-config found: NO found '9.0.1' but need '>= 11.0.0' Run-time dependency LLVM found: NO (tried cmake and config-tool) Looking for a fallback subproject for the dependency llvm (modules: bitwriter, engine, mcdisassembler, mcjit, core, executionengine, scalaropts, transformutils, instcombine, amdgpu, native, bitreader, ipo, asmparser) meson.build:1604:2: ERROR: Neither a subproject directory nor a llvm.wrap file was found. (cherry picked from commit b0b997e3fc350bd39184128d1ec9434893e819d1) --- graphics/mesa-devel/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index bed053d28028..d792a5a272b2 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -93,7 +93,6 @@ anv_DESC= Haswell and newer radv_DESC= Southern Islands and newer (implies LLVM) COINST_DESC= Allow co-installation with another Mesa port -COINST_VARS= LLVM_DEFAULT=11 # chase intel-compute-runtime COINST_MESON_ON= -Degl-lib-suffix=${PKGNAMESUFFIX} COINST_PLIST_SUB= SUFFIX=${PKGNAMESUFFIX} COINST_SUB_FILES= libmap.conf @@ -145,6 +144,13 @@ ZSTD_DESC= Use ZSTD for shader cache ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MESON_ENABLED= zstd +.include + +# Ignore Mk/bsd.default-versions.mk but respect make.conf(5) +.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} +LLVM_DEFAULT= 11 # chase intel-compute-runtime +.endif + post-extract: # Work around Meson lookup order e.g., llvm-config .if defined(BINARY_ALIAS)