[cig-commits] r19730 - in cs/buildbot/pylith_deps: . src

[brad at geodynamics.org]

Author: brad
Date: 2012-03-06 11:47:44 -0800 (Tue, 06 Mar 2012)
New Revision: 19730

Modified:
   cs/buildbot/pylith_deps/bashrc
   cs/buildbot/pylith_deps/src/makefile
Log:
Updates.

Modified: cs/buildbot/pylith_deps/bashrc
===================================================================
--- cs/buildbot/pylith_deps/bashrc	2012-03-06 19:47:34 UTC (rev 19729)
+++ cs/buildbot/pylith_deps/bashrc	2012-03-06 19:47:44 UTC (rev 19730)
@@ -13,7 +13,6 @@
 export PYTHONPATH=${BUILDBOT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH}
 unset BUILDBOT_INSTALL
 
-if [ "${BUILDBOT}" == "pylith_darwin_10.4_binbot" ] || [ ${BUILDBOT} == "pylith_darwin_10.6_binbot" ]; then
-  export DYLD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}
+if [ "${BUILDBOT}" == "pylith_darwin_10.5_binbot" ] || [ ${BUILDBOT} == "pylith_darwin_10.6_binbot" ]; then
   unset LD_LIBRARY_PATH
 fi

Modified: cs/buildbot/pylith_deps/src/makefile
===================================================================
--- cs/buildbot/pylith_deps/src/makefile	2012-03-06 19:47:34 UTC (rev 19729)
+++ cs/buildbot/pylith_deps/src/makefile	2012-03-06 19:47:44 UTC (rev 19730)
@@ -163,7 +163,7 @@
 	mkdir -p netcdf-4.1.1-build
 	cd netcdf-4.1.1-build && \
 		../netcdf-4.1.1/configure --prefix=$(HOME)/install/$(BUILDBOT) \
-			--enable-shared --disable-static --disable-netcdf-4 && \
+			--enable-shared --disable-static --disable-netcdf-4 --disable-dap && \
 		make -j $(MAKE_THREADS) && \
 		make install