Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3c0ef643f404320e548fb93363fda228d29fe6e8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3c0ef643f404320e548fb93363fda228d29fe6e8)
  • Date: Sat, 23 Feb 2013 05:00:45 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

http/firefox/BUILD | 2 +-
http/firefox/HISTORY | 3 +++
x11-toolkits/fltk/HISTORY | 3 +++
x11-toolkits/fltk/PRE_SUB_DEPENDS | 1 +
x11-toolkits/fltk/SUB_DEPENDS | 3 +++
5 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 3c0ef643f404320e548fb93363fda228d29fe6e8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/fltk: provide sub dependency on OPENGL

commit 4e76ebee07894c25f485f272c9d42237cdce9eee
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/firefox: disable avx when using gcc 4.7

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 1f2ae04..2f44956 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -21,7 +21,7 @@ CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
# Avoid buggy GCC 4.6 AVX code generation, which breaks libxul
#
local gccver=$(gcc -dumpversion)
-if [ ${gccver%.*} = 4.6 ]; then
+if [ ${gccver%.*} = 4.6 ] || [ ${gccver%.*} = 4.7 ]; then
CFLAGS="${CFLAGS//-mavx} -mno-avx"
CXXFLAGS="${CXXFLAGS//-mavx} -mno-avx"
fi
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 63341d1..32869dc 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: disable avx support when using gcc 4.7
+
2013-02-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 19.0, SECURITY_PATCH=61

diff --git a/x11-toolkits/fltk/HISTORY b/x11-toolkits/fltk/HISTORY
index 65b1581..ceedc89 100644
--- a/x11-toolkits/fltk/HISTORY
+++ b/x11-toolkits/fltk/HISTORY
@@ -1,3 +1,6 @@
+2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: added sub dependency on OPENGL
+
2012-11-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.1

diff --git a/x11-toolkits/fltk/PRE_SUB_DEPENDS
b/x11-toolkits/fltk/PRE_SUB_DEPENDS
index ee14d9c..41e5464 100755
--- a/x11-toolkits/fltk/PRE_SUB_DEPENDS
+++ b/x11-toolkits/fltk/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
THREAD) list_find "$FLTK_SUBOPTS" '--enable-threads' ;;
+ OPENGL) is_depends_enabled $SPELL $(get_spell_provider $SPELL
OPENGL) && return 0;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/x11-toolkits/fltk/SUB_DEPENDS b/x11-toolkits/fltk/SUB_DEPENDS
index 7fe9836..b6f79f9 100755
--- a/x11-toolkits/fltk/SUB_DEPENDS
+++ b/x11-toolkits/fltk/SUB_DEPENDS
@@ -1,6 +1,9 @@
persistent_add FLTK_SUBOPTS
case $THIS_SUB_DEPENDS in
THREAD) list_add FLTK_SUBOPTS '--enable-threads' ;;
+ OPENGL) echo "OPENGL support requested, forcing OPENGL
dependency." &&
+ depends OPENGL
+ ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac




Archive powered by MHonArc 2.6.24.

Top of Page