summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sarnie <sarnex@gentoo.org>2018-09-01 19:36:34 -0400
committerNick Sarnie <sarnex@gentoo.org>2018-09-01 19:36:34 -0400
commitdb0cf685e4d6baa058fab7410041af755baec059 (patch)
treeb72c003645c8fb4568081b635dbb998895b4d424 /dev-util
parentdev-util/vulkan-tools: Consider CHOST in multilib binary names (diff)
downloadgentoo-db0cf685e4d6baa058fab7410041af755baec059.tar.gz
gentoo-db0cf685e4d6baa058fab7410041af755baec059.tar.bz2
gentoo-db0cf685e4d6baa058fab7410041af755baec059.zip
dev-util/vulkan-tools: Fix binary renaming with USE combinations
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild17
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-9999.ebuild11
2 files changed, 22 insertions, 6 deletions
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
index bba55150e15..1f2e8e2c1d4 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
@@ -40,12 +40,6 @@ DEPEND="${PYTHON_DEPS}
REQUIRED_USE="|| ( X wayland )
vulkaninfo? ( X )"
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/vulkancube
- /usr/bin/vulkancubecpp
- /usr/bin/vulkaninfo
-)
-
multilib_src_configure() {
local mycmakeargs=(
-DCMAKE_SKIP_RPATH=True
@@ -83,9 +77,20 @@ multilib_src_configure() {
multilib_src_install() {
cmake-utils_src_install
+ MULTILIB_CHOST_TOOLS=()
+
+ if use vulkaninfo; then
+ MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+ fi
+
if use cube; then
mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
+
+ MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/vulkancube
+ /usr/bin/vulkancubecpp
+ )
fi
}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index bba55150e15..470ec645441 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -83,9 +83,20 @@ multilib_src_configure() {
multilib_src_install() {
cmake-utils_src_install
+ MULTILIB_CHOST_TOOLS=()
+
+ if use vulkaninfo; then
+ MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+ fi
+
if use cube; then
mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
+
+ MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/vulkancube
+ /usr/bin/vulkancubecpp
+ )
fi
}