diff options
| author |   Conrad Kostecki <conikost@gentoo.org> | 2021-02-27 15:41:30 +0100 |
|---|---|---|
| committer | Conrad Kostecki <conikost@gentoo.org> | 2021-02-27 15:42:23 +0100 |
| commit | 277c66f920fd6a0e4aa8ddc8696d950b3a102b79 (patch) | |
| tree | e27cfe161c5e063c595650e00c3b4dad441c25f7 | |
| parent | dev-util/spirv-llvm-translator: bump to version 11.1.0_pre20210212 (diff) | |
| download | gentoo-277c66f9.tar.gz gentoo-277c66f9.tar.bz2 gentoo-277c66f9.zip | |
Revert "dev-util/spirv-llvm-translator: Add support for llvm 11.1"
This reverts commit 0d6c49e059fcb04e8ee11031e5177927f8a53609.
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
| -rw-r--r-- | dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch | 10 | ||||
| -rw-r--r-- | dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild | 63 |
2 files changed, 0 insertions, 73 deletions
diff --git a/dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch b/dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch deleted file mode 100644 index f4d243acc5eb..000000000000 --- a/dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt 2021-02-18 14:52:20.079691789 +0000 -+++ b/CMakeLists.txt 2021-02-18 14:47:43.773873042 +0000 -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.3) - --set (BASE_LLVM_VERSION 11.0.0) -+set (BASE_LLVM_VERSION 11.1.0) - set(LLVM_SPIRV_VERSION ${BASE_LLVM_VERSION}.0) - - option(LLVM_SPIRV_INCLUDE_TESTS diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild deleted file mode 100644 index 94dee02866a6..000000000000 --- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake - -inherit cmake-multilib flag-o-matic llvm - -EGIT_COMMIT="d6dc999eee381158a26f048a333467c9ce7e77f2" -MY_PN="SPIRV-LLVM-Translator" -MY_P="${MY_PN}-${EGIT_COMMIT}" - -DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" -HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" -SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="UoI-NCSA" -SLOT="11" -KEYWORDS="~amd64" -IUSE="test tools" - -# I have yet to see a non-release spirv-llvm-translator ebuild pass ANY tests. -# This is probably something silly like the test suite expecting different -# directory names but I really can't be bothered to debug VCS snapshots. -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -COMMON="~sys-devel/clang-11.1.0:11=[${MULTILIB_USEDEP}]" -DEPEND="${COMMON}" -RDEPEND="${COMMON}" -BDEPEND="test? ( dev-python/lit )" - -REQUIRED_USE="test? ( tools )" - -LLVM_MAX_SLOT=11 - -PATCHES=( - "${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch - "${FILESDIR}"/llvm-11.1.0.patch -) - -src_prepare() { - append-flags -fPIC - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF") - $(usex test "-DLLVM_INCLUDE_TESTS=ON" "") - ) - cmake_src_configure -} - -multilib_src_test() { - # Some tests fail on amd64 when ABI==x86 - if multilib_is_native_abi; then - lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}" - fi -} |