[cig-commits] r18037 - cs/buildbot/pylith_deps/src

[brad at geodynamics.org]

Author: brad
Date: 2011-03-04 11:46:37 -0800 (Fri, 04 Mar 2011)
New Revision: 18037

Modified:
   cs/buildbot/pylith_deps/src/makefile
Log:
Updated.

Modified: cs/buildbot/pylith_deps/src/makefile
===================================================================
--- cs/buildbot/pylith_deps/src/makefile	2011-03-04 19:28:43 UTC (rev 18036)
+++ cs/buildbot/pylith_deps/src/makefile	2011-03-04 19:46:37 UTC (rev 18037)
@@ -1,6 +1,6 @@
 default:
 
-all: gcc python mpich setuptools pip cppunit swig numpy proj netcdf hdf5
+all: gcc python mpich cppunit swig numpy fiat proj netcdf hdf5
 
 
 gcc:
@@ -41,27 +41,13 @@
 	cd mpich2-1.3.2p1-build && \
 		../mpich2-1.3.2p1/configure --with-pm=gforker \
 			--enable-shared --enable-sharedlibs=gcc \
+			--disable-static --disable-mpe \
 			--prefix=$(HOME)/install/$(BUILDBOT) \
 			CC=gcc CXX=g++ FC=gfortran && \
 		make && \
 		make install
 
 
-setuptools:
-	wget http://geodynamics.org/~buildbot/deps/setuptools-0.6c11.tar.gz
-	tar -zxf setuptools-$VER.tar.gz
-	cd setuptools-0.6c11 && \
-		python setup.py install
-
-
-pip:
-	wget http://geodynamics.org/~buildbot/deps/pip-0.8.2.tar.gz
-	tar -zxf pip-$VER.tar.gz
-	mkdir -p $(HOME)/pylith_deps/lib/python${PYTHON_VERSION}/site-packages
-	cd pip-0.8.2
-	python setup.py install --prefix=$(HOME)/pylith_deps
-
-
 cppunit:
 	wget http://geodynamics.org/~buildbot/deps/cppunit-1.12.1.tar.gz
 	tar -zxf cppunit-$VER.tar.gz
@@ -83,8 +69,17 @@
 
 
 numpy:
-	pip install numpy
+	wget http://geodynamics.org/~buildbot/deps/numpy-1.5.1.tar.gz
+	tar -zxf numpy-1.5.1.tar.gz
+	cd numpy-1.5.1 && python setup.py install --prefix=$(HOME)/install/$(BUILDBOT)
 
+fiat:
+	wget http://geodynamics.org/~buildbot/deps/ScientificPython-2.9.1.tar.gz
+	tar -zxf ScientificPython-2.9.1.tar.gz
+	cd ScientificPython-2.9.1 && python setup.py install --prefix=$(HOME)/install/$(BUILDBOT)
+	wget http://geodynamics.org/~buildbot/deps/fiat-0.9.9.tar.gz
+	tar -zxf fiat-0.9.9.tar.gz
+	cd fiat-0.9.9 && python setup.py install --prefix=$(HOME)/install/$(BUILDBOT)
 
 proj:
 	wget http://geodynamics.org/~buildbot/deps/proj-4.7.0.tar.gz
@@ -104,7 +99,8 @@
 	tar -zxvf netcdf-4.1.1.tar.gz
 	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-netcdf-4 && \
+		../netcdf-4.1.1/configure --prefix=$(HOME)/install/$(BUILDBOT) \
+			--enable-shared --disable-static --disable-netcdf-4 && \
 		make -j 4 && \
 		make install