commit: bd4255f88b5a5ca1860036bcec1fdc943349ee20 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Thu Mar 23 09:16:54 2017 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Thu Mar 23 09:24:52 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4255f8
app-emulation/wine: Detect and warn about GCC-5.4 compilation issues Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=613128 Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-emulation/wine/wine-2.0.ebuild | 8 ++++++++ app-emulation/wine/wine-2.1.ebuild | 8 ++++++++ app-emulation/wine/wine-2.2.ebuild | 8 ++++++++ app-emulation/wine/wine-2.3.ebuild | 8 ++++++++ app-emulation/wine/wine-9999.ebuild | 8 ++++++++ 5 files changed, 40 insertions(+) diff --git a/app-emulation/wine/wine-2.0.ebuild b/app-emulation/wine/wine-2.0.ebuild index 4e02afd8e30..dbaee4a3add 100644 --- a/app-emulation/wine/wine-2.0.ebuild +++ b/app-emulation/wine/wine-2.0.ebuild @@ -213,6 +213,14 @@ wine_build_environment_check() { ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." diff --git a/app-emulation/wine/wine-2.1.ebuild b/app-emulation/wine/wine-2.1.ebuild index beb9758568d..dcf9b6d9b5d 100644 --- a/app-emulation/wine/wine-2.1.ebuild +++ b/app-emulation/wine/wine-2.1.ebuild @@ -260,6 +260,14 @@ wine_build_environment_check() { ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." diff --git a/app-emulation/wine/wine-2.2.ebuild b/app-emulation/wine/wine-2.2.ebuild index beb9758568d..dcf9b6d9b5d 100644 --- a/app-emulation/wine/wine-2.2.ebuild +++ b/app-emulation/wine/wine-2.2.ebuild @@ -260,6 +260,14 @@ wine_build_environment_check() { ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." diff --git a/app-emulation/wine/wine-2.3.ebuild b/app-emulation/wine/wine-2.3.ebuild index beb9758568d..dcf9b6d9b5d 100644 --- a/app-emulation/wine/wine-2.3.ebuild +++ b/app-emulation/wine/wine-2.3.ebuild @@ -260,6 +260,14 @@ wine_build_environment_check() { ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index beb9758568d..dcf9b6d9b5d 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -260,6 +260,14 @@ wine_build_environment_check() { ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
