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 20DBE138334 for ; Sat, 1 Sep 2018 23:27:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3EECEE06CC; Sat, 1 Sep 2018 23:27:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 006FDE06CC for ; Sat, 1 Sep 2018 23:27:56 +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 BACA0335C8D for ; Sat, 1 Sep 2018 23:27:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72D86398 for ; Sat, 1 Sep 2018 23:27:54 +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: <1535844458.bf3057af25a62b4b4f266d2ab04faba3579b7b3f.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: bf3057af25a62b4b4f266d2ab04faba3579b7b3f X-VCS-Branch: master Date: Sat, 1 Sep 2018 23:27:54 +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: 8ecfdd8c-5e60-40d5-ac41-63a2a39c324c X-Archives-Hash: efe4959f9ab5e6e514fb622186062c53 commit: bf3057af25a62b4b4f266d2ab04faba3579b7b3f Author: Nick Sarnie gentoo org> AuthorDate: Sat Sep 1 23:26:53 2018 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sat Sep 1 23:27:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf3057af 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 dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild | 19 ++++++++----------- dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 19 ++++++++----------- 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 }