Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-3.3-r1.ebuild llvm-9999.ebuild ChangeLog
Date: Fri, 02 Aug 2013 09:31:06
Message-Id: 20130802093059.724FB2171C@flycatcher.gentoo.org
1 mgorny 13/08/02 09:30:59
2
3 Modified: llvm-3.3-r1.ebuild llvm-9999.ebuild ChangeLog
4 Log:
5 Introduce disk space checks. Bug #479356.
6
7 (Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
8
9 Revision Changes Path
10 1.8 sys-devel/llvm/llvm-3.3-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?rev=1.8&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?rev=1.8&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?r1=1.7&r2=1.8
15
16 Index: llvm-3.3-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v
19 retrieving revision 1.7
20 retrieving revision 1.8
21 diff -u -r1.7 -r1.8
22 --- llvm-3.3-r1.ebuild 31 Jul 2013 22:08:14 -0000 1.7
23 +++ llvm-3.3-r1.ebuild 2 Aug 2013 09:30:59 -0000 1.8
24 @@ -1,13 +1,13 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.7 2013/07/31 22:08:14 mgorny Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.8 2013/08/02 09:30:59 mgorny Exp $
29
30 EAPI=5
31
32 PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
33
34 inherit eutils flag-o-matic multilib multilib-minimal \
35 - python-r1 toolchain-funcs pax-utils
36 + python-r1 toolchain-funcs pax-utils check-reqs
37
38 DESCRIPTION="Low Level Virtual Machine"
39 HOMEPAGE="http://llvm.org/"
40 @@ -61,7 +61,45 @@
41
42 S=${WORKDIR}/${P}.src
43
44 +pkg_pretend() {
45 + # in megs
46 + # !clang !debug !multitarget -O2 400
47 + # !clang !debug multitarget -O2 550
48 + # clang !debug !multitarget -O2 950
49 + # clang !debug multitarget -O2 1200
50 + # !clang debug multitarget -O2 5G
51 + # clang !debug multitarget -O0 -g 12G
52 + # clang debug multitarget -O2 16G
53 + # clang debug multitarget -O0 -g 14G
54 +
55 + local build_size=550
56 + use clang && build_size=1200
57 +
58 + if use debug; then
59 + ewarn "USE=debug is known to increase the size of package considerably"
60 + ewarn "and cause the tests to fail."
61 + ewarn
62 +
63 + (( build_size *= 14 ))
64 + elif is-flagq -g || is-flagq -ggdb; then
65 + ewarn "The C++ compiler -g option is known to increase the size of the package"
66 + ewarn "considerably. If you run out of space, please consider removing it."
67 + ewarn
68 +
69 + (( build_size *= 10 ))
70 + fi
71 +
72 + # Multiply by number of ABIs :).
73 + local abis=( $(multilib_get_enabled_abis) )
74 + (( build_size *= ${#abis[@]} ))
75 +
76 + CHECKREQS_DISK_BUILD=${build_size}M
77 + check-reqs_pkg_pretend
78 +}
79 +
80 pkg_setup() {
81 + check-reqs_pkg_setup
82 +
83 # need to check if the active compiler is ok
84
85 broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
86
87
88
89 1.47 sys-devel/llvm/llvm-9999.ebuild
90
91 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.47&view=markup
92 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.47&content-type=text/plain
93 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.46&r2=1.47
94
95 Index: llvm-9999.ebuild
96 ===================================================================
97 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
98 retrieving revision 1.46
99 retrieving revision 1.47
100 diff -u -r1.46 -r1.47
101 --- llvm-9999.ebuild 31 Jul 2013 22:47:06 -0000 1.46
102 +++ llvm-9999.ebuild 2 Aug 2013 09:30:59 -0000 1.47
103 @@ -1,13 +1,13 @@
104 # Copyright 1999-2013 Gentoo Foundation
105 # Distributed under the terms of the GNU General Public License v2
106 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.46 2013/07/31 22:47:06 mgorny Exp $
107 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.47 2013/08/02 09:30:59 mgorny Exp $
108
109 EAPI=5
110
111 PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
112
113 inherit subversion eutils flag-o-matic multilib multilib-minimal \
114 - python-r1 toolchain-funcs pax-utils
115 + python-r1 toolchain-funcs pax-utils check-reqs
116
117 DESCRIPTION="Low Level Virtual Machine"
118 HOMEPAGE="http://llvm.org/"
119 @@ -56,7 +56,45 @@
120 REQUIRED_USE="${PYTHON_REQUIRED_USE}
121 test? ( || ( $(python_gen_useflags 'python*') ) )"
122
123 +pkg_pretend() {
124 + # in megs
125 + # !clang !debug !multitarget -O2 400
126 + # !clang !debug multitarget -O2 550
127 + # clang !debug !multitarget -O2 950
128 + # clang !debug multitarget -O2 1200
129 + # !clang debug multitarget -O2 5G
130 + # clang !debug multitarget -O0 -g 12G
131 + # clang debug multitarget -O2 16G
132 + # clang debug multitarget -O0 -g 14G
133 +
134 + local build_size=550
135 + use clang && build_size=1200
136 +
137 + if use debug; then
138 + ewarn "USE=debug is known to increase the size of package considerably"
139 + ewarn "and cause the tests to fail."
140 + ewarn
141 +
142 + (( build_size *= 14 ))
143 + elif is-flagq -g || is-flagq -ggdb; then
144 + ewarn "The C++ compiler -g option is known to increase the size of the package"
145 + ewarn "considerably. If you run out of space, please consider removing it."
146 + ewarn
147 +
148 + (( build_size *= 10 ))
149 + fi
150 +
151 + # Multiply by number of ABIs :).
152 + local abis=( $(multilib_get_enabled_abis) )
153 + (( build_size *= ${#abis[@]} ))
154 +
155 + CHECKREQS_DISK_BUILD=${build_size}M
156 + check-reqs_pkg_pretend
157 +}
158 +
159 pkg_setup() {
160 + check-reqs_pkg_setup
161 +
162 # need to check if the active compiler is ok
163
164 broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
165
166
167
168 1.128 sys-devel/llvm/ChangeLog
169
170 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.128&view=markup
171 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.128&content-type=text/plain
172 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.127&r2=1.128
173
174 Index: ChangeLog
175 ===================================================================
176 RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
177 retrieving revision 1.127
178 retrieving revision 1.128
179 diff -u -r1.127 -r1.128
180 --- ChangeLog 31 Jul 2013 22:47:06 -0000 1.127
181 +++ ChangeLog 2 Aug 2013 09:30:59 -0000 1.128
182 @@ -1,6 +1,10 @@
183 # ChangeLog for sys-devel/llvm
184 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
185 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.127 2013/07/31 22:47:06 mgorny Exp $
186 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.128 2013/08/02 09:30:59 mgorny Exp $
187 +
188 + 02 Aug 2013; Michał Górny <mgorny@g.o> llvm-3.3-r1.ebuild,
189 + llvm-9999.ebuild:
190 + Introduce disk space checks. Bug #479356.
191
192 31 Jul 2013; Michał Górny <mgorny@g.o> -llvm-9999-r1.ebuild,
193 llvm-9999.ebuild:
Report Message
Find on MARC Find on Google Groups