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 9030D138353 for ; Sun, 15 Mar 2020 21:29:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55B83E1129; Sun, 15 Mar 2020 21:29:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 3BC50E1129 for ; Sun, 15 Mar 2020 21:29:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D173F34F196 for ; Sun, 15 Mar 2020 21:28:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F582171 for ; Sun, 15 Mar 2020 21:28:56 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1584307682.5daea9c2505d4170edd2600a7c2fc63a1aec100a.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/spirv-tools/spirv-tools-9999.ebuild X-VCS-Directories: dev-util/spirv-tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 5daea9c2505d4170edd2600a7c2fc63a1aec100a X-VCS-Branch: master Date: Sun, 15 Mar 2020 21:28:56 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 24b9c972-c84d-4aa9-9c60-9d8377c94ba7 X-Archives-Hash: ba24c01d9b1608823db4be83118819f8 commit: 5daea9c2505d4170edd2600a7c2fc63a1aec100a Author: Matt Turner gentoo org> AuthorDate: Sun Mar 15 20:09:42 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Mar 15 21:28:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5daea9c2 dev-util/spirv-tools: 9999 cleanup, cmake.eclass Signed-off-by: Matt Turner gentoo.org> dev-util/spirv-tools/spirv-tools-9999.ebuild | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index 0d2943714b8..8110b4fa3de 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -2,14 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + +MY_PN=SPIRV-Tools +CMAKE_ECLASS="cmake" PYTHON_COMPAT=( python3_{6,7} ) +inherit cmake-multilib python-any-r1 -inherit cmake-multilib cmake-utils git-r3 python-any-r1 +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc64 ~x86" + S="${WORKDIR}"/${MY_PN}-${PV} +fi DESCRIPTION="Provides an API and commands for processing SPIR-V modules" HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools" -EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Tools.git" -SRC_URI="" LICENSE="Apache-2.0" SLOT="0" @@ -28,13 +37,5 @@ multilib_src_configure() { "-DSPIRV_WERROR=OFF" ) - cmake-utils_src_configure -} - -multilib_src_install() { - cmake-utils_src_install - - # create a header file with the commit hash of the current revision - # vulkan-tools needs this to build - echo "${EGIT_VERSION}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die + cmake_src_configure }