commit: 72f76cae15de74cb99a604303de297fb5412d68f
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 18:01:59 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 18:15:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f76cae
app-emulation/wine: Change GCC 5.3 warning, per mgorny request.
Package-Manager: portage-2.2.26
app-emulation/wine/wine-1.8.1.ebuild | 4 ++--
app-emulation/wine/wine-1.8.ebuild | 13 +++++++++++++
app-emulation/wine/wine-1.9.4.ebuild | 9 ++++-----
app-emulation/wine/wine-1.9.5.ebuild | 4 ++--
app-emulation/wine/wine-1.9.6.ebuild | 4 ++--
app-emulation/wine/wine-9999.ebuild | 4 ++--
6 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/app-emulation/wine/wine-1.8.1.ebuild
b/app-emulation/wine/wine-1.8.1.ebuild
index 1d2d4c8..8823448 100644
--- 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 4c1b6f4..d28d9ba 100644
--- 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 e47fe62..70ad728 100644
--- 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 509dbfe..6f64997 100644
--- 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 e735b28..8a68ba0 100644
--- 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 e735b28..8a68ba0 100644
--- 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
