Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (951367169e0406467586a3779c5bb557d1a3843c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (951367169e0406467586a3779c5bb557d1a3843c)
  • Date: Sat, 7 Mar 2009 16:26:53 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11-libs/wine/BUILD | 7 +++++--
x11-libs/wine/HISTORY | 4 ++++
2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 951367169e0406467586a3779c5bb557d1a3843c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Hopefully final fix for the GCC bug triggered in WINE Bug #17024,
use -fno-guess-branch-probability if using -O3 in CFLAGS

diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD
index 7f37556..8124c38 100755
--- a/x11-libs/wine/BUILD
+++ b/x11-libs/wine/BUILD
@@ -4,8 +4,11 @@ touch programs/winetest/tests.rc &&
#
# Fixes http://bugs.winehq.com/show_bug.cgi?id=17406
#
-CFLAGS="-fno-inline $CFLAGS" &&
-CXXFLAGS="-fno-inline $CXXFLAGS" &&
+if grep -q "\-O3" <<< $CFLAGS; then
+ CFLAGS="-fno-guess-branch-probability $CFLAGS" &&
+ CXXFLAGS="-fno-guess-branch-probability $CXXFLAGS"
+fi &&
+
default_build &&

if is_depends_enabled $SPELL docbook-utils; then
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index f517c70..d64d0fc 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,7 @@
+2009-03-07 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Hopefully final fix for the GCC bug triggered in WINE Bug
#17024, use
+ -fno-guess-branch-probability if using -O3 in CFLAGS
+
2009-03-06 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: A better fix for WINE Bug #17024, add -fno-inline to CFLAGS
and
CXXFLAGS. Now -O3 works again.



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (951367169e0406467586a3779c5bb557d1a3843c), Eric Sandall, 03/07/2009

Archive powered by MHonArc 2.6.24.

Top of Page