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