[Xquartz-changes] [591] trunk

[source_changes at macosforge.org]

Revision: 591
          http://trac.macosforge.org/projects/xquartz/changeset/591
Author:   jeremyhu at freedesktop.org
Date:     2011-11-21 18:38:29 -0800 (Mon, 21 Nov 2011)
Log Message:
-----------
Misc updated

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

Modified: trunk/compile-xserver.sh
===================================================================
--- trunk/compile-xserver.sh	2011-11-11 07:09:00 UTC (rev 590)
+++ trunk/compile-xserver.sh	2011-11-22 02:38:29 UTC (rev 591)
@@ -32,46 +32,18 @@
 CFLAGS="${CFLAGS} -fdiagnostics-show-category=name"
 
 # Stage 1:
-#    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:
 #    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"
 
 #CC="llvm-gcc"
 #CXX="llvm-g++"
-CC="clang"
-CXX="clang++"
+CC="/opt/local/bin/clang-mp-3.1"
+CXX="/opt/local/bin/clang++-mp-3.1"
 
 OBJC="$CC"
 

Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh	2011-11-11 07:09:00 UTC (rev 590)
+++ trunk/mk_x11_dist.sh	2011-11-22 02:38:29 UTC (rev 591)
@@ -180,7 +180,7 @@
 
 #[[ $(echo /tmp/X11*.roots) = '/tmp/X11*.roots' ]] || /bin/rm -rf /tmp/X11*.roots
 
-bit_git X11_Xplugin "${XPLUGIN}" ${ARCH_ALL} 
+[[ -n ${XPLUGIN} ]]      && bit_git X11_Xplugin "${XPLUGIN}" ${ARCH_ALL} 
 [[ -n ${X11MISC} ]]     && bit X11misc/${X11MISC}        -project X11misc       ${ARCH_ALL}
 [[ -n ${X11PROTO} ]]    && bit X11proto/${X11PROTO}      -project X11proto      ${ARCH_ALL}
 [[ -n ${X11LIBS} ]]     && bit X11libs/${X11LIBS}        -project X11libs       ${ARCH_ALL}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20111121/d6d2d45b/attachment.html>