[Xquartz-changes] [465] trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Jul 13 14:43:34 PDT 2010


Revision: 465
          http://trac.macosforge.org/projects/xquartz/changeset/465
Author:   jeremyhu at freedesktop.org
Date:     2010-07-13 14:43:34 -0700 (Tue, 13 Jul 2010)
Log Message:
-----------
Don't build xevie

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

Modified: trunk/compile-xserver.sh
===================================================================
--- trunk/compile-xserver.sh	2010-07-10 17:49:13 UTC (rev 464)
+++ trunk/compile-xserver.sh	2010-07-13 21:43:34 UTC (rev 465)
@@ -14,14 +14,17 @@
 . ~/src/strip.sh
 
 #PREFIX=/usr/X11
+#ARCHFLAGS="-arch i386 -arch ppc"
+
 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"
 
 CFLAGS="-Wall -pipe -DNO_ALLOCA"
 CFLAGS="$CFLAGS -O0 -ggdb3"
-CFLAGS="$CFLAGS -arch i386 -arch x86_64 -arch ppc"
+CFLAGS="$CFLAGS $ARCHFLAGS"
 
 LDFLAGS="$CFLAGS"
 
@@ -40,7 +43,7 @@
 
 docomp() {
 	autoreconf -fvi || die
-	${SCAN_BUILD} ./configure --prefix=${PREFIX} ${CONFOPT} --disable-dependency-tracking --enable-maintainer-mode --enable-xcsecurity --enable-record "${@}" || die "Could not configure xserver"
+	${SCAN_BUILD} ./configure --prefix=${PREFIX} ${CONFOPT} --disable-dependency-tracking --enable-maintainer-mode --enable-xcsecurity --enable-record --disable-xevie "${@}" || die "Could not configure xserver"
 	${MAKE} clean || die "Unable to make clean"
 	${SCAN_BUILD} ${MAKE} ${MAKE_OPTS} || die "Could not make xserver"
 }

Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh	2010-07-10 17:49:13 UTC (rev 464)
+++ trunk/mk_x11_dist.sh	2010-07-13 21:43:34 UTC (rev 465)
@@ -12,14 +12,12 @@
 #MERGE_DIRS="${MERGE_DIRS} /Users/jeremy/src/freedesktop/pkg/X11"
 
 #MACOSFORGE=LEO
-#MACOSFORGE=SL
+MACOSFORGE=SL
 
 TRAIN="trunk"
 #TRAIN="trains/SnowLeopard"
 #TRAIN="trains/SULeo"
 
-#TRAIN="branches/PR-6468134"
-
 ### End Configuration ###
 
 XPLUGIN="${XPLUGIN:-${TRAIN}}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20100713/15f7bca5/attachment.html>


More information about the Xquartz-changes mailing list