[Xquartz-changes] [507] trunk/mk_x11_dist.sh

source_changes at macosforge.org source_changes at macosforge.org
Fri Mar 4 15:14:51 PST 2011


Revision: 507
          http://trac.macosforge.org/projects/xquartz/changeset/507
Author:   jeremyhu at freedesktop.org
Date:     2011-03-04 15:14:49 -0800 (Fri, 04 Mar 2011)
Log Message:
-----------
Use /usr/bin/clang by default for SL builds

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

Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh	2011-03-04 23:07:45 UTC (rev 506)
+++ trunk/mk_x11_dist.sh	2011-03-04 23:14:49 UTC (rev 507)
@@ -14,6 +14,9 @@
 #MACOSFORGE=LEO
 MACOSFORGE=SL
 
+MACOSFORGE_BUILD_DOCS="YES"
+#MACOSFORGE_BUILD_DOCS="NO"
+
 TRAIN="trunk"
 #TRAIN="trains/SnowLeopard"
 #TRAIN="trains/SULeo"
@@ -61,19 +64,21 @@
 if [[ ${MACOSFORGE_RELEASE} == "YES" ]] ; then
 	BUILDIT="${BUILDIT} -noverifydstroot"
 
-	export MACOSFORGE_BUILD_DOCS="YES"
+	export MACOSFORGE_BUILD_DOCS
 
-	export XMLTO=/opt/local/bin/xmlto
-	export ASCIIDOC=/opt/local/bin/asciidoc
-	export DOXYGEN=/opt/local/bin/doxygen
-	export FOP=/opt/local/bin/fop
-	export FOP_OPTS="-Xmx2048m -Djava.awt.headless=true"
-	export GROFF=/opt/local/bin/groff
-	export PS2PDF=/opt/local/bin/ps2pdf
+	if [[ ${MACOSFORGE_BUILD_DOCS} == "YES" ]] ; then
+		export XMLTO=/opt/local/bin/xmlto
+		export ASCIIDOC=/opt/local/bin/asciidoc
+		export DOXYGEN=/opt/local/bin/doxygen
+		export FOP=/opt/local/bin/fop
+		export FOP_OPTS="-Xmx2048m -Djava.awt.headless=true"
+		export GROFF=/opt/local/bin/groff
+		export PS2PDF=/opt/local/bin/ps2pdf
 
-	for f in "${XMLTO}" "${ASCIIDOC}" "${DOXYGEN}" "${FOP}" "${GROFF}" "${PS2PDF}" ; do
-		[[ -z "${f}" || -x "${f}" ]] || die "Could not find ${f}"
-	done
+		for f in "${XMLTO}" "${ASCIIDOC}" "${DOXYGEN}" "${FOP}" "${GROFF}" "${PS2PDF}" ; do
+			[[ -z "${f}" || -x "${f}" ]] || die "Could not find ${f}"
+		done
+	fi
 fi
 
 if [[ "${MACOSFORGE_LEO}" == "YES" && ${XPLUGIN} == "trunk" ]] ; then
@@ -94,7 +99,8 @@
 	ARCH_EXEC="-arch i386 -arch x86_64"
 	ARCH_ALL="${ARCH_EXEC}"
 	if [[ "${MACOSFORGE_SL}" == "YES" ]] ; then
-		export CC="/opt/llvm/bin/clang"
+		export CC="/usr/bin/clang"
+		#export CC="/opt/llvm/bin/clang"
 		#export CC="/opt/local/bin/clang"
 		export PYTHON=/usr/bin/python2.6
 		export PYTHONPATH="${X11_PREFIX}/lib/python2.6:${X11_PREFIX}/lib/python2.6/site-packages"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110304/7f70b36b/attachment-0001.html>


More information about the Xquartz-changes mailing list