diff options
| author |   Nick Sarnie <sarnex@gentoo.org> | 2022-01-18 18:15:51 -0500 |
|---|---|---|
| committer | Nick Sarnie <sarnex@gentoo.org> | 2022-01-18 18:16:36 -0500 |
| commit | f5da8a19ce91f49996f5b4b13ad6979815ce325a (patch) | |
| tree | f59b7ea4bfe9087aed7013554e4250e92bbf2021 | |
| parent | net-im/pidgin: Removed old (diff) | |
| download | gentoo-f5da8a19.tar.gz gentoo-f5da8a19.tar.bz2 gentoo-f5da8a19.zip | |
dev-util/spirv-tools: Require Python with xml support
Closes: https://bugs.gentoo.org/831393
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-1.2.198.ebuild | 3 | ||||
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-99999999.ebuild | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild index 2cbe8404537c..ec2ad8d84ae9 100644 --- a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild +++ b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,6 +6,7 @@ EAPI=7 MY_PN=SPIRV-Tools CMAKE_ECLASS="cmake" PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml(+)" inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then diff --git a/dev-util/spirv-tools/spirv-tools-99999999.ebuild b/dev-util/spirv-tools/spirv-tools-99999999.ebuild index 96183daa2dbb..03af5826bc0b 100644 --- a/dev-util/spirv-tools/spirv-tools-99999999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,15 +6,16 @@ EAPI=7 MY_PN=SPIRV-Tools CMAKE_ECLASS="cmake" PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml(+)" inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" inherit git-r3 else - EGIT_COMMIT="1b35745ad1c9a988bc427b976a9a2fe7afd4dada" + EGIT_COMMIT="sdk-${PV}.0" SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi @@ -34,7 +35,7 @@ BDEPEND="${PYTHON_DEPS} multilib_src_configure() { local mycmakeargs=( - "-DSPIRV-Headers_SOURCE_DIR=/usr/" + "-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/" "-DSPIRV_WERROR=OFF" "-DSPIRV_TOOLS_BUILD_STATIC=OFF" "-DBUILD_SHARED_LIBS=ON" |