commit: b3a2ef344f6d59dea8747afdecd902cbcd96aed6 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sat Jun 15 23:40:14 2019 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sat Jun 15 23:40:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a2ef34
dev-util/spirv-tools: Fix python dependency Fixes: https://bugs.gentoo.org/688136 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> ...ls-9999.ebuild => spirv-tools-2019.1-r2.ebuild} | 24 ++++++++++++++-------- dev-util/spirv-tools/spirv-tools-9999.ebuild | 7 +++++-- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild similarity index 53% copy from dev-util/spirv-tools/spirv-tools-9999.ebuild copy to dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild index 1df290d2083..57c340b2d99 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild @@ -1,23 +1,30 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) -inherit cmake-multilib cmake-utils git-r3 +inherit cmake-multilib cmake-utils python-any-r1 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="" +SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" +KEYWORDS="~amd64 ~x86" # Tests fail upon finding symbols that do not match a regular expression # in the generated library. Easily hit with non-standard compiler flags RESTRICT="test" +DEPEND="" RDEPEND="" -DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302" +BDEPEND="${PYTHON_DEPS} + >=dev-util/spirv-headers-1.3.4_pre20190302" + +EGIT_COMMIT="2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3" +S="${WORKDIR}/SPIRV-Tools-${PV}" +PATCHES=( "${FILESDIR}"/${PN}-2019.1-Fix-vertex-instrumentation.patch ) multilib_src_configure() { local mycmakeargs=( @@ -30,8 +37,7 @@ multilib_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 + echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die + insinto /usr/include/"${PN}" + doins "${PN}-commit.h" } diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index 1df290d2083..07ff87f0268 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) inherit cmake-multilib cmake-utils git-r3 @@ -16,8 +17,10 @@ SLOT="0" # in the generated library. Easily hit with non-standard compiler flags RESTRICT="test" +DEPEND="" RDEPEND="" -DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302" +BDEPEND="${PYTHON_DEPS} + >=dev-util/spirv-headers-1.3.4_pre20190302" multilib_src_configure() { local mycmakeargs=(
