| 1 |
commit: 96205dfbd1d850e3845e6b6a9bb058c1c38f79e4 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 15 08:48:08 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 15 08:53:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96205dfb |
| 7 |
|
| 8 |
sys-devel/llvm: Remove no-longer-useful check-reqs |
| 9 |
|
| 10 |
Now that LLVM is split, the package is no longer horribly large |
| 11 |
in regular builds. The new sizes fit the usual limits and so do not need |
| 12 |
specific checks. Furthermore, maintaining all those values with |
| 13 |
different USE flags and compiler flags combinations. |
| 14 |
|
| 15 |
sys-devel/llvm/llvm-4.0.0-r2.ebuild | 45 ++----------------------------------- |
| 16 |
sys-devel/llvm/llvm-9999.ebuild | 45 ++----------------------------------- |
| 17 |
2 files changed, 4 insertions(+), 86 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-devel/llvm/llvm-4.0.0-r2.ebuild b/sys-devel/llvm/llvm-4.0.0-r2.ebuild |
| 20 |
index 4e23b863f25..a61ba7cfb94 100644 |
| 21 |
--- a/sys-devel/llvm/llvm-4.0.0-r2.ebuild |
| 22 |
+++ b/sys-devel/llvm/llvm-4.0.0-r2.ebuild |
| 23 |
@@ -8,8 +8,8 @@ EAPI=6 |
| 24 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 25 |
PYTHON_COMPAT=( python2_7 ) |
| 26 |
|
| 27 |
-inherit check-reqs cmake-utils flag-o-matic \ |
| 28 |
- multilib-minimal pax-utils python-any-r1 toolchain-funcs versionator |
| 29 |
+inherit cmake-utils flag-o-matic multilib-minimal pax-utils \ |
| 30 |
+ python-any-r1 toolchain-funcs versionator |
| 31 |
|
| 32 |
DESCRIPTION="Low Level Virtual Machine" |
| 33 |
HOMEPAGE="http://llvm.org/" |
| 34 |
@@ -76,48 +76,7 @@ python_check_deps() { |
| 35 |
|| has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 36 |
} |
| 37 |
|
| 38 |
-check_space() { |
| 39 |
- # in megs |
| 40 |
- # !debug !multitarget -O2 400 |
| 41 |
- # !debug multitarget -O2 550 |
| 42 |
- # debug multitarget -O2 5G |
| 43 |
- |
| 44 |
- local build_size=550 |
| 45 |
- |
| 46 |
- if use debug; then |
| 47 |
- ewarn "USE=debug is known to increase the size of package considerably" |
| 48 |
- ewarn "and cause the tests to fail." |
| 49 |
- ewarn |
| 50 |
- |
| 51 |
- (( build_size *= 14 )) |
| 52 |
- elif is-flagq '-g?(gdb)?([1-9])'; then |
| 53 |
- ewarn "The C++ compiler -g option is known to increase the size of the package" |
| 54 |
- ewarn "considerably. If you run out of space, please consider removing it." |
| 55 |
- ewarn |
| 56 |
- |
| 57 |
- (( build_size *= 10 )) |
| 58 |
- fi |
| 59 |
- |
| 60 |
- # Multiply by number of ABIs :). |
| 61 |
- local abis=( $(multilib_get_enabled_abis) ) |
| 62 |
- (( build_size *= ${#abis[@]} )) |
| 63 |
- |
| 64 |
- local CHECKREQS_DISK_BUILD=${build_size}M |
| 65 |
- check-reqs_pkg_pretend |
| 66 |
-} |
| 67 |
- |
| 68 |
-pkg_pretend() { |
| 69 |
- check_space |
| 70 |
-} |
| 71 |
- |
| 72 |
-pkg_setup() { |
| 73 |
- check_space |
| 74 |
-} |
| 75 |
- |
| 76 |
src_prepare() { |
| 77 |
- # Python is needed to run tests using lit |
| 78 |
- python_setup |
| 79 |
- |
| 80 |
# Fix llvm-config for shared linking and sane flags |
| 81 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
| 82 |
eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
| 83 |
|
| 84 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
| 85 |
index 2d6aee82423..545cfbbcb49 100644 |
| 86 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
| 87 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
| 88 |
@@ -8,8 +8,8 @@ EAPI=6 |
| 89 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 90 |
PYTHON_COMPAT=( python2_7 ) |
| 91 |
|
| 92 |
-inherit check-reqs cmake-utils flag-o-matic git-r3 \ |
| 93 |
- multilib-minimal pax-utils python-any-r1 toolchain-funcs versionator |
| 94 |
+inherit cmake-utils flag-o-matic git-r3 multilib-minimal pax-utils \ |
| 95 |
+ python-any-r1 toolchain-funcs versionator |
| 96 |
|
| 97 |
DESCRIPTION="Low Level Virtual Machine" |
| 98 |
HOMEPAGE="http://llvm.org/" |
| 99 |
@@ -75,48 +75,7 @@ python_check_deps() { |
| 100 |
|| has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 101 |
} |
| 102 |
|
| 103 |
-check_space() { |
| 104 |
- # in megs |
| 105 |
- # !debug !multitarget -O2 400 |
| 106 |
- # !debug multitarget -O2 550 |
| 107 |
- # debug multitarget -O2 5G |
| 108 |
- |
| 109 |
- local build_size=550 |
| 110 |
- |
| 111 |
- if use debug; then |
| 112 |
- ewarn "USE=debug is known to increase the size of package considerably" |
| 113 |
- ewarn "and cause the tests to fail." |
| 114 |
- ewarn |
| 115 |
- |
| 116 |
- (( build_size *= 14 )) |
| 117 |
- elif is-flagq '-g?(gdb)?([1-9])'; then |
| 118 |
- ewarn "The C++ compiler -g option is known to increase the size of the package" |
| 119 |
- ewarn "considerably. If you run out of space, please consider removing it." |
| 120 |
- ewarn |
| 121 |
- |
| 122 |
- (( build_size *= 10 )) |
| 123 |
- fi |
| 124 |
- |
| 125 |
- # Multiply by number of ABIs :). |
| 126 |
- local abis=( $(multilib_get_enabled_abis) ) |
| 127 |
- (( build_size *= ${#abis[@]} )) |
| 128 |
- |
| 129 |
- local CHECKREQS_DISK_BUILD=${build_size}M |
| 130 |
- check-reqs_pkg_pretend |
| 131 |
-} |
| 132 |
- |
| 133 |
-pkg_pretend() { |
| 134 |
- check_space |
| 135 |
-} |
| 136 |
- |
| 137 |
-pkg_setup() { |
| 138 |
- check_space |
| 139 |
-} |
| 140 |
- |
| 141 |
src_prepare() { |
| 142 |
- # Python is needed to run tests using lit |
| 143 |
- python_setup |
| 144 |
- |
| 145 |
# Fix llvm-config for shared linking and sane flags |
| 146 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
| 147 |
eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
Archives