commit: 1ea1516c59b79a1cdcbdc475b133faf8f65cb776
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Jun 7 12:46:47 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 17:13:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea1516c
app-emulation/wine: Fix ebuild bug with !abi_x86_64
Gentoo-bug: 585250
Closes #1624
Package-Manager: portage-2.2.28
Signed-off-by: NP-Hardass <NP-Hardass <AT> gentoo.org>
app-emulation/wine/wine-1.8-r1.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.8.1-r1.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.8.2.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.9.10.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.9.11.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.9.4-r1.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.9.5-r1.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.9.6-r1.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.9.7-r1.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.9.8.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-1.9.9.ebuild | 20 +++++++++++---------
app-emulation/wine/wine-9999.ebuild | 20 +++++++++++---------
12 files changed, 132 insertions(+), 108 deletions(-)
diff --git a/app-emulation/wine/wine-1.8-r1.ebuild
b/app-emulation/wine/wine-1.8-r1.ebuild
index bdb29eb..9819193 100644
--- a/app-emulation/wine/wine-1.8-r1.ebuild
+++ b/app-emulation/wine/wine-1.8-r1.ebuild
@@ -189,15 +189,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.8.1-r1.ebuild
b/app-emulation/wine/wine-1.8.1-r1.ebuild
index f4681ee..693adfb 100644
--- a/app-emulation/wine/wine-1.8.1-r1.ebuild
+++ b/app-emulation/wine/wine-1.8.1-r1.ebuild
@@ -190,15 +190,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.8.2.ebuild
b/app-emulation/wine/wine-1.8.2.ebuild
index c3338f3..7b61b85 100644
--- a/app-emulation/wine/wine-1.8.2.ebuild
+++ b/app-emulation/wine/wine-1.8.2.ebuild
@@ -190,15 +190,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.9.10.ebuild
b/app-emulation/wine/wine-1.9.10.ebuild
index 35f0ebf..529dfbe 100644
--- a/app-emulation/wine/wine-1.9.10.ebuild
+++ b/app-emulation/wine/wine-1.9.10.ebuild
@@ -192,15 +192,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.9.11.ebuild
b/app-emulation/wine/wine-1.9.11.ebuild
index 35f0ebf..529dfbe 100644
--- a/app-emulation/wine/wine-1.9.11.ebuild
+++ b/app-emulation/wine/wine-1.9.11.ebuild
@@ -192,15 +192,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.9.4-r1.ebuild
b/app-emulation/wine/wine-1.9.4-r1.ebuild
index 7c3d35a..44b40e1 100644
--- a/app-emulation/wine/wine-1.9.4-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.4-r1.ebuild
@@ -188,15 +188,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.9.5-r1.ebuild
b/app-emulation/wine/wine-1.9.5-r1.ebuild
index 1634fd4..c42e24d 100644
--- a/app-emulation/wine/wine-1.9.5-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.5-r1.ebuild
@@ -187,15 +187,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.9.6-r1.ebuild
b/app-emulation/wine/wine-1.9.6-r1.ebuild
index 618f4dd..cab49fb 100644
--- a/app-emulation/wine/wine-1.9.6-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.6-r1.ebuild
@@ -187,15 +187,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.9.7-r1.ebuild
b/app-emulation/wine/wine-1.9.7-r1.ebuild
index 618f4dd..cab49fb 100644
--- a/app-emulation/wine/wine-1.9.7-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.7-r1.ebuild
@@ -187,15 +187,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.9.8.ebuild
b/app-emulation/wine/wine-1.9.8.ebuild
index 8711bad..7edb229 100644
--- a/app-emulation/wine/wine-1.9.8.ebuild
+++ b/app-emulation/wine/wine-1.9.8.ebuild
@@ -187,15 +187,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-1.9.9.ebuild
b/app-emulation/wine/wine-1.9.9.ebuild
index 35f0ebf..529dfbe 100644
--- a/app-emulation/wine/wine-1.9.9.ebuild
+++ b/app-emulation/wine/wine-1.9.9.ebuild
@@ -192,15 +192,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
diff --git a/app-emulation/wine/wine-9999.ebuild
b/app-emulation/wine/wine-9999.ebuild
index 35f0ebf..529dfbe 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -192,15 +192,17 @@ wine_build_environment_check() {
fi
fi
- if use abi_x86_64 && einfo "Checking for builtin_ms_va_list ..." && \
- ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
- einfo "$(tc-getCC) supports builtin_ms_va_list, enabling 64-bit
wine"
- else
- eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
+ if use abi_x86_64; then
+ einfo "Checking for builtin_ms_va_list ..."
+ if ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1) ; then
+ einfo "$(tc-getCC) supports builtin_ms_va_list,
enabling 64-bit wine"
+ else
+ eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
+ eerror
+ return 1
+ fi
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
