Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (7333661df5842871b6b45cdfe25292c93c0fc545)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (7333661df5842871b6b45cdfe25292c93c0fc545)
  • Date: Fri, 13 Jul 2012 04:21:33 -0500

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

xorg-xserver/xorg-server/BUILD | 7 +++++--
xorg-xserver/xorg-server/HISTORY | 3 +++
2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 7333661df5842871b6b45cdfe25292c93c0fc545
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xorg-server - fix build with gcc-4.7.x

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index a8ae07a..c58b530 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -11,10 +11,13 @@ CFLAGS="${CFLAGS/-O2/-O0}"
CXXFLAGS="${CXXFLAGS/-O2/-O0}"
CFLAGS="${CFLAGS/-O3/-O0}"
CXXFLAGS="${CXXFLAGS/-O3/-O0}"
-fi &&
-if [[ $(installed_version gcc) == "4.7.0" ]] ; then
+fi &&
+VGC=$(installed_version gcc) &&
+VGC=${VGC%.?} &&
+if [[ "${VGC}" == "4.7" ]] ; then
CFLAGS+=" -Wno-error=array-bounds"
fi &&
+message CFLAGS=$CFLAGS
OPTS="${XORG_SERVER_OPTS} \
--with-xkb-output=$TRACK_ROOT/var/lib/xkb \
--with-dri-driver-path=$TRACK_ROOT/usr/lib/dri \
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 06563f3..07ddc24 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2012-07-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: generalise fix for gcc-4.7.x
+
2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12.3
* gl_select.patch: updated



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (7333661df5842871b6b45cdfe25292c93c0fc545), Treeve Jelbert, 07/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page