[gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/

[Matt Turner]

commit:     783f653d7c418e6fac748ebda5aef2ceb33ac66d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 20:46:25 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 23 02:58:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783f653d

dev-util/spirv-llvm-translator: Remove IUSE=tools

It has not worked since upstream commit ae904012 ("[CMake] Enable
LLVM_BUILD_TOOLS for out-of-tree builds") in v15.0.0.

With that commit reverted, USE=-tools saves building one 120 KiB executable
(llvm-spirv) which is a single source file.

Also unconditionally depend on dev-util/spirv-tools as it is an
automagic dependency of llvm-spirv which will always be installed for
consumers of dev-util/spirv-llvm-translator.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild     | 5 ++---
 .../spirv-llvm-translator/spirv-llvm-translator-16.0.0-r1.ebuild     | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild 
b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild
index cdd464fdb974..44eef063ff8c 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild
@@ -17,11 +17,11 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 ~riscv ~x86"
-IUSE="test +tools"
-REQUIRED_USE="test? ( tools )"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+       dev-util/spirv-tools
        sys-devel/llvm:${SLOT}
 "
 DEPEND="${RDEPEND}
@@ -45,7 +45,6 @@ src_configure() {
                -DCCACHE_ALLOWED="OFF"
                -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
                
-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-               -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
                -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
                -Wno-dev
        )

diff --git 
a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0-r1.ebuild 
b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0-r1.ebuild
index 7cf49ee565d2..1660126d9c5f 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0-r1.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0-r1.ebuild
@@ -17,11 +17,11 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~x86"
-IUSE="test +tools"
-REQUIRED_USE="test? ( tools )"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+       dev-util/spirv-tools
        sys-devel/llvm:${SLOT}
 "
 DEPEND="${RDEPEND}
@@ -50,7 +50,6 @@ src_configure() {
                -DCCACHE_ALLOWED="OFF"
                -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
                
-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-               -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
                -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
                -Wno-dev
        )