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

[brad at geodynamics.org]

Author: brad
Date: 2011-05-06 15:32:26 -0700 (Fri, 06 May 2011)
New Revision: 18333

Modified:
   cs/buildbot/pylith_deps/src/makefile
Log:
Fixed settings for cygwin.

Modified: cs/buildbot/pylith_deps/src/makefile
===================================================================
--- cs/buildbot/pylith_deps/src/makefile	2011-05-06 21:10:44 UTC (rev 18332)
+++ cs/buildbot/pylith_deps/src/makefile	2011-05-06 22:32:26 UTC (rev 18333)
@@ -1,20 +1,27 @@
 # Linux
 #FETCH=wget -nd -r
-#MPICH_SHAREDARCH=gcc
+#mpich_sharedoptions=--enable-shared --enable-sharedlibs=gcc --disable-static
 #MAKE_THREADS=4
 
 # Darwin
-FETCH=curl -O
-MPICH_SHAREDARCH=osx-gcc
-GCC_EXTRAARGS=--with-dwarf2
-MAKE_THREADS=2
+#FETCH=curl -O
+#mpich_sharedoptions=--enable-shared --enable-sharedlibs=osx-gcc --disable-static
+#GCC_EXTRAARGS=--with-dwarf2
+#MAKE_THREADS=2
 
+# CYGWIN
+FETCH=wget -nd -r
+MAKE_THREADS=1
+mpich_sharedoptions=--enable-static --disable-shared
+
 default:
 
 linux: gcc python mpich cppunit swig numpy fiat proj netcdf hdf5 nemesis
 
 darwin: gcc mpich cppunit pcre swig numpy fiat proj netcdf hdf5 nemesis
 
+cygwin: python mpich cppunit pcre swig numpy fiat proj netcdf nemesis
+
 gnubuild:
 	$(FETCH) http://geodynamics.org/~buildbot/deps/m4-1.4.16.tar.gz
 	$(FETCH) http://geodynamics.org/~buildbot/deps/autoconf-2.68.tar.gz
@@ -85,8 +92,8 @@
 	mkdir -p mpich2-1.3.2p1-build
 	cd mpich2-1.3.2p1-build && \
 		../mpich2-1.3.2p1/configure --with-pm=gforker \
-			--enable-shared --enable-sharedlibs=$(MPICH_SHAREDARCH) \
-			--disable-static --disable-mpe \
+			$(mpich_sharedoptions) \
+			--disable-mpe \
 			--prefix=$(HOME)/install/$(BUILDBOT) \
 			CC=gcc CXX=g++ FC=gfortran && \
 		make && \