app-emulation/wine: check if CC supports builtin_ms_va_list when attempting 64-bit...

diff --git a/app-emulation/wine/files/builtin_ms_va_list.c b/app-emulation/wine/files/builtin_ms_va_list.c
new file mode 100644 (file)
index 0000000..f36fc26
--- /dev/null
+++ b/app-emulation/wine/files/builtin_ms_va_list.c
@@ -0,0 +1,9 @@
+/* Taken from Wine's configure script. LGPL 2.1+ */
+
+#include <stdarg.h>
+
+int main(void)
+{
+    void func(__builtin_ms_va_list *args);
+    return 0;
+}

diff --git a/app-emulation/wine/wine-1.8-r1.ebuild b/app-emulation/wine/wine-1.8-r1.ebuild
index e074f929d4e92612f22331e6d13d5b82dcb5211e..bdb29eb7b5d25b2d412654aafd2911573af548bd 100644 (file)
--- a/app-emulation/wine/wine-1.8-r1.ebuild
+++ b/app-emulation/wine/wine-1.8-r1.ebuild
@@ -189,8 +189,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-1.8.1-r1.ebuild b/app-emulation/wine/wine-1.8.1-r1.ebuild
index 0b38bc822d2b7159ccbf847078e2c05a0ea2bf3e..f4681ee1029985917e8c7bb0b953e695a6c94751 100644 (file)
--- a/app-emulation/wine/wine-1.8.1-r1.ebuild
+++ b/app-emulation/wine/wine-1.8.1-r1.ebuild
@@ -190,8 +190,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-1.8.2.ebuild b/app-emulation/wine/wine-1.8.2.ebuild
index 951e2bce58c30e8a8ac5b351c52840a1c982fc4a..6aa4664fff1ba4a227cceabd28ee6f3c3c0c1f37 100644 (file)
--- a/app-emulation/wine/wine-1.8.2.ebuild
+++ b/app-emulation/wine/wine-1.8.2.ebuild
@@ -190,8 +190,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-1.9.10.ebuild b/app-emulation/wine/wine-1.9.10.ebuild
index 971a77cbf618dcc84a6cca389d4cbac34f9fe9cf..35f0ebff19f9f76faeac8f05e132d8c8e9fec84b 100644 (file)
--- a/app-emulation/wine/wine-1.9.10.ebuild
+++ b/app-emulation/wine/wine-1.9.10.ebuild
@@ -192,8 +192,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-1.9.11.ebuild b/app-emulation/wine/wine-1.9.11.ebuild
index 971a77cbf618dcc84a6cca389d4cbac34f9fe9cf..35f0ebff19f9f76faeac8f05e132d8c8e9fec84b 100644 (file)
--- a/app-emulation/wine/wine-1.9.11.ebuild
+++ b/app-emulation/wine/wine-1.9.11.ebuild
@@ -192,8 +192,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-1.9.4-r1.ebuild b/app-emulation/wine/wine-1.9.4-r1.ebuild
index 0e6073c0cc7431d5dcada9292d548126dd5bbd2a..7c3d35a6fb07373e825abede1037c4582477b2c3 100644 (file)
--- a/app-emulation/wine/wine-1.9.4-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.4-r1.ebuild
@@ -188,8 +188,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-1.9.5-r1.ebuild b/app-emulation/wine/wine-1.9.5-r1.ebuild
index 25d8dafc728bb2dfceb9e6f44bac780f310842b4..ec153803a9d28b2faf1f1e7d9ea45b8292ec471a 100644 (file)
--- a/app-emulation/wine/wine-1.9.5-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.5-r1.ebuild
@@ -186,9 +186,14 @@ wine_build_environment_check() {
                        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"
+    
+       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
        fi

diff --git a/app-emulation/wine/wine-1.9.6-r1.ebuild b/app-emulation/wine/wine-1.9.6-r1.ebuild
index 885d311c7e5b8080e3bb6ce74ee42110cc592d70..618f4dd7d9012c504cf9fba39982c8c1c8733b62 100644 (file)
--- a/app-emulation/wine/wine-1.9.6-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.6-r1.ebuild
@@ -187,8 +187,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-1.9.7-r1.ebuild b/app-emulation/wine/wine-1.9.7-r1.ebuild
index 885d311c7e5b8080e3bb6ce74ee42110cc592d70..618f4dd7d9012c504cf9fba39982c8c1c8733b62 100644 (file)
--- a/app-emulation/wine/wine-1.9.7-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.7-r1.ebuild
@@ -187,8 +187,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-1.9.8.ebuild b/app-emulation/wine/wine-1.9.8.ebuild
index 4ee43c708425684a269c7e53f8c4d600dbac634f..8711bad95dffd26b4fe03c534bd085713d7a4261 100644 (file)
--- a/app-emulation/wine/wine-1.9.8.ebuild
+++ b/app-emulation/wine/wine-1.9.8.ebuild
@@ -187,8 +187,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-1.9.9.ebuild b/app-emulation/wine/wine-1.9.9.ebuild
index 971a77cbf618dcc84a6cca389d4cbac34f9fe9cf..35f0ebff19f9f76faeac8f05e132d8c8e9fec84b 100644 (file)
--- a/app-emulation/wine/wine-1.9.9.ebuild
+++ b/app-emulation/wine/wine-1.9.9.ebuild
@@ -192,8 +192,13 @@ wine_build_environment_check() {
                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"
+       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
        fi

diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 971a77cbf618dcc84a6cca389d4cbac34f9fe9cf..35f0ebff19f9f76faeac8f05e132d8c8e9fec84b 100644 (file)
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -192,8 +192,13 @@ wine_build_environment_check() {
                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"
+       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
        fi