[Xquartz-changes] [581] trunk/compile-xserver.sh

[source_changes at macosforge.org]

Revision: 581
          http://trac.macosforge.org/projects/xquartz/changeset/581
Author:   jeremyhu at freedesktop.org
Date:     2011-10-02 02:41:14 -0700 (Sun, 02 Oct 2011)
Log Message:
-----------
Build Xorg

Modified Paths:
--------------
    trunk/compile-xserver.sh

Modified: trunk/compile-xserver.sh
===================================================================
--- trunk/compile-xserver.sh	2011-09-28 21:15:01 UTC (rev 580)
+++ trunk/compile-xserver.sh	2011-10-02 09:41:14 UTC (rev 581)
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 #CONFOPT="--disable-xquartz --disable-glx --disable-dri --disable-launchd --enable-kdrive --disable-xsdl --enable-xnest --enable-xvfb"
+#CONFOPT="--enable-xorg --disable-xquartz --disable-kdrive --disable-xnest --disable-xvfb"
 
 CONFOPT="--enable-standalone-xpbproxy"
 #CONFOPT="--disable-shave --without-dtrace"
@@ -13,56 +14,56 @@
 
 . ~/src/strip.sh
 
-PREFIX=/usr/X11
+#PREFIX=/usr/X11
+#ARCHFLAGS="-arch i386 -arch x86_64"
+
+PREFIX=/opt/X11
+CONFOPT="$CONFOPT --with-apple-application-name=XQuartz --with-launchd-id-prefix=org.macosforge.xquartz"
 ARCHFLAGS="-arch i386 -arch x86_64"
 
-#PREFIX=/opt/X11
-#CONFOPT="$CONFOPT --with-apple-application-name=XQuartz --with-launchd-id-prefix=org.macosforge.xquartz"
-#ARCHFLAGS="-arch i386 -arch x86_64"
-
 ACLOCAL="aclocal -I ${PREFIX}/share/aclocal -I /usr/local/share/aclocal"
 
-CPPFLAGS="-DNO_ALLOCA"
+CPPFLAGS="-DNO_ALLOCA -DNO_COMPILER_H -DFAKEIT"
 
-CFLAGS="$CFLAGS -Os -ggdb3 -pipe"
+CFLAGS="$CFLAGS -O0 -ggdb3 -pipe"
 CFLAGS="$CFLAGS $ARCHFLAGS"
 CFLAGS="$CFLAGS -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
 
-    TB_CFLAGS="-fdiagnostics-show-category=name"
+CFLAGS="${CFLAGS} -fdiagnostics-show-category=name"
 
 # Stage 1:
-    TB_CFLAGS="${TB_CFLAGS} -Werror=implicit"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=nonnull"
-    TB_CFLAGS="${TB_CFLAGS} -Wformat-security"         # <rdar://problem/9418512> clang is overzealous about -Werror=format-*
-    TB_CFLAGS="${TB_CFLAGS} -Wformat-extra-args"
-    TB_CFLAGS="${TB_CFLAGS} -Wformat-y2k"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=init-self"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=main"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=missing-braces"
-    TB_CFLAGS="${TB_CFLAGS} -Wparentheses"             # libX11 XKBBind.c:169
-    TB_CFLAGS="${TB_CFLAGS} -Werror=sequence-point"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=return-type"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=trigraphs"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=array-bounds"
-#    TB_CFLAGS="${TB_CFLAGS} -Wcast-align"             # Noisy
-    TB_CFLAGS="${TB_CFLAGS} -Werror=write-strings"
-#    TB_CFLAGS="${TB_CFLAGS} -Werror=clobbered"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=address"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=int-to-pointer-cast"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=pointer-to-int-cast"
+#    CFLAGS="${CFLAGS} -Werror=implicit"         # Disabled because current master has a regression
+    CFLAGS="${CFLAGS} -Werror=nonnull"
+    CFLAGS="${CFLAGS} -Wformat-security"         # <rdar://problem/9418512> clang is overzealous about -Werror=format-*
+    CFLAGS="${CFLAGS} -Wformat-extra-args"
+    CFLAGS="${CFLAGS} -Wformat-y2k"
+    CFLAGS="${CFLAGS} -Werror=init-self"
+    CFLAGS="${CFLAGS} -Werror=main"
+    CFLAGS="${CFLAGS} -Werror=missing-braces"
+    CFLAGS="${CFLAGS} -Wparentheses"             # libX11 XKBBind.c:169
+    CFLAGS="${CFLAGS} -Werror=sequence-point"
+    CFLAGS="${CFLAGS} -Werror=return-type"
+    CFLAGS="${CFLAGS} -Werror=trigraphs"
+    CFLAGS="${CFLAGS} -Werror=array-bounds"
+#    CFLAGS="${CFLAGS} -Wcast-align"             # Noisy
+    CFLAGS="${CFLAGS} -Werror=write-strings"
+#    CFLAGS="${CFLAGS} -Werror=clobbered"
+    CFLAGS="${CFLAGS} -Werror=address"
+    CFLAGS="${CFLAGS} -Werror=int-to-pointer-cast"
+    CFLAGS="${CFLAGS} -Werror=pointer-to-int-cast"
 
 # Stage 2:
-#    TB_CFLAGS="${TB_CFLAGS} -Wlogical-op"
-    TB_CFLAGS="${TB_CFLAGS} -Wunused"
-    TB_CFLAGS="${TB_CFLAGS} -Wuninitialized"
-    TB_CFLAGS="${TB_CFLAGS} -Wshadow"
-#    TB_CFLAGS="${TB_CFLAGS} -Wunsafe-loop-optimizations"
-    TB_CFLAGS="${TB_CFLAGS} -Wcast-qual"
-    TB_CFLAGS="${TB_CFLAGS} -Wmissing-noreturn"
-    TB_CFLAGS="${TB_CFLAGS} -Wmissing-format-attribute"
-    TB_CFLAGS="${TB_CFLAGS} -Wredundant-decls"
-    TB_CFLAGS="${TB_CFLAGS} -Wnested-externs"
-    TB_CFLAGS="${TB_CFLAGS} -Winline"
+#    CFLAGS="${CFLAGS} -Wlogical-op"
+    CFLAGS="${CFLAGS} -Wunused"
+    CFLAGS="${CFLAGS} -Wuninitialized"
+    CFLAGS="${CFLAGS} -Wshadow"
+#    CFLAGS="${CFLAGS} -Wunsafe-loop-optimizations"
+    CFLAGS="${CFLAGS} -Wcast-qual"
+    CFLAGS="${CFLAGS} -Wmissing-noreturn"
+    CFLAGS="${CFLAGS} -Wmissing-format-attribute"
+    CFLAGS="${CFLAGS} -Wredundant-decls"
+    CFLAGS="${CFLAGS} -Wnested-externs"
+    CFLAGS="${CFLAGS} -Winline"
 
 OBJCFLAGS="$CFLAGS"
 LDFLAGS="$CFLAGS"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20111002/df106a33/attachment.html>