From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0B9AF59CA3 for ; Mon, 14 Mar 2016 06:37:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 553EFE08E2; Mon, 14 Mar 2016 06:37:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF420E08E2 for ; Mon, 14 Mar 2016 06:37:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA665340B55 for ; Mon, 14 Mar 2016 06:37:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59906858 for ; Mon, 14 Mar 2016 06:37:23 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1457937428.e08eca66f56c895a137a1a7e6cf554d50084c925.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine/files/pr69140.c app-emulation/wine/wine-1.9.5.ebuild app-emulation/wine/wine-9999.ebuild X-VCS-Directories: app-emulation/wine/files/ app-emulation/wine/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: e08eca66f56c895a137a1a7e6cf554d50084c925 X-VCS-Branch: master Date: Mon, 14 Mar 2016 06:37:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 44df074c-ed93-475e-8e16-9d397ba71499 X-Archives-Hash: e0a9123bc87b4005a01389ce3e60f947 commit: e08eca66f56c895a137a1a7e6cf554d50084c925 Author: NP-Hardass gentoo org> AuthorDate: Mon Mar 14 06:35:39 2016 +0000 Commit: NP Hardass gentoo org> CommitDate: Mon Mar 14 06:37:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e08eca66 app-emulation/wine: Update gcc 5.3 test case. #577306. Thanks to Bob Wya Package-Manager: portage-2.2.26 app-emulation/wine/files/pr69140.c | 13 +++++++++++++ app-emulation/wine/wine-1.9.5.ebuild | 5 ++--- app-emulation/wine/wine-9999.ebuild | 5 ++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app-emulation/wine/files/pr69140.c b/app-emulation/wine/files/pr69140.c index 2c345dd..7c9e001 100644 --- a/app-emulation/wine/files/pr69140.c +++ b/app-emulation/wine/files/pr69140.c @@ -22,3 +22,16 @@ MD4Update (MD4_CTX *ctx, const unsigned char *buf) MD4Transform( ctx->buf, (unsigned int *)ctx->in); MD4Transform( ctx->buf, (unsigned int *)ctx->in); } + +int +main(void) +{ + MD4_CTX ctx_test = + { + { 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476 }, + { 0, 0 } + }; + unsigned char buf[64]; + + MD4Update(&ctx_test, (const unsigned char *) &buf); +} diff --git a/app-emulation/wine/wine-1.9.5.ebuild b/app-emulation/wine/wine-1.9.5.ebuild index e7a9349..509dbfe 100644 --- a/app-emulation/wine/wine-1.9.5.ebuild +++ b/app-emulation/wine/wine-1.9.5.ebuild @@ -176,9 +176,8 @@ wine_build_environment_check() { # bug #574044 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then einfo "Checking for gcc-5-3 stack realignment compiler bug ..." - $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die - # Run in subshell to prevent "Aborted" message - if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then + # Compile in subshell to prevent "Aborted" message + if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then eerror "Wine cannot be built with this version of gcc-5.3" eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," eerror "or use gcc-config to select a different compiler version." diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index b29387c..96af59e 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -176,9 +176,8 @@ wine_build_environment_check() { # bug #574044 if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then einfo "Checking for gcc-5-3 stack realignment compiler bug ..." - $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die - # Run in subshell to prevent "Aborted" message - if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then + # Compile in subshell to prevent "Aborted" message + if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then eerror "Wine cannot be built with this version of gcc-5.3" eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," eerror "or use gcc-config to select a different compiler version."