From nobody Fri Mar 29 12:54:02 2024
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 4V5gMb0brWz5GGL6;
Fri, 29 Mar 2024 12:54:03 +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 4V5gMZ71Pmz43l0;
Fri, 29 Mar 2024 12:54:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1711716843;
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=VNTcKKSlVxo+QL4bxOKQY5o1EOHC8gu61zd1HrRLZSQ=;
b=AQza9UvmZtBYc7aYbBX3HVqIZoAc7VGbmlhyuRy9edul0aPXEtie6M3U4TKOWE/awh8Eoa
/7nLaCn6RTcl/30ELxJnp+4TixhIzl5WL0bsPHsnStWXUUfa3wJwX2x7NR9GXTzdYlGtFM
pbcCe/1JG6pAbOra9Qv0d2XlBs6MRI5hzFpRWtPG7zBxxHZfqq0uy6hxaZ225Fn7YuDP10
TZ6xIswUOg2k4C/RgLOZPt01SOYtKNrFniMBc9yCS/ESMrVXTDkn3taJG0rO0LQVICMwsY
pENQUO9gpr4Jr+OEoSXaugrRWS4ltgpIJL+V6ydwfClVt+uNVGsAdbaZg/FLrQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711716843; a=rsa-sha256; cv=none;
b=Wl75xOkl8RzYaAxD2apekJqwyns89eJYDkqudJXs4+/sTmZ5gklt4e2M6wiDMCLxsAN26X
U8MX+FhMDqCbyQzb8hRp10g+bYNzNhvOHO1K5SPbMLb2DhCzO44swTraBf1s8tH6NfNGMG
Ot3tQCcuhpNLls/U81QxClgYET3J55A+5yU2LOL0ss9BVlGOY5V3+HBzuSYtizuVyLCw8g
Chrn5Tij0UFmFT9okkq0m1Boplwkt4NdFQk6rN4xtbK81la/rhvEDXsyTWLRMDgabU+wIv
il+sGePo8BBZDwjuCj/r18w18WBWBYl3rl2TOpX69Ci6+m5++hUi0Chfyjr3Tw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1711716843;
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=VNTcKKSlVxo+QL4bxOKQY5o1EOHC8gu61zd1HrRLZSQ=;
b=d3L+pjZRh9HvRC9lCjuj+FP7k4jKlADAqXiV0HfBRBRIxWmns/bIJfBIQz8s2ievRVZu02
Vetf2YgHrug55LxQ0+XZoC+13dir6W54ZoY2G/07qPtQj+eBZzLyxQGDxor25WyECab6Jw
e1YnUbtfWUYxIU01AVtNQHEuvcgrh7Jw36GLBZfZ/MVq5C1Q3rL1UHtEcyMbW3iIIarF25
jwvGoVH3ekU6Dsd48vr9WNNCW+t+dhJFb/ueIqR4E59hiJysoTvdFBIcNuXdIELq9xnAym
/0PR7UesgKsj0NvA4vcSPoEF6c+cLH3jqPZn+qQ+6PZJ7p6MGR+TMoe3rQ1y1g==
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 4V5gMZ6ccLz19lQ;
Fri, 29 Mar 2024 12:54:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42TCs2mt040021;
Fri, 29 Mar 2024 12:54:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42TCs2MZ040018;
Fri, 29 Mar 2024 12:54:02 GMT
(envelope-from git)
Date: Fri, 29 Mar 2024 12:54:02 GMT
Message-Id: <202403291254.42TCs2MZ040018@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Jan Beich <jbeich@FreeBSD.org>
Subject: git: 23739fa6caa7 - main - graphics/mesa-devel: unbreak
build with llvm18
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
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: 23739fa6caa76c81a8c7ca96b46cc9d0ce98a040
Auto-Submitted: auto-generated
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=23739fa6caa76c81a8c7ca96b46cc9d0ce98a040
commit 23739fa6caa76c81a8c7ca96b46cc9d0ce98a040
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-03-28 09:22:13 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-03-29 12:53:47 +0000
graphics/mesa-devel: unbreak build with llvm18
Installing spirv-llvm-translator-llvm18-18.1.0...
===> mesa-devel-24.0.b.3778 depends on shared library: libLLVMSPIRVLib.so.18 - not found
*** Error code 1
---
graphics/mesa-devel/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 3897719fc374..765adf008783 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -112,8 +112,9 @@ OPENCL_BUILD_DEPENDS= bindgen:devel/rust-bindgen-cli \
libclc>0:devel/libclc \
spirv-tools>0:graphics/spirv-tools \
rustc:lang/${RUST_DEFAULT}
-OPENCL_LIB_DEPENDS= libLLVMSPIRVLib.so.${LLVM_VERSION}:devel/spirv-llvm-translator@${LLVM_PORT:T}
+OPENCL_LIB_DEPENDS= libLLVMSPIRVLib.so.${OPENCL_SOVERSION}:devel/spirv-llvm-translator@${LLVM_PORT:T}
OPENCL_RUN_DEPENDS= libclc>0:devel/libclc
+OPENCL_SOVERSION= ${LLVM_VERSION}${${LLVM_VERSION}>=18:?.1:}
OPENCL_CONFIGURE_ENV= PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig"
OPENCL_MESON_FALSE= b_lundef # environ
OPENCL_MESON_TRUE= gallium-rusticl