1 |
commit: 8d0d9f0ab26cf26f68f011374b4ec773d73b930e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 20 01:11:18 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 20 01:11:43 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=8d0d9f0a |
7 |
|
8 |
app-emulation/wine-vanilla: [QA] drop (very) stale GCC version checks |
9 |
|
10 |
Ionen pointed out I left out a bunch of the ebuilds somehow. |
11 |
|
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../wine-vanilla/wine-vanilla-6.10.ebuild | 70 +--------------------- |
15 |
.../wine-vanilla/wine-vanilla-6.11.ebuild | 70 +--------------------- |
16 |
.../wine-vanilla/wine-vanilla-6.12.ebuild | 70 +--------------------- |
17 |
.../wine-vanilla/wine-vanilla-6.13.ebuild | 70 +--------------------- |
18 |
.../wine-vanilla/wine-vanilla-6.14.ebuild | 70 +--------------------- |
19 |
.../wine-vanilla/wine-vanilla-6.15.ebuild | 70 +--------------------- |
20 |
.../wine-vanilla/wine-vanilla-6.16.ebuild | 70 +--------------------- |
21 |
.../wine-vanilla/wine-vanilla-6.17.ebuild | 70 +--------------------- |
22 |
.../wine-vanilla/wine-vanilla-6.18.ebuild | 70 +--------------------- |
23 |
.../wine-vanilla/wine-vanilla-6.19.ebuild | 70 +--------------------- |
24 |
.../wine-vanilla/wine-vanilla-6.20.ebuild | 70 +--------------------- |
25 |
.../wine-vanilla/wine-vanilla-6.21.ebuild | 70 +--------------------- |
26 |
.../wine-vanilla/wine-vanilla-6.22.ebuild | 70 +--------------------- |
27 |
.../wine-vanilla/wine-vanilla-6.23.ebuild | 70 +--------------------- |
28 |
app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild | 70 +--------------------- |
29 |
app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild | 70 +--------------------- |
30 |
app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild | 70 +--------------------- |
31 |
app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild | 70 +--------------------- |
32 |
app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild | 70 +--------------------- |
33 |
app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild | 70 +--------------------- |
34 |
.../wine-vanilla/wine-vanilla-7.0-r2.ebuild | 70 +--------------------- |
35 |
app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild | 70 +--------------------- |
36 |
app-emulation/wine-vanilla/wine-vanilla-7.1.ebuild | 70 +--------------------- |
37 |
app-emulation/wine-vanilla/wine-vanilla-7.2.ebuild | 70 +--------------------- |
38 |
.../wine-vanilla/wine-vanilla-7.3-r1.ebuild | 70 +--------------------- |
39 |
.../wine-vanilla/wine-vanilla-7.4-r1.ebuild | 70 +--------------------- |
40 |
.../wine-vanilla/wine-vanilla-7.5-r1.ebuild | 70 +--------------------- |
41 |
.../wine-vanilla/wine-vanilla-7.6-r1.ebuild | 70 +--------------------- |
42 |
app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild | 70 +--------------------- |
43 |
app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild | 70 +--------------------- |
44 |
.../wine-vanilla/wine-vanilla-9999.ebuild | 70 +--------------------- |
45 |
31 files changed, 93 insertions(+), 2077 deletions(-) |
46 |
|
47 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild |
48 |
index e8e05b6..5a577bd 100644 |
49 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild |
50 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild |
51 |
@@ -152,80 +152,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
52 |
fi |
53 |
|
54 |
wine_compiler_check() { |
55 |
- # GCC-specific bugs |
56 |
- if tc-is-gcc; then |
57 |
- # bug #549768 |
58 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
59 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
60 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
61 |
- # Run in subshell to prevent "Aborted" message |
62 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
63 |
- if ! eend $?; then |
64 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
65 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
66 |
- eerror "or use gcc-config to select a different compiler version." |
67 |
- eerror "See https://bugs.gentoo.org/549768" |
68 |
- eerror |
69 |
- return 1 |
70 |
- fi |
71 |
- fi |
72 |
- # bug #574044 |
73 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
74 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
75 |
- # Compile in subshell to prevent "Aborted" message |
76 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
77 |
- if ! eend $?; then |
78 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
79 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
80 |
- eerror "or use gcc-config to select a different compiler version." |
81 |
- eerror "See https://bugs.gentoo.org/574044" |
82 |
- eerror |
83 |
- return 1 |
84 |
- fi |
85 |
- fi |
86 |
- fi |
87 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
88 |
|
89 |
# Ensure compiler support |
90 |
- if use abi_x86_64; then |
91 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
92 |
- # Compile in subshell to prevent "Aborted" message |
93 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
94 |
- if ! eend $?; then |
95 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
96 |
- eerror |
97 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
98 |
- eerror |
99 |
- return 1 |
100 |
- fi |
101 |
- fi |
102 |
+ # (No checks here as of 2022) |
103 |
+ return 0 |
104 |
} |
105 |
|
106 |
wine_build_environment_check() { |
107 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
108 |
|
109 |
- if use abi_x86_64; then |
110 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
111 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
112 |
- die |
113 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
114 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
115 |
- die |
116 |
- fi |
117 |
- fi |
118 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
119 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
120 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
121 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
122 |
- fi |
123 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
124 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
125 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
126 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
127 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
128 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
129 |
- fi |
130 |
- fi |
131 |
- |
132 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
133 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
134 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
135 |
|
136 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild |
137 |
index e8e05b6..5a577bd 100644 |
138 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild |
139 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild |
140 |
@@ -152,80 +152,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
141 |
fi |
142 |
|
143 |
wine_compiler_check() { |
144 |
- # GCC-specific bugs |
145 |
- if tc-is-gcc; then |
146 |
- # bug #549768 |
147 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
148 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
149 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
150 |
- # Run in subshell to prevent "Aborted" message |
151 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
152 |
- if ! eend $?; then |
153 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
154 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
155 |
- eerror "or use gcc-config to select a different compiler version." |
156 |
- eerror "See https://bugs.gentoo.org/549768" |
157 |
- eerror |
158 |
- return 1 |
159 |
- fi |
160 |
- fi |
161 |
- # bug #574044 |
162 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
163 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
164 |
- # Compile in subshell to prevent "Aborted" message |
165 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
166 |
- if ! eend $?; then |
167 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
168 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
169 |
- eerror "or use gcc-config to select a different compiler version." |
170 |
- eerror "See https://bugs.gentoo.org/574044" |
171 |
- eerror |
172 |
- return 1 |
173 |
- fi |
174 |
- fi |
175 |
- fi |
176 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
177 |
|
178 |
# Ensure compiler support |
179 |
- if use abi_x86_64; then |
180 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
181 |
- # Compile in subshell to prevent "Aborted" message |
182 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
183 |
- if ! eend $?; then |
184 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
185 |
- eerror |
186 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
187 |
- eerror |
188 |
- return 1 |
189 |
- fi |
190 |
- fi |
191 |
+ # (No checks here as of 2022) |
192 |
+ return 0 |
193 |
} |
194 |
|
195 |
wine_build_environment_check() { |
196 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
197 |
|
198 |
- if use abi_x86_64; then |
199 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
200 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
201 |
- die |
202 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
203 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
204 |
- die |
205 |
- fi |
206 |
- fi |
207 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
208 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
209 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
210 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
211 |
- fi |
212 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
213 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
214 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
215 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
216 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
217 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
218 |
- fi |
219 |
- fi |
220 |
- |
221 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
222 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
223 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
224 |
|
225 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild |
226 |
index 95e4cc4..7ea5480 100644 |
227 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild |
228 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild |
229 |
@@ -153,80 +153,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
230 |
fi |
231 |
|
232 |
wine_compiler_check() { |
233 |
- # GCC-specific bugs |
234 |
- if tc-is-gcc; then |
235 |
- # bug #549768 |
236 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
237 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
238 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
239 |
- # Run in subshell to prevent "Aborted" message |
240 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
241 |
- if ! eend $?; then |
242 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
243 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
244 |
- eerror "or use gcc-config to select a different compiler version." |
245 |
- eerror "See https://bugs.gentoo.org/549768" |
246 |
- eerror |
247 |
- return 1 |
248 |
- fi |
249 |
- fi |
250 |
- # bug #574044 |
251 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
252 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
253 |
- # Compile in subshell to prevent "Aborted" message |
254 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
255 |
- if ! eend $?; then |
256 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
257 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
258 |
- eerror "or use gcc-config to select a different compiler version." |
259 |
- eerror "See https://bugs.gentoo.org/574044" |
260 |
- eerror |
261 |
- return 1 |
262 |
- fi |
263 |
- fi |
264 |
- fi |
265 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
266 |
|
267 |
# Ensure compiler support |
268 |
- if use abi_x86_64; then |
269 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
270 |
- # Compile in subshell to prevent "Aborted" message |
271 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
272 |
- if ! eend $?; then |
273 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
274 |
- eerror |
275 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
276 |
- eerror |
277 |
- return 1 |
278 |
- fi |
279 |
- fi |
280 |
+ # (No checks here as of 2022) |
281 |
+ return 0 |
282 |
} |
283 |
|
284 |
wine_build_environment_check() { |
285 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
286 |
|
287 |
- if use abi_x86_64; then |
288 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
289 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
290 |
- die |
291 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
292 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
293 |
- die |
294 |
- fi |
295 |
- fi |
296 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
297 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
298 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
299 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
300 |
- fi |
301 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
302 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
303 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
304 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
305 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
306 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
307 |
- fi |
308 |
- fi |
309 |
- |
310 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
311 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
312 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
313 |
|
314 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild |
315 |
index 95e4cc4..7ea5480 100644 |
316 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild |
317 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.13.ebuild |
318 |
@@ -153,80 +153,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
319 |
fi |
320 |
|
321 |
wine_compiler_check() { |
322 |
- # GCC-specific bugs |
323 |
- if tc-is-gcc; then |
324 |
- # bug #549768 |
325 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
326 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
327 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
328 |
- # Run in subshell to prevent "Aborted" message |
329 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
330 |
- if ! eend $?; then |
331 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
332 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
333 |
- eerror "or use gcc-config to select a different compiler version." |
334 |
- eerror "See https://bugs.gentoo.org/549768" |
335 |
- eerror |
336 |
- return 1 |
337 |
- fi |
338 |
- fi |
339 |
- # bug #574044 |
340 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
341 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
342 |
- # Compile in subshell to prevent "Aborted" message |
343 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
344 |
- if ! eend $?; then |
345 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
346 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
347 |
- eerror "or use gcc-config to select a different compiler version." |
348 |
- eerror "See https://bugs.gentoo.org/574044" |
349 |
- eerror |
350 |
- return 1 |
351 |
- fi |
352 |
- fi |
353 |
- fi |
354 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
355 |
|
356 |
# Ensure compiler support |
357 |
- if use abi_x86_64; then |
358 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
359 |
- # Compile in subshell to prevent "Aborted" message |
360 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
361 |
- if ! eend $?; then |
362 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
363 |
- eerror |
364 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
365 |
- eerror |
366 |
- return 1 |
367 |
- fi |
368 |
- fi |
369 |
+ # (No checks here as of 2022) |
370 |
+ return 0 |
371 |
} |
372 |
|
373 |
wine_build_environment_check() { |
374 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
375 |
|
376 |
- if use abi_x86_64; then |
377 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
378 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
379 |
- die |
380 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
381 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
382 |
- die |
383 |
- fi |
384 |
- fi |
385 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
386 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
387 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
388 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
389 |
- fi |
390 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
391 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
392 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
393 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
394 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
395 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
396 |
- fi |
397 |
- fi |
398 |
- |
399 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
400 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
401 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
402 |
|
403 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild |
404 |
index e4aa377..21d60c0 100644 |
405 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild |
406 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild |
407 |
@@ -152,80 +152,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
408 |
fi |
409 |
|
410 |
wine_compiler_check() { |
411 |
- # GCC-specific bugs |
412 |
- if tc-is-gcc; then |
413 |
- # bug #549768 |
414 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
415 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
416 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
417 |
- # Run in subshell to prevent "Aborted" message |
418 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
419 |
- if ! eend $?; then |
420 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
421 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
422 |
- eerror "or use gcc-config to select a different compiler version." |
423 |
- eerror "See https://bugs.gentoo.org/549768" |
424 |
- eerror |
425 |
- return 1 |
426 |
- fi |
427 |
- fi |
428 |
- # bug #574044 |
429 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
430 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
431 |
- # Compile in subshell to prevent "Aborted" message |
432 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
433 |
- if ! eend $?; then |
434 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
435 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
436 |
- eerror "or use gcc-config to select a different compiler version." |
437 |
- eerror "See https://bugs.gentoo.org/574044" |
438 |
- eerror |
439 |
- return 1 |
440 |
- fi |
441 |
- fi |
442 |
- fi |
443 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
444 |
|
445 |
# Ensure compiler support |
446 |
- if use abi_x86_64; then |
447 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
448 |
- # Compile in subshell to prevent "Aborted" message |
449 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
450 |
- if ! eend $?; then |
451 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
452 |
- eerror |
453 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
454 |
- eerror |
455 |
- return 1 |
456 |
- fi |
457 |
- fi |
458 |
+ # (No checks here as of 2022) |
459 |
+ return 0 |
460 |
} |
461 |
|
462 |
wine_build_environment_check() { |
463 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
464 |
|
465 |
- if use abi_x86_64; then |
466 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
467 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
468 |
- die |
469 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
470 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
471 |
- die |
472 |
- fi |
473 |
- fi |
474 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
475 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
476 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
477 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
478 |
- fi |
479 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
480 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
481 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
482 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
483 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
484 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
485 |
- fi |
486 |
- fi |
487 |
- |
488 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
489 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
490 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
491 |
|
492 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.15.ebuild |
493 |
index 6bfde1e..2c94391 100644 |
494 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.15.ebuild |
495 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.15.ebuild |
496 |
@@ -151,80 +151,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
497 |
fi |
498 |
|
499 |
wine_compiler_check() { |
500 |
- # GCC-specific bugs |
501 |
- if tc-is-gcc; then |
502 |
- # bug #549768 |
503 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
504 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
505 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
506 |
- # Run in subshell to prevent "Aborted" message |
507 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
508 |
- if ! eend $?; then |
509 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
510 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
511 |
- eerror "or use gcc-config to select a different compiler version." |
512 |
- eerror "See https://bugs.gentoo.org/549768" |
513 |
- eerror |
514 |
- return 1 |
515 |
- fi |
516 |
- fi |
517 |
- # bug #574044 |
518 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
519 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
520 |
- # Compile in subshell to prevent "Aborted" message |
521 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
522 |
- if ! eend $?; then |
523 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
524 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
525 |
- eerror "or use gcc-config to select a different compiler version." |
526 |
- eerror "See https://bugs.gentoo.org/574044" |
527 |
- eerror |
528 |
- return 1 |
529 |
- fi |
530 |
- fi |
531 |
- fi |
532 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
533 |
|
534 |
# Ensure compiler support |
535 |
- if use abi_x86_64; then |
536 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
537 |
- # Compile in subshell to prevent "Aborted" message |
538 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
539 |
- if ! eend $?; then |
540 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
541 |
- eerror |
542 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
543 |
- eerror |
544 |
- return 1 |
545 |
- fi |
546 |
- fi |
547 |
+ # (No checks here as of 2022) |
548 |
+ return 0 |
549 |
} |
550 |
|
551 |
wine_build_environment_check() { |
552 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
553 |
|
554 |
- if use abi_x86_64; then |
555 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
556 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
557 |
- die |
558 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
559 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
560 |
- die |
561 |
- fi |
562 |
- fi |
563 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
564 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
565 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
566 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
567 |
- fi |
568 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
569 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
570 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
571 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
572 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
573 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
574 |
- fi |
575 |
- fi |
576 |
- |
577 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
578 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
579 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
580 |
|
581 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.16.ebuild |
582 |
index 6bfde1e..2c94391 100644 |
583 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.16.ebuild |
584 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.16.ebuild |
585 |
@@ -151,80 +151,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
586 |
fi |
587 |
|
588 |
wine_compiler_check() { |
589 |
- # GCC-specific bugs |
590 |
- if tc-is-gcc; then |
591 |
- # bug #549768 |
592 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
593 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
594 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
595 |
- # Run in subshell to prevent "Aborted" message |
596 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
597 |
- if ! eend $?; then |
598 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
599 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
600 |
- eerror "or use gcc-config to select a different compiler version." |
601 |
- eerror "See https://bugs.gentoo.org/549768" |
602 |
- eerror |
603 |
- return 1 |
604 |
- fi |
605 |
- fi |
606 |
- # bug #574044 |
607 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
608 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
609 |
- # Compile in subshell to prevent "Aborted" message |
610 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
611 |
- if ! eend $?; then |
612 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
613 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
614 |
- eerror "or use gcc-config to select a different compiler version." |
615 |
- eerror "See https://bugs.gentoo.org/574044" |
616 |
- eerror |
617 |
- return 1 |
618 |
- fi |
619 |
- fi |
620 |
- fi |
621 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
622 |
|
623 |
# Ensure compiler support |
624 |
- if use abi_x86_64; then |
625 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
626 |
- # Compile in subshell to prevent "Aborted" message |
627 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
628 |
- if ! eend $?; then |
629 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
630 |
- eerror |
631 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
632 |
- eerror |
633 |
- return 1 |
634 |
- fi |
635 |
- fi |
636 |
+ # (No checks here as of 2022) |
637 |
+ return 0 |
638 |
} |
639 |
|
640 |
wine_build_environment_check() { |
641 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
642 |
|
643 |
- if use abi_x86_64; then |
644 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
645 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
646 |
- die |
647 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
648 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
649 |
- die |
650 |
- fi |
651 |
- fi |
652 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
653 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
654 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
655 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
656 |
- fi |
657 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
658 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
659 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
660 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
661 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
662 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
663 |
- fi |
664 |
- fi |
665 |
- |
666 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
667 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
668 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
669 |
|
670 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.17.ebuild |
671 |
index 6bfde1e..2c94391 100644 |
672 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.17.ebuild |
673 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.17.ebuild |
674 |
@@ -151,80 +151,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
675 |
fi |
676 |
|
677 |
wine_compiler_check() { |
678 |
- # GCC-specific bugs |
679 |
- if tc-is-gcc; then |
680 |
- # bug #549768 |
681 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
682 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
683 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
684 |
- # Run in subshell to prevent "Aborted" message |
685 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
686 |
- if ! eend $?; then |
687 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
688 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
689 |
- eerror "or use gcc-config to select a different compiler version." |
690 |
- eerror "See https://bugs.gentoo.org/549768" |
691 |
- eerror |
692 |
- return 1 |
693 |
- fi |
694 |
- fi |
695 |
- # bug #574044 |
696 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
697 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
698 |
- # Compile in subshell to prevent "Aborted" message |
699 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
700 |
- if ! eend $?; then |
701 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
702 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
703 |
- eerror "or use gcc-config to select a different compiler version." |
704 |
- eerror "See https://bugs.gentoo.org/574044" |
705 |
- eerror |
706 |
- return 1 |
707 |
- fi |
708 |
- fi |
709 |
- fi |
710 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
711 |
|
712 |
# Ensure compiler support |
713 |
- if use abi_x86_64; then |
714 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
715 |
- # Compile in subshell to prevent "Aborted" message |
716 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
717 |
- if ! eend $?; then |
718 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
719 |
- eerror |
720 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
721 |
- eerror |
722 |
- return 1 |
723 |
- fi |
724 |
- fi |
725 |
+ # (No checks here as of 2022) |
726 |
+ return 0 |
727 |
} |
728 |
|
729 |
wine_build_environment_check() { |
730 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
731 |
|
732 |
- if use abi_x86_64; then |
733 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
734 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
735 |
- die |
736 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
737 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
738 |
- die |
739 |
- fi |
740 |
- fi |
741 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
742 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
743 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
744 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
745 |
- fi |
746 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
747 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
748 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
749 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
750 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
751 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
752 |
- fi |
753 |
- fi |
754 |
- |
755 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
756 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
757 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
758 |
|
759 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.18.ebuild |
760 |
index cf19f05..a65d418 100644 |
761 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.18.ebuild |
762 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.18.ebuild |
763 |
@@ -151,80 +151,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
764 |
fi |
765 |
|
766 |
wine_compiler_check() { |
767 |
- # GCC-specific bugs |
768 |
- if tc-is-gcc; then |
769 |
- # bug #549768 |
770 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
771 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
772 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
773 |
- # Run in subshell to prevent "Aborted" message |
774 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
775 |
- if ! eend $?; then |
776 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
777 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
778 |
- eerror "or use gcc-config to select a different compiler version." |
779 |
- eerror "See https://bugs.gentoo.org/549768" |
780 |
- eerror |
781 |
- return 1 |
782 |
- fi |
783 |
- fi |
784 |
- # bug #574044 |
785 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
786 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
787 |
- # Compile in subshell to prevent "Aborted" message |
788 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
789 |
- if ! eend $?; then |
790 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
791 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
792 |
- eerror "or use gcc-config to select a different compiler version." |
793 |
- eerror "See https://bugs.gentoo.org/574044" |
794 |
- eerror |
795 |
- return 1 |
796 |
- fi |
797 |
- fi |
798 |
- fi |
799 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
800 |
|
801 |
# Ensure compiler support |
802 |
- if use abi_x86_64; then |
803 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
804 |
- # Compile in subshell to prevent "Aborted" message |
805 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
806 |
- if ! eend $?; then |
807 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
808 |
- eerror |
809 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
810 |
- eerror |
811 |
- return 1 |
812 |
- fi |
813 |
- fi |
814 |
+ # (No checks here as of 2022) |
815 |
+ return 0 |
816 |
} |
817 |
|
818 |
wine_build_environment_check() { |
819 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
820 |
|
821 |
- if use abi_x86_64; then |
822 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
823 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
824 |
- die |
825 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
826 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
827 |
- die |
828 |
- fi |
829 |
- fi |
830 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
831 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
832 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
833 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
834 |
- fi |
835 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
836 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
837 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
838 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
839 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
840 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
841 |
- fi |
842 |
- fi |
843 |
- |
844 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
845 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
846 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
847 |
|
848 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.19.ebuild |
849 |
index cf19f05..a65d418 100644 |
850 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.19.ebuild |
851 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.19.ebuild |
852 |
@@ -151,80 +151,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
853 |
fi |
854 |
|
855 |
wine_compiler_check() { |
856 |
- # GCC-specific bugs |
857 |
- if tc-is-gcc; then |
858 |
- # bug #549768 |
859 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
860 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
861 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
862 |
- # Run in subshell to prevent "Aborted" message |
863 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
864 |
- if ! eend $?; then |
865 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
866 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
867 |
- eerror "or use gcc-config to select a different compiler version." |
868 |
- eerror "See https://bugs.gentoo.org/549768" |
869 |
- eerror |
870 |
- return 1 |
871 |
- fi |
872 |
- fi |
873 |
- # bug #574044 |
874 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
875 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
876 |
- # Compile in subshell to prevent "Aborted" message |
877 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
878 |
- if ! eend $?; then |
879 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
880 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
881 |
- eerror "or use gcc-config to select a different compiler version." |
882 |
- eerror "See https://bugs.gentoo.org/574044" |
883 |
- eerror |
884 |
- return 1 |
885 |
- fi |
886 |
- fi |
887 |
- fi |
888 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
889 |
|
890 |
# Ensure compiler support |
891 |
- if use abi_x86_64; then |
892 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
893 |
- # Compile in subshell to prevent "Aborted" message |
894 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
895 |
- if ! eend $?; then |
896 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
897 |
- eerror |
898 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
899 |
- eerror |
900 |
- return 1 |
901 |
- fi |
902 |
- fi |
903 |
+ # (No checks here as of 2022) |
904 |
+ return 0 |
905 |
} |
906 |
|
907 |
wine_build_environment_check() { |
908 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
909 |
|
910 |
- if use abi_x86_64; then |
911 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
912 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
913 |
- die |
914 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
915 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
916 |
- die |
917 |
- fi |
918 |
- fi |
919 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
920 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
921 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
922 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
923 |
- fi |
924 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
925 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
926 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
927 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
928 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
929 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
930 |
- fi |
931 |
- fi |
932 |
- |
933 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
934 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
935 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
936 |
|
937 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.20.ebuild |
938 |
index 7c8661c..b242e1e 100644 |
939 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.20.ebuild |
940 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.20.ebuild |
941 |
@@ -144,80 +144,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
942 |
fi |
943 |
|
944 |
wine_compiler_check() { |
945 |
- # GCC-specific bugs |
946 |
- if tc-is-gcc; then |
947 |
- # bug #549768 |
948 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
949 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
950 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
951 |
- # Run in subshell to prevent "Aborted" message |
952 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
953 |
- if ! eend $?; then |
954 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
955 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
956 |
- eerror "or use gcc-config to select a different compiler version." |
957 |
- eerror "See https://bugs.gentoo.org/549768" |
958 |
- eerror |
959 |
- return 1 |
960 |
- fi |
961 |
- fi |
962 |
- # bug #574044 |
963 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
964 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
965 |
- # Compile in subshell to prevent "Aborted" message |
966 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
967 |
- if ! eend $?; then |
968 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
969 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
970 |
- eerror "or use gcc-config to select a different compiler version." |
971 |
- eerror "See https://bugs.gentoo.org/574044" |
972 |
- eerror |
973 |
- return 1 |
974 |
- fi |
975 |
- fi |
976 |
- fi |
977 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
978 |
|
979 |
# Ensure compiler support |
980 |
- if use abi_x86_64; then |
981 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
982 |
- # Compile in subshell to prevent "Aborted" message |
983 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
984 |
- if ! eend $?; then |
985 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
986 |
- eerror |
987 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
988 |
- eerror |
989 |
- return 1 |
990 |
- fi |
991 |
- fi |
992 |
+ # (No checks here as of 2022) |
993 |
+ return 0 |
994 |
} |
995 |
|
996 |
wine_build_environment_check() { |
997 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
998 |
|
999 |
- if use abi_x86_64; then |
1000 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1001 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1002 |
- die |
1003 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1004 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1005 |
- die |
1006 |
- fi |
1007 |
- fi |
1008 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1009 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1010 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1011 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1012 |
- fi |
1013 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1014 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1015 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1016 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1017 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1018 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1019 |
- fi |
1020 |
- fi |
1021 |
- |
1022 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1023 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1024 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1025 |
|
1026 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild |
1027 |
index 7c8661c..b242e1e 100644 |
1028 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild |
1029 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild |
1030 |
@@ -144,80 +144,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1031 |
fi |
1032 |
|
1033 |
wine_compiler_check() { |
1034 |
- # GCC-specific bugs |
1035 |
- if tc-is-gcc; then |
1036 |
- # bug #549768 |
1037 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1038 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1039 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1040 |
- # Run in subshell to prevent "Aborted" message |
1041 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1042 |
- if ! eend $?; then |
1043 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1044 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1045 |
- eerror "or use gcc-config to select a different compiler version." |
1046 |
- eerror "See https://bugs.gentoo.org/549768" |
1047 |
- eerror |
1048 |
- return 1 |
1049 |
- fi |
1050 |
- fi |
1051 |
- # bug #574044 |
1052 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1053 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1054 |
- # Compile in subshell to prevent "Aborted" message |
1055 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1056 |
- if ! eend $?; then |
1057 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1058 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1059 |
- eerror "or use gcc-config to select a different compiler version." |
1060 |
- eerror "See https://bugs.gentoo.org/574044" |
1061 |
- eerror |
1062 |
- return 1 |
1063 |
- fi |
1064 |
- fi |
1065 |
- fi |
1066 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1067 |
|
1068 |
# Ensure compiler support |
1069 |
- if use abi_x86_64; then |
1070 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1071 |
- # Compile in subshell to prevent "Aborted" message |
1072 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1073 |
- if ! eend $?; then |
1074 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1075 |
- eerror |
1076 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1077 |
- eerror |
1078 |
- return 1 |
1079 |
- fi |
1080 |
- fi |
1081 |
+ # (No checks here as of 2022) |
1082 |
+ return 0 |
1083 |
} |
1084 |
|
1085 |
wine_build_environment_check() { |
1086 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1087 |
|
1088 |
- if use abi_x86_64; then |
1089 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1090 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1091 |
- die |
1092 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1093 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1094 |
- die |
1095 |
- fi |
1096 |
- fi |
1097 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1098 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1099 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1100 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1101 |
- fi |
1102 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1103 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1104 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1105 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1106 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1107 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1108 |
- fi |
1109 |
- fi |
1110 |
- |
1111 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1112 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1113 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1114 |
|
1115 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.22.ebuild |
1116 |
index 1aa441c..82d0569 100644 |
1117 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.22.ebuild |
1118 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.22.ebuild |
1119 |
@@ -143,80 +143,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1120 |
fi |
1121 |
|
1122 |
wine_compiler_check() { |
1123 |
- # GCC-specific bugs |
1124 |
- if tc-is-gcc; then |
1125 |
- # bug #549768 |
1126 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1127 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1128 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1129 |
- # Run in subshell to prevent "Aborted" message |
1130 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1131 |
- if ! eend $?; then |
1132 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1133 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1134 |
- eerror "or use gcc-config to select a different compiler version." |
1135 |
- eerror "See https://bugs.gentoo.org/549768" |
1136 |
- eerror |
1137 |
- return 1 |
1138 |
- fi |
1139 |
- fi |
1140 |
- # bug #574044 |
1141 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1142 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1143 |
- # Compile in subshell to prevent "Aborted" message |
1144 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1145 |
- if ! eend $?; then |
1146 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1147 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1148 |
- eerror "or use gcc-config to select a different compiler version." |
1149 |
- eerror "See https://bugs.gentoo.org/574044" |
1150 |
- eerror |
1151 |
- return 1 |
1152 |
- fi |
1153 |
- fi |
1154 |
- fi |
1155 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1156 |
|
1157 |
# Ensure compiler support |
1158 |
- if use abi_x86_64; then |
1159 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1160 |
- # Compile in subshell to prevent "Aborted" message |
1161 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1162 |
- if ! eend $?; then |
1163 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1164 |
- eerror |
1165 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1166 |
- eerror |
1167 |
- return 1 |
1168 |
- fi |
1169 |
- fi |
1170 |
+ # (No checks here as of 2022) |
1171 |
+ return 0 |
1172 |
} |
1173 |
|
1174 |
wine_build_environment_check() { |
1175 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1176 |
|
1177 |
- if use abi_x86_64; then |
1178 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1179 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1180 |
- die |
1181 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1182 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1183 |
- die |
1184 |
- fi |
1185 |
- fi |
1186 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1187 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1188 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1189 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1190 |
- fi |
1191 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1192 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1193 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1194 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1195 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1196 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1197 |
- fi |
1198 |
- fi |
1199 |
- |
1200 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1201 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1202 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1203 |
|
1204 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.23.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.23.ebuild |
1205 |
index 1aa441c..82d0569 100644 |
1206 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.23.ebuild |
1207 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.23.ebuild |
1208 |
@@ -143,80 +143,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1209 |
fi |
1210 |
|
1211 |
wine_compiler_check() { |
1212 |
- # GCC-specific bugs |
1213 |
- if tc-is-gcc; then |
1214 |
- # bug #549768 |
1215 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1216 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1217 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1218 |
- # Run in subshell to prevent "Aborted" message |
1219 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1220 |
- if ! eend $?; then |
1221 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1222 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1223 |
- eerror "or use gcc-config to select a different compiler version." |
1224 |
- eerror "See https://bugs.gentoo.org/549768" |
1225 |
- eerror |
1226 |
- return 1 |
1227 |
- fi |
1228 |
- fi |
1229 |
- # bug #574044 |
1230 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1231 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1232 |
- # Compile in subshell to prevent "Aborted" message |
1233 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1234 |
- if ! eend $?; then |
1235 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1236 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1237 |
- eerror "or use gcc-config to select a different compiler version." |
1238 |
- eerror "See https://bugs.gentoo.org/574044" |
1239 |
- eerror |
1240 |
- return 1 |
1241 |
- fi |
1242 |
- fi |
1243 |
- fi |
1244 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1245 |
|
1246 |
# Ensure compiler support |
1247 |
- if use abi_x86_64; then |
1248 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1249 |
- # Compile in subshell to prevent "Aborted" message |
1250 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1251 |
- if ! eend $?; then |
1252 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1253 |
- eerror |
1254 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1255 |
- eerror |
1256 |
- return 1 |
1257 |
- fi |
1258 |
- fi |
1259 |
+ # (No checks here as of 2022) |
1260 |
+ return 0 |
1261 |
} |
1262 |
|
1263 |
wine_build_environment_check() { |
1264 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1265 |
|
1266 |
- if use abi_x86_64; then |
1267 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1268 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1269 |
- die |
1270 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1271 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1272 |
- die |
1273 |
- fi |
1274 |
- fi |
1275 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1276 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1277 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1278 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1279 |
- fi |
1280 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1281 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1282 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1283 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1284 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1285 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1286 |
- fi |
1287 |
- fi |
1288 |
- |
1289 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1290 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1291 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1292 |
|
1293 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild |
1294 |
index 6504d5f..769104f 100644 |
1295 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild |
1296 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild |
1297 |
@@ -152,80 +152,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1298 |
fi |
1299 |
|
1300 |
wine_compiler_check() { |
1301 |
- # GCC-specific bugs |
1302 |
- if tc-is-gcc; then |
1303 |
- # bug #549768 |
1304 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1305 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1306 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1307 |
- # Run in subshell to prevent "Aborted" message |
1308 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1309 |
- if ! eend $?; then |
1310 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1311 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1312 |
- eerror "or use gcc-config to select a different compiler version." |
1313 |
- eerror "See https://bugs.gentoo.org/549768" |
1314 |
- eerror |
1315 |
- return 1 |
1316 |
- fi |
1317 |
- fi |
1318 |
- # bug #574044 |
1319 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1320 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1321 |
- # Compile in subshell to prevent "Aborted" message |
1322 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1323 |
- if ! eend $?; then |
1324 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1325 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1326 |
- eerror "or use gcc-config to select a different compiler version." |
1327 |
- eerror "See https://bugs.gentoo.org/574044" |
1328 |
- eerror |
1329 |
- return 1 |
1330 |
- fi |
1331 |
- fi |
1332 |
- fi |
1333 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1334 |
|
1335 |
# Ensure compiler support |
1336 |
- if use abi_x86_64; then |
1337 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1338 |
- # Compile in subshell to prevent "Aborted" message |
1339 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1340 |
- if ! eend $?; then |
1341 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1342 |
- eerror |
1343 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1344 |
- eerror |
1345 |
- return 1 |
1346 |
- fi |
1347 |
- fi |
1348 |
+ # (No checks here as of 2022) |
1349 |
+ return 0 |
1350 |
} |
1351 |
|
1352 |
wine_build_environment_check() { |
1353 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1354 |
|
1355 |
- if use abi_x86_64; then |
1356 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1357 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1358 |
- die |
1359 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1360 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1361 |
- die |
1362 |
- fi |
1363 |
- fi |
1364 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1365 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1366 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1367 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1368 |
- fi |
1369 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1370 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1371 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1372 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1373 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1374 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1375 |
- fi |
1376 |
- fi |
1377 |
- |
1378 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1379 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1380 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1381 |
|
1382 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild |
1383 |
index 6504d5f..769104f 100644 |
1384 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild |
1385 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild |
1386 |
@@ -152,80 +152,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1387 |
fi |
1388 |
|
1389 |
wine_compiler_check() { |
1390 |
- # GCC-specific bugs |
1391 |
- if tc-is-gcc; then |
1392 |
- # bug #549768 |
1393 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1394 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1395 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1396 |
- # Run in subshell to prevent "Aborted" message |
1397 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1398 |
- if ! eend $?; then |
1399 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1400 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1401 |
- eerror "or use gcc-config to select a different compiler version." |
1402 |
- eerror "See https://bugs.gentoo.org/549768" |
1403 |
- eerror |
1404 |
- return 1 |
1405 |
- fi |
1406 |
- fi |
1407 |
- # bug #574044 |
1408 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1409 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1410 |
- # Compile in subshell to prevent "Aborted" message |
1411 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1412 |
- if ! eend $?; then |
1413 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1414 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1415 |
- eerror "or use gcc-config to select a different compiler version." |
1416 |
- eerror "See https://bugs.gentoo.org/574044" |
1417 |
- eerror |
1418 |
- return 1 |
1419 |
- fi |
1420 |
- fi |
1421 |
- fi |
1422 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1423 |
|
1424 |
# Ensure compiler support |
1425 |
- if use abi_x86_64; then |
1426 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1427 |
- # Compile in subshell to prevent "Aborted" message |
1428 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1429 |
- if ! eend $?; then |
1430 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1431 |
- eerror |
1432 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1433 |
- eerror |
1434 |
- return 1 |
1435 |
- fi |
1436 |
- fi |
1437 |
+ # (No checks here as of 2022) |
1438 |
+ return 0 |
1439 |
} |
1440 |
|
1441 |
wine_build_environment_check() { |
1442 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1443 |
|
1444 |
- if use abi_x86_64; then |
1445 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1446 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1447 |
- die |
1448 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1449 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1450 |
- die |
1451 |
- fi |
1452 |
- fi |
1453 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1454 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1455 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1456 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1457 |
- fi |
1458 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1459 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1460 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1461 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1462 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1463 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1464 |
- fi |
1465 |
- fi |
1466 |
- |
1467 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1468 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1469 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1470 |
|
1471 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild |
1472 |
index 0ec5c29..a976012 100644 |
1473 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild |
1474 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild |
1475 |
@@ -152,80 +152,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1476 |
fi |
1477 |
|
1478 |
wine_compiler_check() { |
1479 |
- # GCC-specific bugs |
1480 |
- if tc-is-gcc; then |
1481 |
- # bug #549768 |
1482 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1483 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1484 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1485 |
- # Run in subshell to prevent "Aborted" message |
1486 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1487 |
- if ! eend $?; then |
1488 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1489 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1490 |
- eerror "or use gcc-config to select a different compiler version." |
1491 |
- eerror "See https://bugs.gentoo.org/549768" |
1492 |
- eerror |
1493 |
- return 1 |
1494 |
- fi |
1495 |
- fi |
1496 |
- # bug #574044 |
1497 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1498 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1499 |
- # Compile in subshell to prevent "Aborted" message |
1500 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1501 |
- if ! eend $?; then |
1502 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1503 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1504 |
- eerror "or use gcc-config to select a different compiler version." |
1505 |
- eerror "See https://bugs.gentoo.org/574044" |
1506 |
- eerror |
1507 |
- return 1 |
1508 |
- fi |
1509 |
- fi |
1510 |
- fi |
1511 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1512 |
|
1513 |
# Ensure compiler support |
1514 |
- if use abi_x86_64; then |
1515 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1516 |
- # Compile in subshell to prevent "Aborted" message |
1517 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1518 |
- if ! eend $?; then |
1519 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1520 |
- eerror |
1521 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1522 |
- eerror |
1523 |
- return 1 |
1524 |
- fi |
1525 |
- fi |
1526 |
+ # (No checks here as of 2022) |
1527 |
+ return 0 |
1528 |
} |
1529 |
|
1530 |
wine_build_environment_check() { |
1531 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1532 |
|
1533 |
- if use abi_x86_64; then |
1534 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1535 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1536 |
- die |
1537 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1538 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1539 |
- die |
1540 |
- fi |
1541 |
- fi |
1542 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1543 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1544 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1545 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1546 |
- fi |
1547 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1548 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1549 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1550 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1551 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1552 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1553 |
- fi |
1554 |
- fi |
1555 |
- |
1556 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1557 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1558 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1559 |
|
1560 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild |
1561 |
index 0ec5c29..a976012 100644 |
1562 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild |
1563 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild |
1564 |
@@ -152,80 +152,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1565 |
fi |
1566 |
|
1567 |
wine_compiler_check() { |
1568 |
- # GCC-specific bugs |
1569 |
- if tc-is-gcc; then |
1570 |
- # bug #549768 |
1571 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1572 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1573 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1574 |
- # Run in subshell to prevent "Aborted" message |
1575 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1576 |
- if ! eend $?; then |
1577 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1578 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1579 |
- eerror "or use gcc-config to select a different compiler version." |
1580 |
- eerror "See https://bugs.gentoo.org/549768" |
1581 |
- eerror |
1582 |
- return 1 |
1583 |
- fi |
1584 |
- fi |
1585 |
- # bug #574044 |
1586 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1587 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1588 |
- # Compile in subshell to prevent "Aborted" message |
1589 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1590 |
- if ! eend $?; then |
1591 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1592 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1593 |
- eerror "or use gcc-config to select a different compiler version." |
1594 |
- eerror "See https://bugs.gentoo.org/574044" |
1595 |
- eerror |
1596 |
- return 1 |
1597 |
- fi |
1598 |
- fi |
1599 |
- fi |
1600 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1601 |
|
1602 |
# Ensure compiler support |
1603 |
- if use abi_x86_64; then |
1604 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1605 |
- # Compile in subshell to prevent "Aborted" message |
1606 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1607 |
- if ! eend $?; then |
1608 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1609 |
- eerror |
1610 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1611 |
- eerror |
1612 |
- return 1 |
1613 |
- fi |
1614 |
- fi |
1615 |
+ # (No checks here as of 2022) |
1616 |
+ return 0 |
1617 |
} |
1618 |
|
1619 |
wine_build_environment_check() { |
1620 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1621 |
|
1622 |
- if use abi_x86_64; then |
1623 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1624 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1625 |
- die |
1626 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1627 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1628 |
- die |
1629 |
- fi |
1630 |
- fi |
1631 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1632 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1633 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1634 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1635 |
- fi |
1636 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1637 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1638 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1639 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1640 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1641 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1642 |
- fi |
1643 |
- fi |
1644 |
- |
1645 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1646 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1647 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1648 |
|
1649 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild |
1650 |
index 9524c5f..c9663a9 100644 |
1651 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild |
1652 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild |
1653 |
@@ -152,80 +152,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1654 |
fi |
1655 |
|
1656 |
wine_compiler_check() { |
1657 |
- # GCC-specific bugs |
1658 |
- if tc-is-gcc; then |
1659 |
- # bug #549768 |
1660 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1661 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1662 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1663 |
- # Run in subshell to prevent "Aborted" message |
1664 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1665 |
- if ! eend $?; then |
1666 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1667 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1668 |
- eerror "or use gcc-config to select a different compiler version." |
1669 |
- eerror "See https://bugs.gentoo.org/549768" |
1670 |
- eerror |
1671 |
- return 1 |
1672 |
- fi |
1673 |
- fi |
1674 |
- # bug #574044 |
1675 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1676 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1677 |
- # Compile in subshell to prevent "Aborted" message |
1678 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1679 |
- if ! eend $?; then |
1680 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1681 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1682 |
- eerror "or use gcc-config to select a different compiler version." |
1683 |
- eerror "See https://bugs.gentoo.org/574044" |
1684 |
- eerror |
1685 |
- return 1 |
1686 |
- fi |
1687 |
- fi |
1688 |
- fi |
1689 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1690 |
|
1691 |
# Ensure compiler support |
1692 |
- if use abi_x86_64; then |
1693 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1694 |
- # Compile in subshell to prevent "Aborted" message |
1695 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1696 |
- if ! eend $?; then |
1697 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1698 |
- eerror |
1699 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1700 |
- eerror |
1701 |
- return 1 |
1702 |
- fi |
1703 |
- fi |
1704 |
+ # (No checks here as of 2022) |
1705 |
+ return 0 |
1706 |
} |
1707 |
|
1708 |
wine_build_environment_check() { |
1709 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1710 |
|
1711 |
- if use abi_x86_64; then |
1712 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1713 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1714 |
- die |
1715 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1716 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1717 |
- die |
1718 |
- fi |
1719 |
- fi |
1720 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1721 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1722 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1723 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1724 |
- fi |
1725 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1726 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1727 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1728 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1729 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1730 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1731 |
- fi |
1732 |
- fi |
1733 |
- |
1734 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1735 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1736 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1737 |
|
1738 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild |
1739 |
index 9524c5f..c9663a9 100644 |
1740 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild |
1741 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild |
1742 |
@@ -152,80 +152,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1743 |
fi |
1744 |
|
1745 |
wine_compiler_check() { |
1746 |
- # GCC-specific bugs |
1747 |
- if tc-is-gcc; then |
1748 |
- # bug #549768 |
1749 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1750 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1751 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1752 |
- # Run in subshell to prevent "Aborted" message |
1753 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1754 |
- if ! eend $?; then |
1755 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1756 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1757 |
- eerror "or use gcc-config to select a different compiler version." |
1758 |
- eerror "See https://bugs.gentoo.org/549768" |
1759 |
- eerror |
1760 |
- return 1 |
1761 |
- fi |
1762 |
- fi |
1763 |
- # bug #574044 |
1764 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1765 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1766 |
- # Compile in subshell to prevent "Aborted" message |
1767 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1768 |
- if ! eend $?; then |
1769 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1770 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1771 |
- eerror "or use gcc-config to select a different compiler version." |
1772 |
- eerror "See https://bugs.gentoo.org/574044" |
1773 |
- eerror |
1774 |
- return 1 |
1775 |
- fi |
1776 |
- fi |
1777 |
- fi |
1778 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1779 |
|
1780 |
# Ensure compiler support |
1781 |
- if use abi_x86_64; then |
1782 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1783 |
- # Compile in subshell to prevent "Aborted" message |
1784 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1785 |
- if ! eend $?; then |
1786 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1787 |
- eerror |
1788 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1789 |
- eerror |
1790 |
- return 1 |
1791 |
- fi |
1792 |
- fi |
1793 |
+ # (No checks here as of 2022) |
1794 |
+ return 0 |
1795 |
} |
1796 |
|
1797 |
wine_build_environment_check() { |
1798 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1799 |
|
1800 |
- if use abi_x86_64; then |
1801 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1802 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1803 |
- die |
1804 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1805 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1806 |
- die |
1807 |
- fi |
1808 |
- fi |
1809 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1810 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1811 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1812 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1813 |
- fi |
1814 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1815 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1816 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1817 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1818 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1819 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1820 |
- fi |
1821 |
- fi |
1822 |
- |
1823 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1824 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1825 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1826 |
|
1827 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild |
1828 |
index 73ea471..591be22 100644 |
1829 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild |
1830 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild |
1831 |
@@ -144,80 +144,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1832 |
fi |
1833 |
|
1834 |
wine_compiler_check() { |
1835 |
- # GCC-specific bugs |
1836 |
- if tc-is-gcc; then |
1837 |
- # bug #549768 |
1838 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1839 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1840 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1841 |
- # Run in subshell to prevent "Aborted" message |
1842 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1843 |
- if ! eend $?; then |
1844 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1845 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1846 |
- eerror "or use gcc-config to select a different compiler version." |
1847 |
- eerror "See https://bugs.gentoo.org/549768" |
1848 |
- eerror |
1849 |
- return 1 |
1850 |
- fi |
1851 |
- fi |
1852 |
- # bug #574044 |
1853 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1854 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1855 |
- # Compile in subshell to prevent "Aborted" message |
1856 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1857 |
- if ! eend $?; then |
1858 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1859 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1860 |
- eerror "or use gcc-config to select a different compiler version." |
1861 |
- eerror "See https://bugs.gentoo.org/574044" |
1862 |
- eerror |
1863 |
- return 1 |
1864 |
- fi |
1865 |
- fi |
1866 |
- fi |
1867 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1868 |
|
1869 |
# Ensure compiler support |
1870 |
- if use abi_x86_64; then |
1871 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1872 |
- # Compile in subshell to prevent "Aborted" message |
1873 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1874 |
- if ! eend $?; then |
1875 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1876 |
- eerror |
1877 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1878 |
- eerror |
1879 |
- return 1 |
1880 |
- fi |
1881 |
- fi |
1882 |
+ # (No checks here as of 2022) |
1883 |
+ return 0 |
1884 |
} |
1885 |
|
1886 |
wine_build_environment_check() { |
1887 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1888 |
|
1889 |
- if use abi_x86_64; then |
1890 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1891 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1892 |
- die |
1893 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1894 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1895 |
- die |
1896 |
- fi |
1897 |
- fi |
1898 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1899 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1900 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1901 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1902 |
- fi |
1903 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1904 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1905 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1906 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1907 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1908 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1909 |
- fi |
1910 |
- fi |
1911 |
- |
1912 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
1913 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
1914 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
1915 |
|
1916 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild |
1917 |
index ad6b16b..f853fa7 100644 |
1918 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild |
1919 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild |
1920 |
@@ -143,80 +143,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
1921 |
fi |
1922 |
|
1923 |
wine_compiler_check() { |
1924 |
- # GCC-specific bugs |
1925 |
- if tc-is-gcc; then |
1926 |
- # bug #549768 |
1927 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
1928 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
1929 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
1930 |
- # Run in subshell to prevent "Aborted" message |
1931 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
1932 |
- if ! eend $?; then |
1933 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
1934 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
1935 |
- eerror "or use gcc-config to select a different compiler version." |
1936 |
- eerror "See https://bugs.gentoo.org/549768" |
1937 |
- eerror |
1938 |
- return 1 |
1939 |
- fi |
1940 |
- fi |
1941 |
- # bug #574044 |
1942 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
1943 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
1944 |
- # Compile in subshell to prevent "Aborted" message |
1945 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
1946 |
- if ! eend $?; then |
1947 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
1948 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
1949 |
- eerror "or use gcc-config to select a different compiler version." |
1950 |
- eerror "See https://bugs.gentoo.org/574044" |
1951 |
- eerror |
1952 |
- return 1 |
1953 |
- fi |
1954 |
- fi |
1955 |
- fi |
1956 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1957 |
|
1958 |
# Ensure compiler support |
1959 |
- if use abi_x86_64; then |
1960 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
1961 |
- # Compile in subshell to prevent "Aborted" message |
1962 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
1963 |
- if ! eend $?; then |
1964 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
1965 |
- eerror |
1966 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
1967 |
- eerror |
1968 |
- return 1 |
1969 |
- fi |
1970 |
- fi |
1971 |
+ # (No checks here as of 2022) |
1972 |
+ return 0 |
1973 |
} |
1974 |
|
1975 |
wine_build_environment_check() { |
1976 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
1977 |
|
1978 |
- if use abi_x86_64; then |
1979 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
1980 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
1981 |
- die |
1982 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
1983 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
1984 |
- die |
1985 |
- fi |
1986 |
- fi |
1987 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
1988 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
1989 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
1990 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
1991 |
- fi |
1992 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
1993 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
1994 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
1995 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
1996 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
1997 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
1998 |
- fi |
1999 |
- fi |
2000 |
- |
2001 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2002 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2003 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
2004 |
|
2005 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.1.ebuild |
2006 |
index 0ade28d..5db9b69 100644 |
2007 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.1.ebuild |
2008 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.1.ebuild |
2009 |
@@ -143,80 +143,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
2010 |
fi |
2011 |
|
2012 |
wine_compiler_check() { |
2013 |
- # GCC-specific bugs |
2014 |
- if tc-is-gcc; then |
2015 |
- # bug #549768 |
2016 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
2017 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
2018 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
2019 |
- # Run in subshell to prevent "Aborted" message |
2020 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
2021 |
- if ! eend $?; then |
2022 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
2023 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
2024 |
- eerror "or use gcc-config to select a different compiler version." |
2025 |
- eerror "See https://bugs.gentoo.org/549768" |
2026 |
- eerror |
2027 |
- return 1 |
2028 |
- fi |
2029 |
- fi |
2030 |
- # bug #574044 |
2031 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
2032 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
2033 |
- # Compile in subshell to prevent "Aborted" message |
2034 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
2035 |
- if ! eend $?; then |
2036 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
2037 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
2038 |
- eerror "or use gcc-config to select a different compiler version." |
2039 |
- eerror "See https://bugs.gentoo.org/574044" |
2040 |
- eerror |
2041 |
- return 1 |
2042 |
- fi |
2043 |
- fi |
2044 |
- fi |
2045 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2046 |
|
2047 |
# Ensure compiler support |
2048 |
- if use abi_x86_64; then |
2049 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
2050 |
- # Compile in subshell to prevent "Aborted" message |
2051 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
2052 |
- if ! eend $?; then |
2053 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
2054 |
- eerror |
2055 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
2056 |
- eerror |
2057 |
- return 1 |
2058 |
- fi |
2059 |
- fi |
2060 |
+ # (No checks here as of 2022) |
2061 |
+ return 0 |
2062 |
} |
2063 |
|
2064 |
wine_build_environment_check() { |
2065 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2066 |
|
2067 |
- if use abi_x86_64; then |
2068 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
2069 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
2070 |
- die |
2071 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
2072 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
2073 |
- die |
2074 |
- fi |
2075 |
- fi |
2076 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
2077 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
2078 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
2079 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
2080 |
- fi |
2081 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
2082 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
2083 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
2084 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
2085 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
2086 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
2087 |
- fi |
2088 |
- fi |
2089 |
- |
2090 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2091 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2092 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
2093 |
|
2094 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.2.ebuild |
2095 |
index ad922dc..dc10356 100644 |
2096 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.2.ebuild |
2097 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.2.ebuild |
2098 |
@@ -143,80 +143,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
2099 |
fi |
2100 |
|
2101 |
wine_compiler_check() { |
2102 |
- # GCC-specific bugs |
2103 |
- if tc-is-gcc; then |
2104 |
- # bug #549768 |
2105 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
2106 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
2107 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
2108 |
- # Run in subshell to prevent "Aborted" message |
2109 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
2110 |
- if ! eend $?; then |
2111 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
2112 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
2113 |
- eerror "or use gcc-config to select a different compiler version." |
2114 |
- eerror "See https://bugs.gentoo.org/549768" |
2115 |
- eerror |
2116 |
- return 1 |
2117 |
- fi |
2118 |
- fi |
2119 |
- # bug #574044 |
2120 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
2121 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
2122 |
- # Compile in subshell to prevent "Aborted" message |
2123 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
2124 |
- if ! eend $?; then |
2125 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
2126 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
2127 |
- eerror "or use gcc-config to select a different compiler version." |
2128 |
- eerror "See https://bugs.gentoo.org/574044" |
2129 |
- eerror |
2130 |
- return 1 |
2131 |
- fi |
2132 |
- fi |
2133 |
- fi |
2134 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2135 |
|
2136 |
# Ensure compiler support |
2137 |
- if use abi_x86_64; then |
2138 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
2139 |
- # Compile in subshell to prevent "Aborted" message |
2140 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
2141 |
- if ! eend $?; then |
2142 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
2143 |
- eerror |
2144 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
2145 |
- eerror |
2146 |
- return 1 |
2147 |
- fi |
2148 |
- fi |
2149 |
+ # (No checks here as of 2022) |
2150 |
+ return 0 |
2151 |
} |
2152 |
|
2153 |
wine_build_environment_check() { |
2154 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2155 |
|
2156 |
- if use abi_x86_64; then |
2157 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
2158 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
2159 |
- die |
2160 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
2161 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
2162 |
- die |
2163 |
- fi |
2164 |
- fi |
2165 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
2166 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
2167 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
2168 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
2169 |
- fi |
2170 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
2171 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
2172 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
2173 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
2174 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
2175 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
2176 |
- fi |
2177 |
- fi |
2178 |
- |
2179 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2180 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2181 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
2182 |
|
2183 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.3-r1.ebuild |
2184 |
index e5c2d88..0617939 100644 |
2185 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.3-r1.ebuild |
2186 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.3-r1.ebuild |
2187 |
@@ -144,80 +144,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
2188 |
fi |
2189 |
|
2190 |
wine_compiler_check() { |
2191 |
- # GCC-specific bugs |
2192 |
- if tc-is-gcc; then |
2193 |
- # bug #549768 |
2194 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
2195 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
2196 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
2197 |
- # Run in subshell to prevent "Aborted" message |
2198 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
2199 |
- if ! eend $?; then |
2200 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
2201 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
2202 |
- eerror "or use gcc-config to select a different compiler version." |
2203 |
- eerror "See https://bugs.gentoo.org/549768" |
2204 |
- eerror |
2205 |
- return 1 |
2206 |
- fi |
2207 |
- fi |
2208 |
- # bug #574044 |
2209 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
2210 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
2211 |
- # Compile in subshell to prevent "Aborted" message |
2212 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
2213 |
- if ! eend $?; then |
2214 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
2215 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
2216 |
- eerror "or use gcc-config to select a different compiler version." |
2217 |
- eerror "See https://bugs.gentoo.org/574044" |
2218 |
- eerror |
2219 |
- return 1 |
2220 |
- fi |
2221 |
- fi |
2222 |
- fi |
2223 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2224 |
|
2225 |
# Ensure compiler support |
2226 |
- if use abi_x86_64; then |
2227 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
2228 |
- # Compile in subshell to prevent "Aborted" message |
2229 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
2230 |
- if ! eend $?; then |
2231 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
2232 |
- eerror |
2233 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
2234 |
- eerror |
2235 |
- return 1 |
2236 |
- fi |
2237 |
- fi |
2238 |
+ # (No checks here as of 2022) |
2239 |
+ return 0 |
2240 |
} |
2241 |
|
2242 |
wine_build_environment_check() { |
2243 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2244 |
|
2245 |
- if use abi_x86_64; then |
2246 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
2247 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
2248 |
- die |
2249 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
2250 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
2251 |
- die |
2252 |
- fi |
2253 |
- fi |
2254 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
2255 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
2256 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
2257 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
2258 |
- fi |
2259 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
2260 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
2261 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
2262 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
2263 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
2264 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
2265 |
- fi |
2266 |
- fi |
2267 |
- |
2268 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2269 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2270 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
2271 |
|
2272 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.4-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.4-r1.ebuild |
2273 |
index e5c2d88..0617939 100644 |
2274 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.4-r1.ebuild |
2275 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.4-r1.ebuild |
2276 |
@@ -144,80 +144,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
2277 |
fi |
2278 |
|
2279 |
wine_compiler_check() { |
2280 |
- # GCC-specific bugs |
2281 |
- if tc-is-gcc; then |
2282 |
- # bug #549768 |
2283 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
2284 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
2285 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
2286 |
- # Run in subshell to prevent "Aborted" message |
2287 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
2288 |
- if ! eend $?; then |
2289 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
2290 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
2291 |
- eerror "or use gcc-config to select a different compiler version." |
2292 |
- eerror "See https://bugs.gentoo.org/549768" |
2293 |
- eerror |
2294 |
- return 1 |
2295 |
- fi |
2296 |
- fi |
2297 |
- # bug #574044 |
2298 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
2299 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
2300 |
- # Compile in subshell to prevent "Aborted" message |
2301 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
2302 |
- if ! eend $?; then |
2303 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
2304 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
2305 |
- eerror "or use gcc-config to select a different compiler version." |
2306 |
- eerror "See https://bugs.gentoo.org/574044" |
2307 |
- eerror |
2308 |
- return 1 |
2309 |
- fi |
2310 |
- fi |
2311 |
- fi |
2312 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2313 |
|
2314 |
# Ensure compiler support |
2315 |
- if use abi_x86_64; then |
2316 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
2317 |
- # Compile in subshell to prevent "Aborted" message |
2318 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
2319 |
- if ! eend $?; then |
2320 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
2321 |
- eerror |
2322 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
2323 |
- eerror |
2324 |
- return 1 |
2325 |
- fi |
2326 |
- fi |
2327 |
+ # (No checks here as of 2022) |
2328 |
+ return 0 |
2329 |
} |
2330 |
|
2331 |
wine_build_environment_check() { |
2332 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2333 |
|
2334 |
- if use abi_x86_64; then |
2335 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
2336 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
2337 |
- die |
2338 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
2339 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
2340 |
- die |
2341 |
- fi |
2342 |
- fi |
2343 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
2344 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
2345 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
2346 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
2347 |
- fi |
2348 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
2349 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
2350 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
2351 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
2352 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
2353 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
2354 |
- fi |
2355 |
- fi |
2356 |
- |
2357 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2358 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2359 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
2360 |
|
2361 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild |
2362 |
index 604ac11..d8d1c73 100644 |
2363 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild |
2364 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild |
2365 |
@@ -144,80 +144,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
2366 |
fi |
2367 |
|
2368 |
wine_compiler_check() { |
2369 |
- # GCC-specific bugs |
2370 |
- if tc-is-gcc; then |
2371 |
- # bug #549768 |
2372 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
2373 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
2374 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
2375 |
- # Run in subshell to prevent "Aborted" message |
2376 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
2377 |
- if ! eend $?; then |
2378 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
2379 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
2380 |
- eerror "or use gcc-config to select a different compiler version." |
2381 |
- eerror "See https://bugs.gentoo.org/549768" |
2382 |
- eerror |
2383 |
- return 1 |
2384 |
- fi |
2385 |
- fi |
2386 |
- # bug #574044 |
2387 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
2388 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
2389 |
- # Compile in subshell to prevent "Aborted" message |
2390 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
2391 |
- if ! eend $?; then |
2392 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
2393 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
2394 |
- eerror "or use gcc-config to select a different compiler version." |
2395 |
- eerror "See https://bugs.gentoo.org/574044" |
2396 |
- eerror |
2397 |
- return 1 |
2398 |
- fi |
2399 |
- fi |
2400 |
- fi |
2401 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2402 |
|
2403 |
# Ensure compiler support |
2404 |
- if use abi_x86_64; then |
2405 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
2406 |
- # Compile in subshell to prevent "Aborted" message |
2407 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
2408 |
- if ! eend $?; then |
2409 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
2410 |
- eerror |
2411 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
2412 |
- eerror |
2413 |
- return 1 |
2414 |
- fi |
2415 |
- fi |
2416 |
+ # (No checks here as of 2022) |
2417 |
+ return 0 |
2418 |
} |
2419 |
|
2420 |
wine_build_environment_check() { |
2421 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2422 |
|
2423 |
- if use abi_x86_64; then |
2424 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
2425 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
2426 |
- die |
2427 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
2428 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
2429 |
- die |
2430 |
- fi |
2431 |
- fi |
2432 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
2433 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
2434 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
2435 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
2436 |
- fi |
2437 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
2438 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
2439 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
2440 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
2441 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
2442 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
2443 |
- fi |
2444 |
- fi |
2445 |
- |
2446 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2447 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2448 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
2449 |
|
2450 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild |
2451 |
index 10954b8..ecdfc4b 100644 |
2452 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild |
2453 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild |
2454 |
@@ -144,80 +144,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
2455 |
fi |
2456 |
|
2457 |
wine_compiler_check() { |
2458 |
- # GCC-specific bugs |
2459 |
- if tc-is-gcc; then |
2460 |
- # bug #549768 |
2461 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
2462 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
2463 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
2464 |
- # Run in subshell to prevent "Aborted" message |
2465 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
2466 |
- if ! eend $?; then |
2467 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
2468 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
2469 |
- eerror "or use gcc-config to select a different compiler version." |
2470 |
- eerror "See https://bugs.gentoo.org/549768" |
2471 |
- eerror |
2472 |
- return 1 |
2473 |
- fi |
2474 |
- fi |
2475 |
- # bug #574044 |
2476 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
2477 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
2478 |
- # Compile in subshell to prevent "Aborted" message |
2479 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
2480 |
- if ! eend $?; then |
2481 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
2482 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
2483 |
- eerror "or use gcc-config to select a different compiler version." |
2484 |
- eerror "See https://bugs.gentoo.org/574044" |
2485 |
- eerror |
2486 |
- return 1 |
2487 |
- fi |
2488 |
- fi |
2489 |
- fi |
2490 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2491 |
|
2492 |
# Ensure compiler support |
2493 |
- if use abi_x86_64; then |
2494 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
2495 |
- # Compile in subshell to prevent "Aborted" message |
2496 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
2497 |
- if ! eend $?; then |
2498 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
2499 |
- eerror |
2500 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
2501 |
- eerror |
2502 |
- return 1 |
2503 |
- fi |
2504 |
- fi |
2505 |
+ # (No checks here as of 2022) |
2506 |
+ return 0 |
2507 |
} |
2508 |
|
2509 |
wine_build_environment_check() { |
2510 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2511 |
|
2512 |
- if use abi_x86_64; then |
2513 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
2514 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
2515 |
- die |
2516 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
2517 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
2518 |
- die |
2519 |
- fi |
2520 |
- fi |
2521 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
2522 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
2523 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
2524 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
2525 |
- fi |
2526 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
2527 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
2528 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
2529 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
2530 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
2531 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
2532 |
- fi |
2533 |
- fi |
2534 |
- |
2535 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2536 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2537 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
2538 |
|
2539 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild |
2540 |
index 10954b8..ecdfc4b 100644 |
2541 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild |
2542 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild |
2543 |
@@ -144,80 +144,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
2544 |
fi |
2545 |
|
2546 |
wine_compiler_check() { |
2547 |
- # GCC-specific bugs |
2548 |
- if tc-is-gcc; then |
2549 |
- # bug #549768 |
2550 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
2551 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
2552 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
2553 |
- # Run in subshell to prevent "Aborted" message |
2554 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
2555 |
- if ! eend $?; then |
2556 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
2557 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
2558 |
- eerror "or use gcc-config to select a different compiler version." |
2559 |
- eerror "See https://bugs.gentoo.org/549768" |
2560 |
- eerror |
2561 |
- return 1 |
2562 |
- fi |
2563 |
- fi |
2564 |
- # bug #574044 |
2565 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
2566 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
2567 |
- # Compile in subshell to prevent "Aborted" message |
2568 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
2569 |
- if ! eend $?; then |
2570 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
2571 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
2572 |
- eerror "or use gcc-config to select a different compiler version." |
2573 |
- eerror "See https://bugs.gentoo.org/574044" |
2574 |
- eerror |
2575 |
- return 1 |
2576 |
- fi |
2577 |
- fi |
2578 |
- fi |
2579 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2580 |
|
2581 |
# Ensure compiler support |
2582 |
- if use abi_x86_64; then |
2583 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
2584 |
- # Compile in subshell to prevent "Aborted" message |
2585 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
2586 |
- if ! eend $?; then |
2587 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
2588 |
- eerror |
2589 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
2590 |
- eerror |
2591 |
- return 1 |
2592 |
- fi |
2593 |
- fi |
2594 |
+ # (No checks here as of 2022) |
2595 |
+ return 0 |
2596 |
} |
2597 |
|
2598 |
wine_build_environment_check() { |
2599 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2600 |
|
2601 |
- if use abi_x86_64; then |
2602 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
2603 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
2604 |
- die |
2605 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
2606 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
2607 |
- die |
2608 |
- fi |
2609 |
- fi |
2610 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
2611 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
2612 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
2613 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
2614 |
- fi |
2615 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
2616 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
2617 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
2618 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
2619 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
2620 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
2621 |
- fi |
2622 |
- fi |
2623 |
- |
2624 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2625 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2626 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
2627 |
|
2628 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild |
2629 |
index d50aedd..d417540 100644 |
2630 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild |
2631 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild |
2632 |
@@ -142,80 +142,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
2633 |
fi |
2634 |
|
2635 |
wine_compiler_check() { |
2636 |
- # GCC-specific bugs |
2637 |
- if tc-is-gcc; then |
2638 |
- # bug #549768 |
2639 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
2640 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
2641 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
2642 |
- # Run in subshell to prevent "Aborted" message |
2643 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
2644 |
- if ! eend $?; then |
2645 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
2646 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
2647 |
- eerror "or use gcc-config to select a different compiler version." |
2648 |
- eerror "See https://bugs.gentoo.org/549768" |
2649 |
- eerror |
2650 |
- return 1 |
2651 |
- fi |
2652 |
- fi |
2653 |
- # bug #574044 |
2654 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
2655 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
2656 |
- # Compile in subshell to prevent "Aborted" message |
2657 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
2658 |
- if ! eend $?; then |
2659 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
2660 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
2661 |
- eerror "or use gcc-config to select a different compiler version." |
2662 |
- eerror "See https://bugs.gentoo.org/574044" |
2663 |
- eerror |
2664 |
- return 1 |
2665 |
- fi |
2666 |
- fi |
2667 |
- fi |
2668 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2669 |
|
2670 |
# Ensure compiler support |
2671 |
- if use abi_x86_64; then |
2672 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
2673 |
- # Compile in subshell to prevent "Aborted" message |
2674 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
2675 |
- if ! eend $?; then |
2676 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
2677 |
- eerror |
2678 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
2679 |
- eerror |
2680 |
- return 1 |
2681 |
- fi |
2682 |
- fi |
2683 |
+ # (No checks here as of 2022) |
2684 |
+ return 0 |
2685 |
} |
2686 |
|
2687 |
wine_build_environment_check() { |
2688 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2689 |
|
2690 |
- if use abi_x86_64; then |
2691 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
2692 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
2693 |
- die |
2694 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
2695 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
2696 |
- die |
2697 |
- fi |
2698 |
- fi |
2699 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
2700 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
2701 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
2702 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
2703 |
- fi |
2704 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
2705 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
2706 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
2707 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
2708 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
2709 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
2710 |
- fi |
2711 |
- fi |
2712 |
- |
2713 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2714 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2715 |
eerror "See https://bugs.gentoo.org/487864 for more details." |
2716 |
|
2717 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
2718 |
index d50aedd..d417540 100644 |
2719 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
2720 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
2721 |
@@ -142,80 +142,16 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then |
2722 |
fi |
2723 |
|
2724 |
wine_compiler_check() { |
2725 |
- # GCC-specific bugs |
2726 |
- if tc-is-gcc; then |
2727 |
- # bug #549768 |
2728 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then |
2729 |
- ebegin "Checking for gcc-5 ms_abi compiler bug" |
2730 |
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die |
2731 |
- # Run in subshell to prevent "Aborted" message |
2732 |
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1 |
2733 |
- if ! eend $?; then |
2734 |
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" |
2735 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," |
2736 |
- eerror "or use gcc-config to select a different compiler version." |
2737 |
- eerror "See https://bugs.gentoo.org/549768" |
2738 |
- eerror |
2739 |
- return 1 |
2740 |
- fi |
2741 |
- fi |
2742 |
- # bug #574044 |
2743 |
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then |
2744 |
- ebegin "Checking for gcc-5-3 stack realignment compiler bug" |
2745 |
- # Compile in subshell to prevent "Aborted" message |
2746 |
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 |
2747 |
- if ! eend $?; then |
2748 |
- eerror "Wine cannot be built with this version of gcc-5.3" |
2749 |
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," |
2750 |
- eerror "or use gcc-config to select a different compiler version." |
2751 |
- eerror "See https://bugs.gentoo.org/574044" |
2752 |
- eerror |
2753 |
- return 1 |
2754 |
- fi |
2755 |
- fi |
2756 |
- fi |
2757 |
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2758 |
|
2759 |
# Ensure compiler support |
2760 |
- if use abi_x86_64; then |
2761 |
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" |
2762 |
- # Compile in subshell to prevent "Aborted" message |
2763 |
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) |
2764 |
- if ! eend $?; then |
2765 |
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" |
2766 |
- eerror |
2767 |
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" |
2768 |
- eerror |
2769 |
- return 1 |
2770 |
- fi |
2771 |
- fi |
2772 |
+ # (No checks here as of 2022) |
2773 |
+ return 0 |
2774 |
} |
2775 |
|
2776 |
wine_build_environment_check() { |
2777 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
2778 |
|
2779 |
- if use abi_x86_64; then |
2780 |
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then |
2781 |
- eerror "You need gcc-4.4+ to compile 64-bit wine" |
2782 |
- die |
2783 |
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then |
2784 |
- eerror "You need clang-3.8+ to compile 64-bit wine" |
2785 |
- die |
2786 |
- fi |
2787 |
- fi |
2788 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then |
2789 |
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" |
2790 |
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" |
2791 |
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" |
2792 |
- fi |
2793 |
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then |
2794 |
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then |
2795 |
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" |
2796 |
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." |
2797 |
- ewarn "See package.env in man 5 portage for more information on how to do this." |
2798 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" |
2799 |
- fi |
2800 |
- fi |
2801 |
- |
2802 |
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then |
2803 |
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." |
2804 |
eerror "See https://bugs.gentoo.org/487864 for more details." |