commit:     ef634a4e60380f157f05d6e8246fb249ea55cc19
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 19:48:04 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 23 02:58:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef634a4e

dev-util/spirv-llvm-translator: Look for spirv-headers in ESYSROOT

BROOT is for dependencies in BDEPEND, typically executable build tools.
spirv-headers is in DEPEND/RDEPEND, and thus should be found in
ESYSROOT.

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

 dev-util/spirv-llvm-translator/spirv-llvm-translator-14.0.0-r1.ebuild | 4 ++--
 dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild    | 2 +-
 dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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
index 14c92492c2e6..022166bd2111 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -43,7 +43,7 @@ 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_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-15.0.0.ebuild 
b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
index 9eff73eadc5a..cd3324c655c5 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
@@ -43,7 +43,7 @@ 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_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.ebuild 
b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild
index fd9d9851fd82..24731ea4c979 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild
@@ -48,7 +48,7 @@ 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_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

Reply via email to