From nobody Wed Dec 14 12:32:08 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 4NXF9h2Qfwz4kWFb; Wed, 14 Dec 2022 12:32:08 +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 4NXF9h1tMmz4JPD; Wed, 14 Dec 2022 12:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671021128; 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=yt/PnV4aQXxEfF0vsqfFDgHXC7Cvwk2bvCrf0KxDyGQ=; b=bfvFmwHuV5y1yXHBSz/ibBBjejFIphbhFmi63TK37XUKRM8GA05gJD4yoSkdY4OURm/0+z Bn99aArfC2VXxnIufMNreb6ysyF61GnN5NrZm3KPJC1M0+8zyGpC5oaFvbW6Mt71EUwQzr UMFwu/kN7ZiDcBE+j1+Qua2b9xsxZBk2eETKlxr+dH0EltLn3k4fqTx9OcZ4lnbgTU+AIx abTya5Vx8Br0hnvB8m8Uqsa4XSer4pl29VVJKQMwsSA1Zx4Q8GOk1j4IQRvsxdleERmKpA ClVquVdNQAd/YPg3RPpLphbiayuEDDr6WaGtZK6mEYEO1C6Uu92HTk5tW73log== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671021128; 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=yt/PnV4aQXxEfF0vsqfFDgHXC7Cvwk2bvCrf0KxDyGQ=; b=mhooRfE8V2D5rMk9bq+33zf4JCDAnzfXHeAufocU2e1wOwjqrwMiptVUtdstYbWyVvB+/V XqZLoBzqmZ7XGcdYuYYiL7em4GgIbquJfDwmOAU+1Q2OibapvLcxhldBZKDRn5KQ5PeQ1P AJdiHBYMymR+s6VzKIZhSAHHmRYBye2YtOF5iTnnKG6wahB7OuZoOQTXlHx4QEPNOwzzNV YQSQekAUMi44t0sg4Jk4aQwn8F5Ds1qkeIcy1rqHC9A5eHmaV4ad7h/I9we5sABl4+PkZ9 PUQnMYSWmWu/4hPtvt69k4Qmc6oGIr9a4gX/M7i53cUYsJhtQGoIp/wKYbQL9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671021128; a=rsa-sha256; cv=none; b=QlW94oKrPCvMcm6W8oY2/M8ea7ICzdMWgmd08N5ePNpFRT8SvzI9Ke4VGmxDgNkMW8k6gG +SVPRcuhAk14vPDOfghQfNdjMaAd3+Y/PGTqGvSmbtsKaTQSnE79iVGQORmUepD7hNDWlr m/I5cjbvqGsNbCMmswR561D4zo25tUg9bgw6cHFJaIRQQmzf7ofwz/xM/XjbQziWmcBByc f+ujeIe5PuSyFA+AOtHHwI1Y03xzoYDEWtzTUEA8SvCFT+MZNkoqsC4ymUc+99dHAroPke yS58xl5V4mMAPoBMOi++XrK3sXym2KJvqCuWh1CKCAyNSG6f3Q2PBAjqxOr/nQ== 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 4NXF9h0xcvzt89; Wed, 14 Dec 2022 12:32:08 +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 2BECW81A017837; Wed, 14 Dec 2022 12:32:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BECW8wR017836; Wed, 14 Dec 2022 12:32:08 GMT (envelope-from git) Date: Wed, 14 Dec 2022 12:32:08 GMT Message-Id: <202212141232.2BECW8wR017836@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: dfe189dac467 - main - graphics/mesa-dri: respect LLVM_DEFAULT after e70ff172c205 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: dfe189dac4672b707b5a59538c63267773640c99 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfe189dac4672b707b5a59538c63267773640c99 commit dfe189dac4672b707b5a59538c63267773640c99 Author: Jan Beich AuthorDate: 2022-12-14 11:23:38 +0000 Commit: Jan Beich CommitDate: 2022-12-14 12:04:26 +0000 graphics/mesa-dri: respect LLVM_DEFAULT after e70ff172c205 Meson probes FreeBSD suffixes[1] for llvm-config but ends up selecting the last match instead of the unsuffixed version. So, replace BINARY_ALIAS with recently introduced[2] ad hoc environ(7) variable. [1] https://github.com/mesonbuild/meson/blob/0.64.1/mesonbuild/environment.py#L159-L177 [2] https://github.com/mesonbuild/meson/commit/2c1ac8ac1ddb Approved by: manu (on dev-commits-ports-main@ list) --- graphics/mesa-dri/Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index f45f8d7250ff..b2ac1088bf5d 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -85,7 +85,7 @@ BINARY_ALIAS+= python3=${PYTHON_VERSION} LLVM_DEFAULT= 15 BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -BINARY_ALIAS+= llvm-config=llvm-config${LLVM_DEFAULT} +CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib MESON_ARGS+= -Dllvm=enabled