From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C05E158087 for ; Mon, 27 Dec 2021 01:38:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CDBA2BC004; Mon, 27 Dec 2021 01:38:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C0282BC007 for ; Mon, 27 Dec 2021 01:38:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CECFF342EB5 for ; Mon, 27 Dec 2021 01:38:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 570D2233 for ; Mon, 27 Dec 2021 01:38:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1640568956.12d9888238882ab0e9e0285664e488656f842424.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/spirv-llvm-translator/Manifest dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild X-VCS-Directories: dev-util/spirv-llvm-translator/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 12d9888238882ab0e9e0285664e488656f842424 X-VCS-Branch: master Date: Mon, 27 Dec 2021 01:38:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a3fef60a-3186-46b4-a753-200ed407f32a X-Archives-Hash: 0c3530f4e7141b99d194a071a500ed40 commit: 12d9888238882ab0e9e0285664e488656f842424 Author: Jan Henke taujhe de> AuthorDate: Thu Dec 23 20:46:21 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 27 01:35:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d98882 dev-util/spirv-llvm-translator: Version bump (13.0.0) Besides bumping the matching LLVM version, this version requires the upstream SPIRV header files, so an additonal CMAKE argument is required to point to the installed headers (and they are a new build time dependency). LLVM eclass sadly does not support EAPI 8 yet, so this ebuild remains at 7. Closes: https://bugs.gentoo.org/829845 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Jan Henke taujhe.de> Closes: https://github.com/gentoo/gentoo/pull/23485 Signed-off-by: Sam James gentoo.org> dev-util/spirv-llvm-translator/Manifest | 2 + .../spirv-llvm-translator-13.0.0.ebuild | 60 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest index d57d8a32e3ff..cb2ec4d8a7b7 100644 --- a/dev-util/spirv-llvm-translator/Manifest +++ b/dev-util/spirv-llvm-translator/Manifest @@ -1,2 +1,4 @@ DIST spirv-llvm-translator-11.1.0_pre20210212.tar.gz 702962 BLAKE2B 0c46b898e2d6c293b1db7b4aa65af7830869329cebc35e930b73f98dc038ae50d6adbdd9c6951e2ad427982d2a565c0925ecd056105cc37222b0d8ce7eb2e43b SHA512 3b8503be3ad65422f59ddbfd715a913dd6dab9416a14aea9e6a6793b2c959edaaab5433a3e253ee84c0b3644024a1f8a6b563af65e7aaad209c5f51e524cc96b DIST spirv-llvm-translator-12.0.0.tar.gz 1378222 BLAKE2B 059409364403316f84521e231bc14cade2875c2b914acea95619b0920ae4f13babb26411b20fead1d7a028320fa3aea637d087d869759cb23e3266753b5b2f46 SHA512 c23ef81802d2bf743564762815d7375a804bdf8029efd7430faea0b48b5e30a9778c1175f52309b522a07aadf8ff77461b912c1fb3b95af9b09273a483eac82a +DIST spirv-llvm-translator-13.0.0-rename-OpConstFunctionPointerINTEL.patch.bz2 3632 BLAKE2B b2c3ed9ff1040fef12cd5b7962c71f2e52febbf1e1d1d06bee079093940c32e67f7c246c92876207f296677bd655f91447d0ce837f191cd0d4cfb66adfb11a62 SHA512 bba6a9b838ebf0bd29f5fa906fefcecdb1b3832b15ac1af8a1ed86da0e988385172b1a51468a4d8d97352c4a57c3e224f12d7e24b7a202a38353e2dbd3a2c27c +DIST spirv-llvm-translator-13.0.0.tar.gz 1436324 BLAKE2B 254450f153a0f0d7c0a75005705f4a7d90effa1e6bcde0d6b931195e4a925ddc34896e66b686c55583d50ab99a9e1e45ad1c0600f7fa4eaa2039642460e9b711 SHA512 1ce7a38c2c3447249e19d50063a7a2acf32699905572950e4f102d8ce1680785433035154b7b55782d5a56211a50e042aef775836f37c33fe847b347a02b5a04 diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild new file mode 100644 index 000000000000..6c354c4cd277 --- /dev/null +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake + +inherit cmake-multilib flag-o-matic llvm + +MY_PN="SPIRV-LLVM-Translator" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" +SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-rename-OpConstFunctionPointerINTEL.patch.bz2" + +LICENSE="UoI-NCSA" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64" +IUSE="test +tools" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_P}" + +RDEPEND="sys-devel/clang:${SLOT}=[${MULTILIB_USEDEP}] + dev-util/spirv-headers" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-python/lit )" + +REQUIRED_USE="test? ( tools )" + +LLVM_MAX_SLOT="${SLOT}" + +PATCHES=( + "${WORKDIR}"/${P}-rename-OpConstFunctionPointerINTEL.patch +) + +src_prepare() { + append-flags -fPIC + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${BROOT}/usr/include/spirv" + -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF") + -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF") + ) + cmake_src_configure +} + +multilib_src_test() { + # Some tests fail on amd64 when ABI==x86 + if multilib_is_native_abi; then + lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}" + fi +}