summaryrefslogtreecommitdiff
path: root/dev-util/spirv-llvm-translator
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
committerV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
commit752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree330d16e6362a49cbed8875a777fe641a43376cd3 /dev-util/spirv-llvm-translator
parent0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
gentoo resync : 12.05.2022
Diffstat (limited to 'dev-util/spirv-llvm-translator')
-rw-r--r--dev-util/spirv-llvm-translator/Manifest11
-rw-r--r--dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch18
-rw-r--r--dev-util/spirv-llvm-translator/metadata.xml4
-rw-r--r--dev-util/spirv-llvm-translator/spirv-llvm-translator-11.1.0_pre20210212.ebuild62
-rw-r--r--dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild48
-rw-r--r--dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0-r2.ebuild (renamed from dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild)44
-rw-r--r--dev-util/spirv-llvm-translator/spirv-llvm-translator-14.0.0-r1.ebuild57
7 files changed, 114 insertions, 130 deletions
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 937e73c2e0e3..19dbfa0b36f5 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,9 +1,8 @@
-AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
-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
-EBUILD spirv-llvm-translator-11.1.0_pre20210212.ebuild 1554 BLAKE2B 028258811c5e19b7c5b77c5eb878efc63dfad70552f30aa83b2159e8a5a01ce995850cf6155ae52fc62e7873ea4428d7688b207692ff19661c6f6970ab0d0743 SHA512 d40f447de191a6b04bbae96966558a6975cf84d1e15265b3f7d5406467cb57fbfd2b8ef839a64efcd7ba2ce95b16ed149978d9b6f694dd43e8add24c0a391800
-EBUILD spirv-llvm-translator-12.0.0.ebuild 1200 BLAKE2B 18bb217dc6c28b57fce2439389dcd2d2e8205e05e6ced8f85c3db76341dde15a497688c871038d8b2b8e210578007a25db694239f476ee1988255bf467993792 SHA512 2f1d78eec685a1c8fa4196a1c3443cdae4d541e3657b0ff0cae1a2d8c68c9d20184412415824f8e64124c32f2e93371e9cb775b3be5aa85c14b5950bd2bdbbc1
-EBUILD spirv-llvm-translator-13.0.0.ebuild 1499 BLAKE2B 91cc654159d2885f790180eba7eeaa375a3bc499353a64e8184cedb913c081c8dc60e637042f79eec80c1293e52c331fdc32a9df0147aeceb7adc62c67512594 SHA512 8a6ca38d558533275d532a039c515d3ceb8558342306d43a9d7783027e09544183817a3969355cd09479f7d731783241faff5e1943fc48cee861b6ce33e7b703
-MISC metadata.xml 585 BLAKE2B 0fc156f0d89b54e7341c053bbf1bbb1f1ebec639561fc30e0e49b5ed6147d6483e79f0a0461c46414deb5527d19df36288284ee263ce8bf50c34433b76bae748 SHA512 c34da54f0025f0da625f33f0d305c17d8a56e50345e8fe5e6db0138dd4f00322f2df8203d29f023d9ee70f2a1e399114153be70e5d97ec673c36e7a463b6c89a
+DIST spirv-llvm-translator-14.0.0.tar.gz 1482704 BLAKE2B f88eb8f4cd652c448e465605ec8c34bb80f87f1269c244b33be542ae98ef97ea04a759b9cd9fed0814f4360733d7560d301d2b8d586706d1ca988b4524526aeb SHA512 5659149a380ceef7acdcb274bcad9b23e4817bf88e795e0a8464dfe14fbd102dbf7199cbe67eb611a16d3a411c7a1b8afc6f0eef61fec5a2b8f9fba06748bcb1
+EBUILD spirv-llvm-translator-12.0.0.ebuild 1131 BLAKE2B 7b2198c54f5a582f725f3d08587edba77db9eb552d402635415ac24e7e29d9e38680625d7e2809d89f7ce2ddde31fee0626b2c71b912774d466ecea7b23954f7 SHA512 eb1780a6222913dbfc087401ebb0dea28229df0ce6a97778c679200b870e065efe20370ebb36af4cc3a6039bd5542025af2c72f83a3b0e26ecabab94e4ad739a
+EBUILD spirv-llvm-translator-13.0.0-r2.ebuild 1393 BLAKE2B 05cd645ace5d0e889e8199f74d2ff6f342cfc7c60091fcd339f99ace5c80f78a2be38db366ebc46dffb4527f25415e322df5e4ba175a622d39feb6431828c1fe SHA512 1275e9bcece435865e6ac9050426470f7f7c934023cabc30b1b0065e6401294943201f0df7b70553f6a3f3cd3039d7c8c39776bab15b936e3d9dca8f4eefc804
+EBUILD spirv-llvm-translator-14.0.0-r1.ebuild 1204 BLAKE2B cde51265957bd9ef7e3db4870f0f131b2a9c51c5572aac0bf33980cc0bbad4790d61bf3d79e7a181bf7f423f01c931e609e21f642e9cda70c607356d540ec7d8 SHA512 d431f8d9879cad5559d3f624a32a9176a4b14c84de6cb6e1f386779144546601a2c4e8b3627a6a36da0a0ef0e98758abfe37c4e8f3f39e4ee658f18858deff05
+MISC metadata.xml 696 BLAKE2B 8d5fd20aa6ce0ed9c7660ac356f9c2274c8262680faf04aa647890044e8c48703366aa59a6c9b638105a5269ae2bcc7d1ccdb01fbb268b2054d6dce7a9cb875b SHA512 c0ce5f3a5eefced8c2a3fe8988009f4ae2dab5c1a93d5f908d24e2445696799dc937cde7f1ec29237ce44a653d496a74b246ac9d65ab132c33c5334990a6238e
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
deleted file mode 100644
index 66e81dc3b20d..000000000000
--- a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Do not install pkgconfig data files, pkg-config does not presently look at
-/usr/lib/llvm/.../pkgconfig and putting them in /usr/lib*/pkgconfig would
-cause collisions between slots.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,11 +66,3 @@
- DESTINATION
- ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib
- )
--
--configure_file(LLVMSPIRVLib.pc.in ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc @ONLY)
--install(
-- FILES
-- ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc
-- DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
--)
diff --git a/dev-util/spirv-llvm-translator/metadata.xml b/dev-util/spirv-llvm-translator/metadata.xml
index 0554f17e7f43..dce0ce8289b7 100644
--- a/dev-util/spirv-llvm-translator/metadata.xml
+++ b/dev-util/spirv-llvm-translator/metadata.xml
@@ -9,6 +9,10 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
<use>
<flag name="tools">
Install the command-line translator llvm-spirv
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.1.0_pre20210212.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.1.0_pre20210212.ebuild
deleted file mode 100644
index b9cf6d70946d..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.1.0_pre20210212.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-
-EGIT_COMMIT="677b40cdab276a0b15e048f4d6c7d20d8968dfac"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${EGIT_COMMIT}"
-
-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/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="11"
-KEYWORDS="amd64"
-IUSE="test tools"
-
-# I have yet to see a non-release spirv-llvm-translator ebuild pass ANY tests.
-# This is probably something silly like the test suite expecting different
-# directory names but I really can't be bothered to debug VCS snapshots.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/clang:11=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="test? ( dev-python/lit )"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=11
-
-PATCHES=(
- "${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
- append-flags -fPIC
- cmake_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
- $(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
- )
- 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
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild
index 5b4c466b706f..bab61d298615 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild
@@ -1,54 +1,56 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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
+EAPI=8
+LLVM_MAX_SLOT="12"
MY_PN="SPIRV-LLVM-Translator"
MY_P="${MY_PN}-${PV}"
+inherit cmake flag-o-matic llvm
+
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"
+S="${WORKDIR}/${MY_P}"
LICENSE="UoI-NCSA"
-SLOT="12"
+SLOT="$(ver_cut 1)"
KEYWORDS="amd64"
IUSE="test +tools"
-
+REQUIRED_USE="test? ( tools )"
RESTRICT="!test? ( test )"
-S="${WORKDIR}/${MY_P}"
+RDEPEND="
+ dev-util/spirv-headers
+ sys-devel/clang:${SLOT}
+ sys-devel/llvm:${SLOT}
+"
-COMMON="sys-devel/clang:12=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="test? ( dev-python/lit )"
+DEPEND="${RDEPEND}"
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=12
+BDEPEND="
+ virtual/pkgconfig
+ test? ( dev-python/lit )
+"
src_prepare() {
append-flags -fPIC
cmake_src_prepare
}
-multilib_src_configure() {
+src_configure() {
local mycmakeargs=(
+ -DCCACHE_ALLOWED="OFF"
-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
- $(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+ -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+ -Wno-dev
)
+
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
+src_test() {
+ lit "${BUILD_DIR}/test" || die
}
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-r2.ebuild
index e7c554809d4d..c3d768a3bbcc 100644
--- 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-r2.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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
+EAPI=8
+LLVM_MAX_SLOT="13"
MY_PN="SPIRV-LLVM-Translator"
MY_P="${MY_PN}-${PV}"
+inherit cmake flag-o-matic llvm
+
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"
@@ -18,41 +17,44 @@ S="${WORKDIR}/${MY_P}"
LICENSE="UoI-NCSA"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="test +tools"
-
REQUIRED_USE="test? ( tools )"
RESTRICT="!test? ( test )"
-RDEPEND="sys-devel/clang:${SLOT}=[${MULTILIB_USEDEP}]
- dev-util/spirv-headers"
+RDEPEND="
+ dev-util/spirv-headers
+ sys-devel/clang:${SLOT}
+ sys-devel/llvm:${SLOT}
+"
+
DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/lit )"
-LLVM_MAX_SLOT="${SLOT}"
+BDEPEND="
+ virtual/pkgconfig
+ test? ( dev-python/lit )
+"
-PATCHES=(
- "${WORKDIR}"/${P}-rename-OpConstFunctionPointerINTEL.patch
-)
+PATCHES=( "${WORKDIR}"/${P}-rename-OpConstFunctionPointerINTEL.patch )
src_prepare() {
append-flags -fPIC
cmake_src_prepare
}
-multilib_src_configure() {
+src_configure() {
local mycmakeargs=(
+ -DCCACHE_ALLOWED="OFF"
-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")
+ -Wno-dev
)
+
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
+src_test() {
+ lit "${BUILD_DIR}/test" || die
}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-14.0.0-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-14.0.0-r1.ebuild
new file mode 100644
index 000000000000..7d086c197318
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-14.0.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT="14"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic llvm
+
+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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test +tools"
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-util/spirv-headers
+ sys-devel/clang:${SLOT}
+ sys-devel/llvm:${SLOT}
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ test? ( dev-python/lit )
+"
+
+src_prepare() {
+ append-flags -fPIC
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCCACHE_ALLOWED="OFF"
+ -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")
+ -Wno-dev
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ lit "${BUILD_DIR}/test" || die
+}