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 8FB8E138350 for ; Fri, 14 Feb 2020 07:51:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64E93E0870; Fri, 14 Feb 2020 07:51:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 44BCAE0870 for ; Fri, 14 Feb 2020 07:51:34 +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 7B70E34EDD8 for ; Fri, 14 Feb 2020 07:51:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8F79150 for ; Fri, 14 Feb 2020 07:51:28 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1581666676.27c81bd54d4966bb4b15792a3ddc725521b0978d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/llvm/llvm-10.0.0_rc2.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 27c81bd54d4966bb4b15792a3ddc725521b0978d X-VCS-Branch: master Date: Fri, 14 Feb 2020 07:51:28 +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: 45038d77-9658-4d5d-857a-1bd1db319c16 X-Archives-Hash: d3cd73fb0c946e9cfe8ff31f962209f3 commit: 27c81bd54d4966bb4b15792a3ddc725521b0978d Author: Michał Górny gentoo org> AuthorDate: Fri Feb 14 06:28:20 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Feb 14 07:51:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c81bd5 sys-devel/llvm: Remove broken VE target from 10.0.0_rc2 Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/llvm-10.0.0_rc2.ebuild | 37 +---------------------------------- 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/sys-devel/llvm/llvm-10.0.0_rc2.ebuild b/sys-devel/llvm/llvm-10.0.0_rc2.ebuild index 390a59d0ac4..02213e0d5f9 100644 --- a/sys-devel/llvm/llvm-10.0.0_rc2.ebuild +++ b/sys-devel/llvm/llvm-10.0.0_rc2.ebuild @@ -13,7 +13,7 @@ LLVM_COMPONENTS=( llvm ) llvm.org_set_globals # Those are in lib/Targets, without explicit CMakeLists.txt mention -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR VE ) +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR ) # Keep in sync with CMakeLists.txt ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore @@ -84,38 +84,6 @@ python_check_deps() { has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } -check_live_ebuild() { - local prod_targets=( - $(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \ - | tail -n +2 | head -n -1) - ) - local all_targets=( - lib/Target/*/ - ) - all_targets=( "${all_targets[@]#lib/Target/}" ) - all_targets=( "${all_targets[@]%/}" ) - - local exp_targets=() i - for i in "${all_targets[@]}"; do - has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" ) - done - # reorder - all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" ) - - if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then - eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!" - eqawarn " Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}" - eqawarn "Expected: ${exp_targets[*]}" - eqawarn - fi - - if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then - eqawarn "ALL_LLVM_TARGETS is outdated!" - eqawarn " Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}" - eqawarn "Expected: ${all_targets[*]}" - fi -} - check_distribution_components() { if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then local all_targets=() my_targets=() l @@ -185,9 +153,6 @@ src_prepare() { # User patches + QA cmake-utils_src_prepare - - # Verify that the live ebuild is up-to-date - check_live_ebuild } # Is LLVM being linked against libc++?