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

[brad at geodynamics.org]

Author: brad
Date: 2011-03-11 13:55:49 -0800 (Fri, 11 Mar 2011)
New Revision: 18093

Modified:
   cs/buildbot/pylith_deps/src/makefile
Log:
Added number of make threads and additional config args.

Modified: cs/buildbot/pylith_deps/src/makefile
===================================================================
--- cs/buildbot/pylith_deps/src/makefile	2011-03-10 19:11:48 UTC (rev 18092)
+++ cs/buildbot/pylith_deps/src/makefile	2011-03-11 21:55:49 UTC (rev 18093)
@@ -1,12 +1,14 @@
 # Linux
 #FETCH=wget -nd -r
 #MPICH_SHAREDARCH=GCC
+#MAKE_THREADS=4
 
 # Darwin
 FETCH=curl -O
 MPICH_SHAREDARCH=osx-gcc
+GCC_EXTRAARGS=--with-dwarf2
+MAKE_THREADS=2
 
-
 default:
 
 linux: gcc python mpich cppunit swig numpy fiat proj netcdf hdf5 nemesis
@@ -30,8 +32,9 @@
 	mkdir -p gcc-4.5.2-build
 	cd gcc-4.5.2-build && \
 		../gcc-4.5.2/configure --prefix=$(HOME)/install/$(BUILDBOT) \
-			--enable-languages=c,c++,fortran && \
-		make -j 4 && \
+			--enable-languages=c,c++,fortran \
+			$(GCC_EXTRAARGS) && \
+		make -j $(MAKE_THREADS) && \
 		make install
 
 
@@ -41,7 +44,7 @@
 	mkdir -p Python-2.6.6-build
 	cd Python-2.6.6-build && \
 		../Python-2.6.6/configure --enable-shared --prefix=$(HOME)/install/$(BUILDBOT) && \
-		make -j 4 && \
+		make -j $(MAKE_THREADS) && \
 		make install
 
 
@@ -66,7 +69,7 @@
 	mkdir -p cppunit-1.12.1-build
 	cd cppunit-1.12.1-build && \
 		../cppunit-1.12.1/configure --prefix=$(HOME)/pylith_deps && \
-		make -j 4 && \
+		make -j $(MAKE_THREADS) && \
 		make install
 
 
@@ -76,7 +79,7 @@
 	mkdir -p pcre-8.12-build
 	cd pcre-8.12-build && \
 		../pcre-8.12/configure --prefix=$(HOME)/pylith_deps && \
-		make -j 4 && \
+		make -j $(MAKE_THREADS) && \
 		make install
 
 
@@ -86,7 +89,7 @@
 	mkdir -p swig-2.0.2-build
 	cd swig-2.0.2-build && \
 		../swig-2.0.2/configure --prefix=$(HOME)/pylith_deps && \
-		make -j 4 && \
+		make -j $(MAKE_THREADS) && \
 		make install
 
 
@@ -112,7 +115,7 @@
 		unzip ../../proj-datumgrid-1.3.zip
 	cd proj-4.7.0-build && \
 		../proj-4.7.0/configure --prefix=$(HOME)/install/$(BUILDBOT) && \
-		make -j 4 && \
+		make -j $(MAKE_THREADS) && \
 		make install
 
 
@@ -123,7 +126,7 @@
 	cd netcdf-4.1.1-build && \
 		../netcdf-4.1.1/configure --prefix=$(HOME)/install/$(BUILDBOT) \
 			--enable-shared --disable-static --disable-netcdf-4 && \
-		make -j 4 && \
+		make -j $(MAKE_THREADS) && \
 		make install
 
 
@@ -133,7 +136,7 @@
 	mkdir -p hdf5-1.8.6-build
 	cd hdf5-1.8.6-build && \
 		../hdf5-1.8.6/configure --enable-parallel --enable-shared --disable-static --prefix=$(HOME)/install/$(BUILDBOT) CC=mpicc CXX=mpicxx FC=mpif90 && \
-		make -j 4 && \
+		make -j $(MAKE_THREADS) && \
 		make install
 
 nemesis: