| 1 |
commit: 3f0f865797bbc1caaa7f94d65f2d2a7eaffd9cfd |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 1 22:03:48 2018 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 1 22:56:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0f8657 |
| 7 |
|
| 8 |
dev-util/vulkan-tools: Also install 32-bit binaries in multiabi case |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/660760 |
| 11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 12 |
|
| 13 |
...an-tools-9999.ebuild => vulkan-tools-1.1.77.0-r2.ebuild} | 13 +++++++++++-- |
| 14 |
dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 13 +++++++++++-- |
| 15 |
2 files changed, 22 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild |
| 18 |
similarity index 84% |
| 19 |
copy from dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 20 |
copy to dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild |
| 21 |
index 6fa37cabccc..a31a4361ef6 100644 |
| 22 |
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 23 |
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild |
| 24 |
@@ -77,9 +77,18 @@ multilib_src_configure() { |
| 25 |
multilib_src_install() { |
| 26 |
cmake-utils_src_install |
| 27 |
|
| 28 |
+ if ! multilib_is_native_abi; then |
| 29 |
+ mv "${ED%/}"/usr/bin/vulkaninfo "${ED%/}"/usr/bin/vulkaninfo32 || die |
| 30 |
+ fi |
| 31 |
+ |
| 32 |
if use cube; then |
| 33 |
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die |
| 34 |
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die |
| 35 |
+ if multilib_is_native_abi; then |
| 36 |
+ mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die |
| 37 |
+ mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die |
| 38 |
+ else |
| 39 |
+ mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube32 || die |
| 40 |
+ mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp32 || die |
| 41 |
+ fi |
| 42 |
fi |
| 43 |
} |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 47 |
index 6fa37cabccc..a31a4361ef6 100644 |
| 48 |
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 49 |
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 50 |
@@ -77,9 +77,18 @@ multilib_src_configure() { |
| 51 |
multilib_src_install() { |
| 52 |
cmake-utils_src_install |
| 53 |
|
| 54 |
+ if ! multilib_is_native_abi; then |
| 55 |
+ mv "${ED%/}"/usr/bin/vulkaninfo "${ED%/}"/usr/bin/vulkaninfo32 || die |
| 56 |
+ fi |
| 57 |
+ |
| 58 |
if use cube; then |
| 59 |
- mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die |
| 60 |
- mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die |
| 61 |
+ if multilib_is_native_abi; then |
| 62 |
+ mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die |
| 63 |
+ mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die |
| 64 |
+ else |
| 65 |
+ mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube32 || die |
| 66 |
+ mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp32 || die |
| 67 |
+ fi |
| 68 |
fi |
| 69 |
} |
Archives