summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-06-07 14:46:47 +0200
committerNP-Hardass <NP-Hardass@gentoo.org>2016-06-07 13:13:26 -0400
commit1ea1516c59b79a1cdcbdc475b133faf8f65cb776 (patch)
tree19022a3a406ef83af733e04d79390e173ec2db5f /app-emulation
parentapp-admin/conky-1.10.1-r0: add ~alpha keyword (diff)
downloadgentoo-1ea1516c59b79a1cdcbdc475b133faf8f65cb776.tar.gz
gentoo-1ea1516c59b79a1cdcbdc475b133faf8f65cb776.tar.bz2
gentoo-1ea1516c59b79a1cdcbdc475b133faf8f65cb776.zip
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@gentoo.org>
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/wine/wine-1.8-r1.ebuild20
-rw-r--r--app-emulation/wine/wine-1.8.1-r1.ebuild20
-rw-r--r--app-emulation/wine/wine-1.8.2.ebuild20
-rw-r--r--app-emulation/wine/wine-1.9.10.ebuild20
-rw-r--r--app-emulation/wine/wine-1.9.11.ebuild20
-rw-r--r--app-emulation/wine/wine-1.9.4-r1.ebuild20
-rw-r--r--app-emulation/wine/wine-1.9.5-r1.ebuild20
-rw-r--r--app-emulation/wine/wine-1.9.6-r1.ebuild20
-rw-r--r--app-emulation/wine/wine-1.9.7-r1.ebuild20
-rw-r--r--app-emulation/wine/wine-1.9.8.ebuild20
-rw-r--r--app-emulation/wine/wine-1.9.9.ebuild20
-rw-r--r--app-emulation/wine/wine-9999.ebuild20
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 bdb29eb7b5d..9819193fb67 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 f4681ee1029..693adfbcd88 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 c3338f3da14..7b61b8599ef 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 35f0ebff19f..529dfbe03cd 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 35f0ebff19f..529dfbe03cd 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 7c3d35a6fb0..44b40e1d16f 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 1634fd43e67..c42e24d6a34 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 618f4dd7d90..cab49fb06f3 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 618f4dd7d90..cab49fb06f3 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 8711bad95df..7edb22948c8 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 35f0ebff19f..529dfbe03cd 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 35f0ebff19f..529dfbe03cd 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