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

[brad at geodynamics.org]

Author: brad
Date: 2013-04-17 16:35:00 -0700 (Wed, 17 Apr 2013)
New Revision: 21888

Modified:
   cs/buildbot/pylith_deps/src/makefile
Log:
Added git (and curl).

Modified: cs/buildbot/pylith_deps/src/makefile
===================================================================
--- cs/buildbot/pylith_deps/src/makefile	2013-04-17 23:00:05 UTC (rev 21887)
+++ cs/buildbot/pylith_deps/src/makefile	2013-04-17 23:35:00 UTC (rev 21888)
@@ -4,16 +4,16 @@
 #MAKE_THREADS=4
 
 # Darwin
-#FETCH=curl -O
-#mpich_sharedoptions=--enable-shared --enable-sharedlibs=osx-gcc --disable-static
-#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-shared --enable-sharedlibs=cygwin-gcc --disable-static
-env_flags=LDFLAGS=-no-undefined
+#FETCH=wget -nd -r
+#MAKE_THREADS=1
+#mpich_sharedoptions=--enable-shared --enable-sharedlibs=cygwin-gcc --disable-static
+#env_flags=LDFLAGS=-no-undefined
 
 default:
 
@@ -88,11 +88,11 @@
 
 
 mpich:
-	$(FETCH) http://geodynamics.org/~buildbot/deps/mpich2-1.4.1p1.tar.gz
-	tar --no-same-owner -zxf mpich2-1.4.1p1.tar.gz
-	mkdir -p mpich2-1.4.1p1-build
-	cd mpich2-1.4.1p1-build && \
-		../mpich2-1.4.1p1/configure --with-pm=gforker \
+	$(FETCH) http://geodynamics.org/~buildbot/deps/mpich-3.0.3.tar.gz
+	tar --no-same-owner -zxf mpich-3.0.3.tar.gz
+	mkdir -p mpich-3.0.3-build
+	cd mpich-3.0.3-build && \
+		../mpich-3.0.3/configure --with-pm=gforker \
 			$(mpich_sharedoptions) \
 			--disable-mpe \
 			--prefix=$(HOME)/install/$(BUILDBOT) \
@@ -132,6 +132,22 @@
 		make install
 
 
+curl:
+	$(FETCH) http://geodynamics.org/~buildbot/deps/curl-7.30.0.tar.gz
+	tar --no-same-owner -zxf curl-7.30.0.tar.gz
+	mkdir -p curl-7.20.0-build
+	cd curl-7.30.0-build && \
+		../curl-7.30.0/configure --prefix=$(HOME)/pylith_deps && \
+		make -j $(MAKE_THREADS) && \
+		make install
+
+
+git:
+	$(FETCH) http://geodynamics.org/~buildbot/deps/git-1.8.2.1.tar.gz
+	tar --no-same-owner -zxf git-1.8.2.1.tar.gz
+	cd git-1.8.2.1 && \
+		make prefix=$(HOME)/pylith_deps CPPFLAGS="-DNO_EXPAT -DNO_TCLTK -DNO_GETTEXT -I$(HOME)/pylith_deps/include" LDFLAGS="-L$(HOME)/pylith_deps/lib" all install
+
 numpy:
 	$(FETCH) http://geodynamics.org/~buildbot/deps/numpy-1.6.1-patched.tar.gz
 	tar --no-same-owner -zxf numpy-1.6.1-patched.tar.gz