From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36E9E138334 for ; Sat, 1 Sep 2018 22:57:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CC7FE0788; Sat, 1 Sep 2018 22:57:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A443E0788 for ; Sat, 1 Sep 2018 22:57:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A11F5335C7D for ; Sat, 1 Sep 2018 22:57:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDF61398 for ; Sat, 1 Sep 2018 22:57:14 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1535842602.3f0f865797bbc1caaa7f94d65f2d2a7eaffd9cfd.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild dev-util/vulkan-tools/vulkan-tools-9999.ebuild X-VCS-Directories: dev-util/vulkan-tools/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 3f0f865797bbc1caaa7f94d65f2d2a7eaffd9cfd X-VCS-Branch: master Date: Sat, 1 Sep 2018 22:57:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0bb6b517-2d22-44a8-97ac-eab3a4d770fb X-Archives-Hash: 96aa64e4836011daac065e010df36e39 commit: 3f0f865797bbc1caaa7f94d65f2d2a7eaffd9cfd Author: Nick Sarnie gentoo org> AuthorDate: Sat Sep 1 22:03:48 2018 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sat Sep 1 22:56:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0f8657 dev-util/vulkan-tools: Also install 32-bit binaries in multiabi case Closes: https://bugs.gentoo.org/660760 Package-Manager: Portage-2.3.48, Repoman-2.3.10 ...an-tools-9999.ebuild => vulkan-tools-1.1.77.0-r2.ebuild} | 13 +++++++++++-- dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild similarity index 84% copy from dev-util/vulkan-tools/vulkan-tools-9999.ebuild copy to dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild index 6fa37cabccc..a31a4361ef6 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild @@ -77,9 +77,18 @@ 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 - mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die - mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die + 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 fi } diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 6fa37cabccc..a31a4361ef6 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -77,9 +77,18 @@ 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 - mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die - mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die + 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 fi }