app-emulation/wine: Change GCC 5.3 warning, per mgorny request.

Package-Manager: portage-2.2.26

diff --git a/app-emulation/wine/wine-1.8.1.ebuild b/app-emulation/wine/wine-1.8.1.ebuild
index 1d2d4c83e84f163fc89ff31e9680c8322506b0b3..882344891c63f89c168e8f61f823a01ee567e46a 100644 (file)
--- a/app-emulation/wine/wine-1.8.1.ebuild
+++ b/app-emulation/wine/wine-1.8.1.ebuild
@@ -182,8 +182,8 @@ wine_build_environment_check() {
                # Compile in subshell to prevent "Aborted" message
                if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
                        eerror "Wine cannot be built with this version of gcc-5.3"
-                       eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                       eerror "or use gcc-config to select a different compiler version."
+                       eerror "due to compiler bugs; please use gcc-config to select a"
+                       eerror "different compiler version."
                        eerror "See https://bugs.gentoo.org/574044"
                        eerror
                        return 1

diff --git a/app-emulation/wine/wine-1.8.ebuild b/app-emulation/wine/wine-1.8.ebuild
index 4c1b6f446af0366ba370b1593a760dfd771aa804..d28d9bac7576934e29b8fb5aba41341fb5fd8aae 100644 (file)
--- a/app-emulation/wine/wine-1.8.ebuild
+++ b/app-emulation/wine/wine-1.8.ebuild
@@ -177,6 +177,19 @@ wine_build_environment_check() {
                        return 1
                fi
        fi
+       # bug #574044
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+               einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
+               # Compile in subshell to prevent "Aborted" message
+               if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
+                       eerror "Wine cannot be built with this version of gcc-5.3"
+                       eerror "due to compiler bugs; please use gcc-config to select a"
+                       eerror "different compiler version."
+                       eerror "See https://bugs.gentoo.org/574044"
+                       eerror
+                       return 1
+               fi
+       fi
 
        if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
                eerror "You need gcc-4.4+ to build 64-bit wine"

diff --git a/app-emulation/wine/wine-1.9.4.ebuild b/app-emulation/wine/wine-1.9.4.ebuild
index e47fe62c743217a63c776275f650eef9f570d790..70ad7280bfa10ddb0672d17b397906edc3baf01e 100644 (file)
--- a/app-emulation/wine/wine-1.9.4.ebuild
+++ b/app-emulation/wine/wine-1.9.4.ebuild
@@ -177,12 +177,11 @@ wine_build_environment_check() {
        # bug #574044
        if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
                einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
-               $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die
-               # Run in subshell to prevent "Aborted" message
-               if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then
+               # Compile in subshell to prevent "Aborted" message
+               if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
                        eerror "Wine cannot be built with this version of gcc-5.3"
-                       eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                       eerror "or use gcc-config to select a different compiler version."
+                       eerror "due to compiler bugs; please use gcc-config to select a"
+                       eerror "different compiler version."
                        eerror "See https://bugs.gentoo.org/574044"
                        eerror
                        return 1

diff --git a/app-emulation/wine/wine-1.9.5.ebuild b/app-emulation/wine/wine-1.9.5.ebuild
index 509dbfe69bf8f4110df1a0edadbbcc251ecdd214..6f64997b75fc2245e084ca9362cb34f100709a90 100644 (file)
--- a/app-emulation/wine/wine-1.9.5.ebuild
+++ b/app-emulation/wine/wine-1.9.5.ebuild
@@ -179,8 +179,8 @@ wine_build_environment_check() {
                # Compile in subshell to prevent "Aborted" message
                if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
                        eerror "Wine cannot be built with this version of gcc-5.3"
-                       eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                       eerror "or use gcc-config to select a different compiler version."
+                       eerror "due to compiler bugs; please use gcc-config to select a"
+                       eerror "different compiler version."
                        eerror "See https://bugs.gentoo.org/574044"
                        eerror
                        return 1

diff --git a/app-emulation/wine/wine-1.9.6.ebuild b/app-emulation/wine/wine-1.9.6.ebuild
index e735b28385d7a15f865145db5c0e6eed68814c67..8a68ba0c01b585a6bcd7503c479dee50980a0fed 100644 (file)
--- a/app-emulation/wine/wine-1.9.6.ebuild
+++ b/app-emulation/wine/wine-1.9.6.ebuild
@@ -180,8 +180,8 @@ wine_build_environment_check() {
                # Compile in subshell to prevent "Aborted" message
                if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
                        eerror "Wine cannot be built with this version of gcc-5.3"
-                       eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                       eerror "or use gcc-config to select a different compiler version."
+                       eerror "due to compiler bugs; please use gcc-config to select a"
+                       eerror "different compiler version."
                        eerror "See https://bugs.gentoo.org/574044"
                        eerror
                        return 1

diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index e735b28385d7a15f865145db5c0e6eed68814c67..8a68ba0c01b585a6bcd7503c479dee50980a0fed 100644 (file)
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -180,8 +180,8 @@ wine_build_environment_check() {
                # Compile in subshell to prevent "Aborted" message
                if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
                        eerror "Wine cannot be built with this version of gcc-5.3"
-                       eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-                       eerror "or use gcc-config to select a different compiler version."
+                       eerror "due to compiler bugs; please use gcc-config to select a"
+                       eerror "different compiler version."
                        eerror "See https://bugs.gentoo.org/574044"
                        eerror
                        return 1