<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[581] trunk/compile-xserver.sh</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/xquartz/changeset/581">581</a></dd>
<dt>Author</dt> <dd>jeremyhu@freedesktop.org</dd>
<dt>Date</dt> <dd>2011-10-02 02:41:14 -0700 (Sun, 02 Oct 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Build Xorg</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkcompilexserversh">trunk/compile-xserver.sh</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkcompilexserversh"></a>
<div class="modfile"><h4>Modified: trunk/compile-xserver.sh (580 => 581)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> #!/bin/bash
</span><span class="cx"> 
</span><span class="cx"> #CONFOPT="--disable-xquartz --disable-glx --disable-dri --disable-launchd --enable-kdrive --disable-xsdl --enable-xnest --enable-xvfb"
</span><ins>+#CONFOPT="--enable-xorg --disable-xquartz --disable-kdrive --disable-xnest --disable-xvfb"
</ins><span class="cx"> 
</span><span class="cx"> CONFOPT="--enable-standalone-xpbproxy"
</span><span class="cx"> #CONFOPT="--disable-shave --without-dtrace"
</span><span class="lines">@@ -13,56 +14,56 @@
</span><span class="cx"> 
</span><span class="cx"> . ~/src/strip.sh
</span><span class="cx"> 
</span><del>-PREFIX=/usr/X11
</del><ins>+#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"
</ins><span class="cx"> ARCHFLAGS="-arch i386 -arch x86_64"
</span><span class="cx"> 
</span><del>-#PREFIX=/opt/X11
-#CONFOPT="$CONFOPT --with-apple-application-name=XQuartz --with-launchd-id-prefix=org.macosforge.xquartz"
-#ARCHFLAGS="-arch i386 -arch x86_64"
-
</del><span class="cx"> ACLOCAL="aclocal -I ${PREFIX}/share/aclocal -I /usr/local/share/aclocal"
</span><span class="cx"> 
</span><del>-CPPFLAGS="-DNO_ALLOCA"
</del><ins>+CPPFLAGS="-DNO_ALLOCA -DNO_COMPILER_H -DFAKEIT"
</ins><span class="cx"> 
</span><del>-CFLAGS="$CFLAGS -Os -ggdb3 -pipe"
</del><ins>+CFLAGS="$CFLAGS -O0 -ggdb3 -pipe"
</ins><span class="cx"> CFLAGS="$CFLAGS $ARCHFLAGS"
</span><span class="cx"> CFLAGS="$CFLAGS -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
</span><span class="cx"> 
</span><del>-    TB_CFLAGS="-fdiagnostics-show-category=name"
</del><ins>+CFLAGS="${CFLAGS} -fdiagnostics-show-category=name"
</ins><span class="cx"> 
</span><span class="cx"> # Stage 1:
</span><del>-    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"
</del><ins>+#    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"
</ins><span class="cx"> 
</span><span class="cx"> # Stage 2:
</span><del>-#    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"
</del><ins>+#    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"
</ins><span class="cx"> 
</span><span class="cx"> OBJCFLAGS="$CFLAGS"
</span><span class="cx"> LDFLAGS="$CFLAGS"
</span></span></pre>
</div>
</div>

</body>
</html>