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 7D06F139694 for ; Sat, 15 Apr 2017 08:53:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44671E0823; Sat, 15 Apr 2017 08:53:51 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CF3EE0769 for ; Sat, 15 Apr 2017 08:53:50 +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 95A9C34112A for ; Sat, 15 Apr 2017 08:53:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 693D87430 for ; Sat, 15 Apr 2017 08:53:47 +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: <1492246423.3f8f4ec753f1d0778e873dda4e1e7b3d26b8f10a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang/clang-4.0.0-r2.ebuild sys-devel/clang/clang-9999.ebuild X-VCS-Directories: sys-devel/clang/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3f8f4ec753f1d0778e873dda4e1e7b3d26b8f10a X-VCS-Branch: master Date: Sat, 15 Apr 2017 08:53:47 +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-Archives-Salt: b46f5dfd-e010-49b6-a1f3-b817e9d33144 X-Archives-Hash: 7b0df7085c091c7fda2b0125f1860ddd commit: 3f8f4ec753f1d0778e873dda4e1e7b3d26b8f10a Author: Michał Górny gentoo org> AuthorDate: Sat Apr 15 08:52:00 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Apr 15 08:53:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f8f4ec7 sys-devel/clang: Remove no-longer-useful check-reqs Now that LLVM is split, the package is no longer horribly large in regular builds. The new sizes fit the usual limits and so do not need specific checks. Furthermore, maintaining all those values with different USE flags and compiler flags combinations. sys-devel/clang/clang-4.0.0-r2.ebuild | 33 +-------------------------------- sys-devel/clang/clang-9999.ebuild | 33 +-------------------------------- 2 files changed, 2 insertions(+), 64 deletions(-) diff --git a/sys-devel/clang/clang-4.0.0-r2.ebuild b/sys-devel/clang/clang-4.0.0-r2.ebuild index a127f9c864f..43fec7af397 100644 --- a/sys-devel/clang/clang-4.0.0-r2.ebuild +++ b/sys-devel/clang/clang-4.0.0-r2.ebuild @@ -8,7 +8,7 @@ EAPI=6 CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python2_7 ) -inherit check-reqs cmake-utils flag-o-matic llvm multilib-minimal \ +inherit cmake-utils flag-o-matic llvm multilib-minimal \ python-single-r1 toolchain-funcs pax-utils versionator DESCRIPTION="C language family frontend for LLVM" @@ -71,38 +71,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need # multilib clang* libraries (not runtime, not wrappers). -check_space() { - local build_size=650 - - if use debug; then - ewarn "USE=debug is known to increase the size of package considerably" - ewarn "and cause the tests to fail." - ewarn - - (( build_size *= 14 )) - elif is-flagq '-g?(gdb)?([1-9])'; then - ewarn "The C++ compiler -g option is known to increase the size of the package" - ewarn "considerably. If you run out of space, please consider removing it." - ewarn - - (( build_size *= 10 )) - fi - - # Multiply by number of ABIs :). - local abis=( $(multilib_get_enabled_abis) ) - (( build_size *= ${#abis[@]} )) - - local CHECKREQS_DISK_BUILD=${build_size}M - check-reqs_pkg_pretend -} - -pkg_pretend() { - check_space -} - pkg_setup() { - check_space - LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup python-single-r1_pkg_setup } diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index 9987f2bfa1a..fb0fc68cff4 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -8,7 +8,7 @@ EAPI=6 CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python2_7 ) -inherit check-reqs cmake-utils flag-o-matic git-r3 llvm multilib-minimal \ +inherit cmake-utils flag-o-matic git-r3 llvm multilib-minimal \ python-single-r1 toolchain-funcs pax-utils versionator DESCRIPTION="C language family frontend for LLVM" @@ -74,38 +74,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need # multilib clang* libraries (not runtime, not wrappers). -check_space() { - local build_size=650 - - if use debug; then - ewarn "USE=debug is known to increase the size of package considerably" - ewarn "and cause the tests to fail." - ewarn - - (( build_size *= 14 )) - elif is-flagq '-g?(gdb)?([1-9])'; then - ewarn "The C++ compiler -g option is known to increase the size of the package" - ewarn "considerably. If you run out of space, please consider removing it." - ewarn - - (( build_size *= 10 )) - fi - - # Multiply by number of ABIs :). - local abis=( $(multilib_get_enabled_abis) ) - (( build_size *= ${#abis[@]} )) - - local CHECKREQS_DISK_BUILD=${build_size}M - check-reqs_pkg_pretend -} - -pkg_pretend() { - check_space -} - pkg_setup() { - check_space - LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup python-single-r1_pkg_setup }