From nobody Thu Mar 06 00:53:15 2025 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 4Z7WB34BR5z5p5hN; Thu, 06 Mar 2025 00:53:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z7WB333X4z3byH; Thu, 06 Mar 2025 00:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741222395; 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=TH1TB7G6hYOH+EudDUybgsTJ151QZkgkiC5Omemm2A0=; b=ab1MtuTs4jC3k9eJiC9pEgtefylpe5cZk2FjFe4vWy3ctHQVYdpGUHABtMDshoBdCJJe5i XiHHtsXS1vitG1N+VTtvUmPyhYhfSOdZ80uM39KWp+JlQ9kWwJVVEcUnZJUeO7uBXRDRcy cc1hFuWlZokhNeBcRddm4cd09owJUxJb7gcE31tY4U5Rqf/B/S0bt1O2MpgL1UjAr8hHfX So7mUbDpLmmQpBSp30FCnFXKOR90NbP3P/HZQjPpsDctJMuSR0VctzdP04ceK4U68tnE35 yIskYJaFu377XSOgMOgJw5J3e5PrrFaypC+7tVJfGCf0ve/vA/H/5ZJCQhTRFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741222395; a=rsa-sha256; cv=none; b=GCJN9tCbqoVdN6/2KKcqCcJkhRqOgPaK6MrzlvgyV8jDk2we+xtzQsfHDXRboHEKAGbAMb Erib8xPl+9QdpWllktMkeeWFLh/xQqCeS71TYnr0VNlcJEI9xjlAGqqxielEL/IlkmEkfG FTgMJ+c6WUhrnc18TPxO1H7KjyYjLYEiIc9520Flowd/5m8jq3mvK69NhsPyGzStBkSFfr 7myy0r9kVp97/tt64K+gXR7AmVGzyuDOaDzGngT4mphpacDRk8vG5BlBacR0Vn34x0theh QbKEmc5tfhAcIYfqmMu/p7thCo1DuTmAII6yY3Qx3IS84BbadtJvQkOTgRtTXg== 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=1741222395; 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=TH1TB7G6hYOH+EudDUybgsTJ151QZkgkiC5Omemm2A0=; b=c4G1BOH4dwBriqKU/GpJlGm7VfYv0lsLBr9XQLd51lTJ2/0MoW+D0QuBRB2uhuDmgeXxYh Ezs/Ng7NJxOiHfm3654822nzgz3ApYMXIQ8gwFrfI2IgA3KYNbIkSG3TomTl/wxbSzllEY aO6uNQ5DiOSxw7eRt7W3EGN4K+MTReXFYRPynOyX3ua3Kk+YEc9QJJI8wqHVo1jzCYuEG0 +UcAcMiAvr4JPEZ6mTPE1fwmiBUPH2YSVWXjaZexa4TbtGjK3xcMFzIQ638DPs3ULLMIHR JjFC9bshaqV5ENO3dfXrzBblzh1wloLg8sWz8VJV9J7MVYnXaBXoS6PSzNk76g== 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 4Z7WB32fMbzCtM; Thu, 06 Mar 2025 00:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5260rFVv076821; Thu, 6 Mar 2025 00:53:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5260rFNU076818; Thu, 6 Mar 2025 00:53:15 GMT (envelope-from git) Date: Thu, 6 Mar 2025 00:53:15 GMT Message-Id: <202503060053.5260rFNU076818@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: fe28e931e325 - main - devel/spirv-llvm-translator: simplify SPIRV-Headers conditional 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: fe28e931e325b5aa54debba6cbc298e464ac8c91 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe28e931e325b5aa54debba6cbc298e464ac8c91 commit fe28e931e325b5aa54debba6cbc298e464ac8c91 Author: Jan Beich AuthorDate: 2025-03-05 15:54:01 +0000 Commit: Jan Beich CommitDate: 2025-03-06 00:52:35 +0000 devel/spirv-llvm-translator: simplify SPIRV-Headers conditional --- devel/spirv-llvm-translator/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/devel/spirv-llvm-translator/Makefile b/devel/spirv-llvm-translator/Makefile index 90ec5720807e..1514edd88abb 100644 --- a/devel/spirv-llvm-translator/Makefile +++ b/devel/spirv-llvm-translator/Makefile @@ -30,13 +30,14 @@ USE_GITHUB= yes USE_LDCONFIG= ${PREFIX}/${FLAVOR}/lib GH_ACCOUNT= KhronosGroup GH_PROJECT= SPIRV-LLVM-Translator -.if !defined(FLAVOR) || ${FLAVOR} == llvm19 -# https://github.com/KhronosGroup/SPIRV-LLVM-Translator/issues/2415#issuecomment-2358890668 +.if ${FLAVOR:U:Mllvm1[12]} +# empty +.elif ${FLAVOR:U:Mllvm1[378]} +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-332-g1c6bb27:headers/projects/SPIRV-Headers +.elif ${FLAVOR:U} == llvm19 GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-350-gb73e168:headers/projects/SPIRV-Headers -.elif ${FLAVOR:Mllvm1[4-6]} -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-390-g2b2e05e:headers/projects/SPIRV-Headers .else -GH_TUPLE= ${${FLAVOR:S/llvm//}<13:?:KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-332-g1c6bb27:headers/projects/SPIRV-Headers} +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-390-g2b2e05e:headers/projects/SPIRV-Headers .endif DISTINFO_FILE= ${.CURDIR}/distinfo.${FLAVOR} CXXFLAGS+= ${${FLAVOR:S/llvm//} < 16 && ${COMPILER_TYPE} == clang:?-Wno-enum-constexpr-conversion:}