[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Austin English" <wizardedit@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/
Date: Mon,  6 Jun 2016 02:07:58 +0000 (UTC)	[thread overview]
Message-ID: <1465178808.0a6710c283b10eb3bb1c359e763f4003d4f81b8e.wizardedit@gentoo> (raw)

commit:     0a6710c283b10eb3bb1c359e763f4003d4f81b8e
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 01:24:41 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 02:06:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6710c2

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

 app-emulation/wine/files/builtin_ms_va_list.c |  9 +++++++++
 app-emulation/wine/wine-1.8-r1.ebuild         |  9 +++++++--
 app-emulation/wine/wine-1.8.1-r1.ebuild       |  9 +++++++--
 app-emulation/wine/wine-1.8.2.ebuild          |  9 +++++++--
 app-emulation/wine/wine-1.9.10.ebuild         |  9 +++++++--
 app-emulation/wine/wine-1.9.11.ebuild         |  9 +++++++--
 app-emulation/wine/wine-1.9.4-r1.ebuild       |  9 +++++++--
 app-emulation/wine/wine-1.9.5-r1.ebuild       | 11 ++++++++---
 app-emulation/wine/wine-1.9.6-r1.ebuild       |  9 +++++++--
 app-emulation/wine/wine-1.9.7-r1.ebuild       |  9 +++++++--
 app-emulation/wine/wine-1.9.8.ebuild          |  9 +++++++--
 app-emulation/wine/wine-1.9.9.ebuild          |  9 +++++++--
 app-emulation/wine/wine-9999.ebuild           |  9 +++++++--
 13 files changed, 94 insertions(+), 25 deletions(-)

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
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 e074f92..bdb29eb 100644
--- 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 0b38bc8..f4681ee 100644
--- 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 951e2bc..6aa4664 100644
--- 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 971a77c..35f0ebf 100644
--- 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 971a77c..35f0ebf 100644
--- 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 0e6073c..7c3d35a 100644
--- 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 25d8daf..ec15380 100644
--- 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 885d311..618f4dd 100644
--- 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 885d311..618f4dd 100644
--- 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 4ee43c7..8711bad 100644
--- 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 971a77c..35f0ebf 100644
--- 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 971a77c..35f0ebf 100644
--- 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

next             reply	other threads:[~2016-06-06  2:08 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-06  2:07 Austin English [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-01-06 10:45 [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/ Mikle Kolyada
2016-07-10  5:29 NP Hardass
2016-04-22  4:48 NP Hardass
2016-04-19  7:20 Mike Frysinger
2016-03-14  6:37 NP Hardass
2016-03-12 21:10 NP Hardass
2016-03-06  2:57 NP Hardass
2015-10-03  5:43 Alexandre Rostovtsev

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:f36fc26 dfblob:e074f92 dfblob:bdb29eb dfblob:0b38bc8
dfblob:f4681ee dfblob:951e2bc dfblob:6aa4664 dfblob:971a77c
dfblob:35f0ebf dfblob:971a77c dfblob:35f0ebf dfblob:0e6073c
dfblob:7c3d35a dfblob:25d8daf dfblob:ec15380 dfblob:885d311
dfblob:618f4dd dfblob:885d311 dfblob:618f4dd dfblob:4ee43c7
dfblob:8711bad dfblob:971a77c dfblob:35f0ebf dfblob:971a77c
dfblob:35f0ebf )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465178808.0a6710c283b10eb3bb1c359e763f4003d4f81b8e.wizardedit@gentoo \
    --to=wizardedit@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox