From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3A9D13835A for ; Sat, 27 Feb 2021 14:42:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7F63E0886; Sat, 27 Feb 2021 14:42:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5EE6E0886 for ; Sat, 27 Feb 2021 14:42:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DF563410EF for ; Sat, 27 Feb 2021 14:42:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D868C4C2 for ; Sat, 27 Feb 2021 14:42:45 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1614436943.277c66f920fd6a0e4aa8ddc8696d950b3a102b79.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/, dev-util/spirv-llvm-translator/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild X-VCS-Directories: dev-util/spirv-llvm-translator/ dev-util/spirv-llvm-translator/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 277c66f920fd6a0e4aa8ddc8696d950b3a102b79 X-VCS-Branch: master Date: Sat, 27 Feb 2021 14:42:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6283dff-ae8e-4fea-840f-3eb5f7a42344 X-Archives-Hash: c150e9a6b9a379d76b21048003af39e8 commit: 277c66f920fd6a0e4aa8ddc8696d950b3a102b79 Author: Conrad Kostecki gentoo org> AuthorDate: Sat Feb 27 14:41:30 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Feb 27 14:42:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=277c66f9 Revert "dev-util/spirv-llvm-translator: Add support for llvm 11.1" This reverts commit 0d6c49e059fcb04e8ee11031e5177927f8a53609. Signed-off-by: Conrad Kostecki gentoo.org> .../spirv-llvm-translator/files/llvm-11.1.0.patch | 10 ---- .../spirv-llvm-translator-11.0.0-r1.ebuild | 63 ---------------------- 2 files changed, 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 f4d243acc5e..00000000000 --- 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 94dee02866a..00000000000 --- 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 -}