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>

diff --git a/app-emulation/wine/wine-1.8-r1.ebuild b/app-emulation/wine/wine-1.8-r1.ebuild
index bdb29eb7b5d25b2d412654aafd2911573af548bd..9819193fb67dec2d95c14beaa6b9ae5a9137d4af 100644 (file)
--- 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 f4681ee1029985917e8c7bb0b953e695a6c94751..693adfbcd8898644e4e54f89039a9da8c6f0cbb3 100644 (file)
--- 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 c3338f3da1482c24c52d846708c694e2dc632e5c..7b61b8599ef1b7a3d34e3a50ca463699c107e12b 100644 (file)
--- 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 35f0ebff19f9f76faeac8f05e132d8c8e9fec84b..529dfbe03cd811b96b620498c56139fed47c108b 100644 (file)
--- 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 35f0ebff19f9f76faeac8f05e132d8c8e9fec84b..529dfbe03cd811b96b620498c56139fed47c108b 100644 (file)
--- 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 7c3d35a6fb07373e825abede1037c4582477b2c3..44b40e1d16f9ed11c30c939b438aacfbf6875bbb 100644 (file)
--- 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 1634fd43e676fa927e87cd5e409247c977056a32..c42e24d6a34b213cd751e46447db6b37e58734e6 100644 (file)
--- 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 618f4dd7d9012c504cf9fba39982c8c1c8733b62..cab49fb06f347d25be9ebf4a9688f05e3ac26a4b 100644 (file)
--- 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 618f4dd7d9012c504cf9fba39982c8c1c8733b62..cab49fb06f347d25be9ebf4a9688f05e3ac26a4b 100644 (file)
--- 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 8711bad95dffd26b4fe03c534bd085713d7a4261..7edb22948c86ec2d5d5dae526cc891aa5736aca9 100644 (file)
--- 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 35f0ebff19f9f76faeac8f05e132d8c8e9fec84b..529dfbe03cd811b96b620498c56139fed47c108b 100644 (file)
--- 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 35f0ebff19f9f76faeac8f05e132d8c8e9fec84b..529dfbe03cd811b96b620498c56139fed47c108b 100644 (file)
--- 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