diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2019-06-16 00:24:10 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-06-16 00:24:10 +0000 |
| commit | b082b672feaee4dbe3c5cad48de57604e5f521ba (patch) | |
| tree | 09b6ea06410dcd32da893dcee1ea2f228d45d4dd | |
| parent | 2019-06-16 00:04:46 UTC (diff) | |
| parent | dev-util/spirv-tools: Need to inherit python-any-r1 (diff) | |
| download | gentoo-b082b672feaee4dbe3c5cad48de57604e5f521ba.tar.gz gentoo-b082b672feaee4dbe3c5cad48de57604e5f521ba.tar.bz2 gentoo-b082b672feaee4dbe3c5cad48de57604e5f521ba.zip | |
Merge updates from master
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-9999.ebuild | 8 |
2 files changed, 7 insertions, 6 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..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" @@ -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=( |