From ddc2c0ab491c99ea9299ce7e198b73e2beffdfb9 Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Sat, 15 Jun 2019 20:08:17 -0400 Subject: dev-util/spirv-tools: Fix spirv-headers dependency Just shoot me Bug: https://bugs.gentoo.org/show_bug.cgi?id=688136 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Nick Sarnie --- dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild | 5 +++-- dev-util/spirv-tools/spirv-tools-9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild index 57c340b2d99f..3288e3612782 100644 --- a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild +++ b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild @@ -17,10 +17,11 @@ KEYWORDS="~amd64 ~x86" # in the generated library. Easily hit with non-standard compiler flags RESTRICT="test" -DEPEND="" +COMMON_DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302" +DEPEND="${COMMON_DEPEND}" RDEPEND="" BDEPEND="${PYTHON_DEPS} - >=dev-util/spirv-headers-1.3.4_pre20190302" + ${COMMON_DEPEND}" EGIT_COMMIT="2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3" S="${WORKDIR}/SPIRV-Tools-${PV}" diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index 07ff87f02689..416dca93c58c 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -16,11 +16,11 @@ SLOT="0" # 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="" +COMMON_DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302" +DEPEND="${COMMON_DEPEND}" RDEPEND="" BDEPEND="${PYTHON_DEPS} - >=dev-util/spirv-headers-1.3.4_pre20190302" + ${COMMON_DEPEND}" multilib_src_configure() { local mycmakeargs=( -- cgit v1.2.3-65-gdbad From 9fb91739cd4311a7b04efc2e4bdaef987ccffd47 Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Sat, 15 Jun 2019 20:14:02 -0400 Subject: dev-util/spirv-tools: Need to inherit python-any-r1 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Nick Sarnie --- dev-util/spirv-tools/spirv-tools-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index 416dca93c58c..a30f91104a17 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) -inherit cmake-multilib cmake-utils git-r3 +inherit cmake-multilib cmake-utils git-r3 python-any-r1 DESCRIPTION="Provides an API and commands for processing SPIR-V modules" HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools" -- cgit v1.2.3-65-gdbad