Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-d3d9/
Date: Fri, 20 May 2022 01:13:41
Message-Id: 1653009186.5d5b469904109980759a77e2cdd737efa14c0bc7.sam@gentoo
1 commit: 5d5b469904109980759a77e2cdd737efa14c0bc7
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 20 01:13:06 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri May 20 01:13:06 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=5d5b4699
7
8 app-emulation/wine-d3d9: [QA] drop (very) stale GCC version checks
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild | 23 -----------------------
13 app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild | 23 -----------------------
14 2 files changed, 46 deletions(-)
15
16 diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild
17 index 7d7d9e8..5266089 100644
18 --- a/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild
19 +++ b/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild
20 @@ -175,29 +175,6 @@ wine_compiler_check() {
21 wine_build_environment_check() {
22 [[ ${MERGE_TYPE} = "binary" ]] && return 0
23
24 - if use abi_x86_64; then
25 - if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
26 - eerror "You need gcc-4.4+ to compile 64-bit wine"
27 - die
28 - elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
29 - eerror "You need clang-3.8+ to compile 64-bit wine"
30 - die
31 - fi
32 - fi
33 - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
34 - ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
35 - ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
36 - ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
37 - fi
38 - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
39 - if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
40 - ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
41 - ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
42 - ewarn "See package.env in man 5 portage for more information on how to do this."
43 - ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
44 - fi
45 - fi
46 -
47 if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
48 eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
49 eerror "See https://bugs.gentoo.org/487864 for more details."
50
51 diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild
52 index 22ba9f5..7186adf 100644
53 --- a/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild
54 +++ b/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild
55 @@ -173,29 +173,6 @@ wine_compiler_check() {
56 wine_build_environment_check() {
57 [[ ${MERGE_TYPE} = "binary" ]] && return 0
58
59 - if use abi_x86_64; then
60 - if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
61 - eerror "You need gcc-4.4+ to compile 64-bit wine"
62 - die
63 - elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
64 - eerror "You need clang-3.8+ to compile 64-bit wine"
65 - die
66 - fi
67 - fi
68 - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
69 - ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
70 - ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
71 - ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
72 - fi
73 - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
74 - if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
75 - ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
76 - ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
77 - ewarn "See package.env in man 5 portage for more information on how to do this."
78 - ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
79 - fi
80 - fi
81 -
82 if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
83 eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
84 eerror "See https://bugs.gentoo.org/487864 for more details."