[Xquartz-changes] [528] tinderbox

[source_changes at macosforge.org]

Revision: 528
          http://trac.macosforge.org/projects/xquartz/changeset/528
Author:   jeremyhu at freedesktop.org
Date:     2011-04-09 09:09:23 -0700 (Sat, 09 Apr 2011)
Log Message:
-----------
Set LD_LIBRARY_PATH for the linux tinderboxes.  Set OBJC to clang on yuffie.  Set OBJCFLAGS and CXXFLAGS

Modified Paths:
--------------
    tinderbox/jhbuildrc.linux
    tinderbox/jhbuildrc.xquartz
    tinderbox/tinderbox_test.sh

Modified: tinderbox/jhbuildrc.linux
===================================================================
--- tinderbox/jhbuildrc.linux	2011-04-09 07:30:21 UTC (rev 527)
+++ tinderbox/jhbuildrc.linux	2011-04-09 16:09:23 UTC (rev 528)
@@ -1,4 +1,5 @@
-# Outside requirements: gperf bison flex libxml2-dev libexpat-dev libpng-dev libfreetype6-dev libgcrypt-dev intltool libglib2.0-dev
+# Nonstandard Ubuntu requirements: gperf bison flex libxml2-dev libexpat-dev libpng-dev libfreetype6-dev libgcrypt-dev intltool libglib2.0-dev
+# Nonstandard Gentoo requirements: libxslt
 
 moduleset = os.path.join(os.environ['JHBUILDDIR'], 'xorg.modules')
 
@@ -12,6 +13,6 @@
 checkoutroot = os.path.join(os.environ['JHBUILDDIR'] , 'src')
 prefix = os.path.join(os.environ['JHBUILDDIR'], 'build')
 
-autogenargs = '--without-xf86misc --without-fop --without-xmlto --without-doxygen --without-asciidoc --without-groff --disable-specs --disable-devel-docs --disable-docs --disable-static --disable-dependency-tracking --disable-runtime-deps'
+autogenargs = '--without-xf86misc --without-fop --without-xmlto --without-doxygen --without-asciidoc --without-groff --disable-specs --disable-devel-docs --disable-docs --disable-static --disable-dependency-tracking --disable-runtime-deps --disable-silent-rules --disable-gtk'
 
 makeargs = '-j1'

Modified: tinderbox/jhbuildrc.xquartz
===================================================================
--- tinderbox/jhbuildrc.xquartz	2011-04-09 07:30:21 UTC (rev 527)
+++ tinderbox/jhbuildrc.xquartz	2011-04-09 16:09:23 UTC (rev 528)
@@ -12,5 +12,5 @@
 checkoutroot = os.path.join(os.environ['JHBUILDDIR'] , 'src')
 prefix = os.path.join(os.environ['JHBUILDDIR'], 'build')
 
-autogenargs = '--without-xf86misc --without-fop --without-xmlto --without-doxygen --without-asciidoc --without-groff --disable-specs --disable-devel-docs --disable-docs --with-dtrace --disable-static --disable-dependency-tracking --with-launchagents-dir=' + os.path.join(prefix, 'Library', 'LaunchAgents') + ' --with-launchdaemons-dir=' + os.path.join(prefix, 'Library', 'LaunchDaemons') + ' --with-apple-applications-dir=' + os.path.join(prefix, 'Applications')
+autogenargs = '--without-xf86misc --without-fop --without-xmlto --without-doxygen --without-asciidoc --without-groff --disable-specs --disable-devel-docs --disable-docs --with-dtrace --disable-static --disable-dependency-tracking --disable-silent-rules --disable-gtk --with-launchagents-dir=' + os.path.join(prefix, 'Library', 'LaunchAgents') + ' --with-launchdaemons-dir=' + os.path.join(prefix, 'Library', 'LaunchDaemons') + ' --with-apple-applications-dir=' + os.path.join(prefix, 'Applications')
 

Modified: tinderbox/tinderbox_test.sh
===================================================================
--- tinderbox/tinderbox_test.sh	2011-04-09 07:30:21 UTC (rev 527)
+++ tinderbox/tinderbox_test.sh	2011-04-09 16:09:23 UTC (rev 528)
@@ -17,6 +17,7 @@
     URL="http://jeremyhu-yuffie:xQUGcg@tinderbox.x.org/builds/rpc"
 
     export CC="/opt/llvm/bin/clang"
+    export OBJC="${CC}"
     export CXX="/opt/llvm/bin/clang++"
     export LIBTOOLIZE="glibtoolize"
 
@@ -27,11 +28,13 @@
     ;;
   tifa|tifa-linux32)
     JHBUILD="linux32 ${JHBUILD}"
+    LD_LIBRARY_PATH="${JHBUILDDIR}/build/lib:${JHBUILDDIR}/external/build/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
     URL="http://jeremyhu-tifa-linux32:xFDSPr@tinderbox.x.org/builds/rpc"
     ;;
   tifa-linux64)
     # libxcb does not like python3
     export PYTHON="/usr/bin/python2"
+    LD_LIBRARY_PATH="${JHBUILDDIR}/build/lib:${JHBUILDDIR}/external/build/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
     URL="http://jeremyhu-tifa-linux64:JsFKEr4f6@tinderbox.x.org/builds/rpc"
     ;;
   *)
@@ -58,6 +61,8 @@
 
 export CPPFLAGS="-I${JHBUILDDIR}/build/include -I${JHBUILDDIR}/external/build/include"
 export CFLAGS="-O0 -pipe -Wall -Wformat=2"
+export OBJCFLAGS="${CFLAGS}"
+export CXXFLAGS="${CFLAGS}"
 
 [[ -d "${JHBUILDDIR}/build/share/aclocal" ]] || mkdir -p "${JHBUILDDIR}/build/share/aclocal"
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110409/257255b4/attachment.html>