diff options
| author | Mike Frysinger <vapier@google.com> | 2015-10-12 23:34:32 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2015-10-12 23:34:32 -0400 |
| commit | 64b3189079aa6c10a0204880a58df53b36b9f36a (patch) | |
| tree | 7508f174756528dfe5ad3a359ef24ac3c2baf3f7 /app-emulation/wine/wine-1.7.18-r1.ebuild | |
| parent | 5d6f128da92287fc0b2643d810ecd96f81ac3aa2 (diff) | |
| parent | fbc240f551b32a009511d34ac5c3fd7c15ef82b9 (diff) | |
| download | gentoo-64b3189079aa6c10a0204880a58df53b36b9f36a.tar.gz | |
Merge https://github.com/gentoo/gentoo.gitbrillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
Diffstat (limited to 'app-emulation/wine/wine-1.7.18-r1.ebuild')
| -rw-r--r-- | app-emulation/wine/wine-1.7.18-r1.ebuild | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/app-emulation/wine/wine-1.7.18-r1.ebuild b/app-emulation/wine/wine-1.7.18-r1.ebuild index a672bc81ac..16697c5c4b 100644 --- a/app-emulation/wine/wine-1.7.18-r1.ebuild +++ b/app-emulation/wine/wine-1.7.18-r1.ebuild @@ -146,12 +146,18 @@ wine_build_environment_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 # bug #549768 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then - eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;" - eerror "you may use gcc-config to select an older compiler version." - eerror "See https://bugs.gentoo.org/549768" - eerror - return 1 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then + einfo "Checking for gcc-5 ms_abi compiler bug ..." + $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die + # Run in subshell to prevent "Aborted" message + if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then + eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/549768" + eerror + return 1 + fi fi if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then |