summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sarnie <sarnex@gentoo.org>2018-09-01 19:26:53 -0400
committerNick Sarnie <sarnex@gentoo.org>2018-09-01 19:27:38 -0400
commitbf3057af25a62b4b4f266d2ab04faba3579b7b3f (patch)
treef34b22b32af790689db4268f15c116cb13ca61bd /dev-util
parentsys-devel/bison: stable 3.0.5-r1 for ppc64, bug #664926 (diff)
downloadgentoo-bf3057af25a62b4b4f266d2ab04faba3579b7b3f.tar.gz
gentoo-bf3057af25a62b4b4f266d2ab04faba3579b7b3f.tar.bz2
gentoo-bf3057af25a62b4b4f266d2ab04faba3579b7b3f.zip
dev-util/vulkan-tools: Consider CHOST in multilib binary names
Bug: https://bugs.gentoo.org/660760 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.ebuild19
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-9999.ebuild19
2 files changed, 16 insertions, 22 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 a31a4361ef6..bba55150e15 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,6 +40,12 @@ 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
@@ -77,18 +83,9 @@ multilib_src_configure() {
multilib_src_install() {
cmake-utils_src_install
- if ! multilib_is_native_abi; then
- mv "${ED%/}"/usr/bin/vulkaninfo "${ED%/}"/usr/bin/vulkaninfo32 || die
- fi
-
if use cube; then
- if multilib_is_native_abi; then
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
- else
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube32 || die
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp32 || die
- fi
+ mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
+ mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
fi
}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index a31a4361ef6..bba55150e15 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -40,6 +40,12 @@ 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
@@ -77,18 +83,9 @@ multilib_src_configure() {
multilib_src_install() {
cmake-utils_src_install
- if ! multilib_is_native_abi; then
- mv "${ED%/}"/usr/bin/vulkaninfo "${ED%/}"/usr/bin/vulkaninfo32 || die
- fi
-
if use cube; then
- if multilib_is_native_abi; then
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
- else
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube32 || die
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp32 || die
- fi
+ mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
+ mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
fi
}