| 1 |
commit: bf3057af25a62b4b4f266d2ab04faba3579b7b3f |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 1 23:26:53 2018 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 1 23:27:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf3057af |
| 7 |
|
| 8 |
dev-util/vulkan-tools: Consider CHOST in multilib binary names |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/660760 |
| 11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 12 |
|
| 13 |
dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild | 19 ++++++++----------- |
| 14 |
dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 19 ++++++++----------- |
| 15 |
2 files changed, 16 insertions(+), 22 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index a31a4361ef6..bba55150e15 100644 |
| 19 |
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild |
| 20 |
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild |
| 21 |
@@ -40,6 +40,12 @@ DEPEND="${PYTHON_DEPS} |
| 22 |
REQUIRED_USE="|| ( X wayland ) |
| 23 |
vulkaninfo? ( X )" |
| 24 |
|
| 25 |
+MULTILIB_CHOST_TOOLS=( |
| 26 |
+ /usr/bin/vulkancube |
| 27 |
+ /usr/bin/vulkancubecpp |
| 28 |
+ /usr/bin/vulkaninfo |
| 29 |
+) |
| 30 |
+ |
| 31 |
multilib_src_configure() { |
| 32 |
local mycmakeargs=( |
| 33 |
-DCMAKE_SKIP_RPATH=True |
| 34 |
@@ -77,18 +83,9 @@ multilib_src_configure() { |
| 35 |
multilib_src_install() { |
| 36 |
cmake-utils_src_install |
| 37 |
|
| 38 |
- if ! multilib_is_native_abi; then |
| 39 |
- mv "${ED%/}"/usr/bin/vulkaninfo "${ED%/}"/usr/bin/vulkaninfo32 || die |
| 40 |
- fi |
| 41 |
- |
| 42 |
if use cube; then |
| 43 |
- if multilib_is_native_abi; then |
| 44 |
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die |
| 45 |
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die |
| 46 |
- else |
| 47 |
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube32 || die |
| 48 |
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp32 || die |
| 49 |
- fi |
| 50 |
+ mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die |
| 51 |
+ mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die |
| 52 |
fi |
| 53 |
} |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 57 |
index a31a4361ef6..bba55150e15 100644 |
| 58 |
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 59 |
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 60 |
@@ -40,6 +40,12 @@ DEPEND="${PYTHON_DEPS} |
| 61 |
REQUIRED_USE="|| ( X wayland ) |
| 62 |
vulkaninfo? ( X )" |
| 63 |
|
| 64 |
+MULTILIB_CHOST_TOOLS=( |
| 65 |
+ /usr/bin/vulkancube |
| 66 |
+ /usr/bin/vulkancubecpp |
| 67 |
+ /usr/bin/vulkaninfo |
| 68 |
+) |
| 69 |
+ |
| 70 |
multilib_src_configure() { |
| 71 |
local mycmakeargs=( |
| 72 |
-DCMAKE_SKIP_RPATH=True |
| 73 |
@@ -77,18 +83,9 @@ multilib_src_configure() { |
| 74 |
multilib_src_install() { |
| 75 |
cmake-utils_src_install |
| 76 |
|
| 77 |
- if ! multilib_is_native_abi; then |
| 78 |
- mv "${ED%/}"/usr/bin/vulkaninfo "${ED%/}"/usr/bin/vulkaninfo32 || die |
| 79 |
- fi |
| 80 |
- |
| 81 |
if use cube; then |
| 82 |
- if multilib_is_native_abi; then |
| 83 |
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die |
| 84 |
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die |
| 85 |
- else |
| 86 |
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube32 || die |
| 87 |
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp32 || die |
| 88 |
- fi |
| 89 |
+ mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die |
| 90 |
+ mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die |
| 91 |
fi |
| 92 |
} |
Archives