[cig-commits] r18278 - short/3D/PyLith/pylith_installer/trunk

[brad at geodynamics.org]

Author: brad
Date: 2011-04-21 20:38:23 -0700 (Thu, 21 Apr 2011)
New Revision: 18278

Modified:
   short/3D/PyLith/pylith_installer/trunk/Makefile.am
   short/3D/PyLith/pylith_installer/trunk/TODO
   short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Added (untested) support for only build gfortran for compilers. More cleanup.

Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am	2011-04-22 03:24:44 UTC (rev 18277)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2011-04-22 03:38:23 UTC (rev 18278)
@@ -141,30 +141,30 @@
 # ----------------------------------------------------------------------
 compilers: finished_mkdest
 if INSTALL_GCC
-LANGUAGES = c,c++
-if WITH_FORTRAN
-LANGUAGES = c,c++,fortran
-endif
 	$(FETCH_SCRIPT) "$(downloader)" gcc-$(GCC_VER).tar.bz2 http://geodynamics.org/~buildbot/deps
 	$(FETCH_SCRIPT) "$(downloader)" mpc-$(MPC_VER).tar.gz http://geodynamics.org/~buildbot/deps
 	$(FETCH_SCRIPT) "$(downloader)" gmp-$(GMP_VER).tar.gz http://geodynamics.org/~buildbot/deps
 	$(FETCH_SCRIPT) "$(downloader)" mpfr-$(MPFR_VER).tar.bz2 http://geodynamics.org/~buildbot/deps
-	$(TAR) -jxf gcc-4.5.2.tar.bz2
-	cd gcc-4.5.2; \
-		tar -zxf ../gmp-4.3.2.tar.gz; \
-		ln -sf gmp-4.3.2/ gmp; \
-		tar -zxf ../mpc-0.8.2.tar.gz; \
-		ln -sf mpc-0.8.2/ mpc; \
-		tar -jxf ../mpfr-2.4.2.tar.bz2; \
-		ln -sf mpfr-2.4.2/ mpfr
+	$(TAR) -jxf gcc-$(GCC_VER).tar.bz2
+	cd gcc-$(GCC_VER) ; \
+		tar -zxf ../gmp-$(GMP_VER).tar.gz; \
+		ln -sf gmp-$(GMP_VER)/ gmp; \
+		tar -zxf ../mpc-$(MPC_VER).tar.gz; \
+		ln -sf mpc-$(MPC_VER)/ mpc; \
+		tar -jxf ../mpfr-$(MPFR_VER).tar.bz2; \
+		ln -sf mpfr-$(MPFR_VER)/ mpfr
 	$(MKDIR_P) gcc-build
 	cd gcc-build && \
-		../gcc-4.5.2/configure --prefix=$(prefix) \
-			--enable-languages=$(LANGUAGES) && \
+		../gcc-$(GCC_VER)/configure --prefix=$(prefix) \
+			--enable-languages=$(gcc_languages) && \
 		make -j $(make_threads) && \
 		make install && \
 		touch ../installed_compilers
 
+if GCC_FORTRAN_ONLY
+	$(MV) $(prefix)/bin/gcc $(prefix)/bin/gcc-$(GCC_VER)
+endif
+
 else
 	@echo "$@ already installed. Skipping installation."
 endif
@@ -245,7 +245,7 @@
 		../mpich2-$(MPICH2_VER)/configure --with-pm=gforker \
 			--enable-shared --enable-sharedlibs=gcc \
 			--disable-static --disable-mpe \
-			--prefix=$(prefix)  $(env_flags) ; \
+			--prefix=$(prefix)  $(env_flags) $(env_compilers) ; \
 		make && \
 		make install && \
 		touch ../installed_mpi
@@ -404,11 +404,16 @@
 # ----------------------------------------------------------------------
 hdf5: installed_mpi
 if INSTALL_HDF5
+if WITH_FORTRAN
+env_compilers = CC=mpicc CXX=mpicxx FC=mpif90
+else
+env_compilers = CC=mpicc CXX=mpicxx
+endif
 	$(FETCH_SCRIPT) "$(downloader)" hdf5-$(HDF5_VER).tar.gz http://geodynamics.org/~buildbot/deps
 	$(TAR) -zxf hdf5-$(HDF5_VER).tar.gz
 	$(MKDIR_P) hdf5-build
 	cd hdf5-build && \
-		../hdf5-$(HDF5_VER)/configure --enable-parallel --enable-shared --disable-static --prefix=$(prefix) CC=mpicc CXX=mpicxx FC=mpif90  $(env_flags) ; \
+		../hdf5-$(HDF5_VER)/configure --enable-parallel --enable-shared --disable-static --prefix=$(prefix) $(env_flags) $(env_compilers) ; \
 		make -j $(make_threads) && \
 		make install && \
 		touch ../installed_hdf5
@@ -433,6 +438,12 @@
 # ----------------------------------------------------------------------
 petsc: installed_mpi
 if INSTALL_PETSC
+if WITH_HDF5
+petsc_options += --with-hdf5=1
+endif
+if INSTALL_HDF5
+petsc_options += --with-hdf5-include=$(prefix)/include --with-hdf5-lib=$(prefix)/lib/libhdf5.dylib
+endif
 if USE_PYLITH_SVN
 	hg clone http://petsc.cs.iit.edu/petsc/petsc-dev
 	cd petsc-dev/config

Modified: short/3D/PyLith/pylith_installer/trunk/TODO
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/TODO	2011-04-22 03:24:44 UTC (rev 18277)
+++ short/3D/PyLith/pylith_installer/trunk/TODO	2011-04-22 03:38:23 UTC (rev 18278)
@@ -8,6 +8,7 @@
 
   mpich
     test
+    shared arch for darwin
 
   openmpi
     setup
@@ -20,6 +21,3 @@
 
   pylith
     build from repository
-
-
-AC_PROG_MKDIR_P not available with autoconf 2.59.

Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac	2011-04-22 03:24:44 UTC (rev 18277)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2011-04-22 03:38:23 UTC (rev 18278)
@@ -29,10 +29,12 @@
 # GCC
 AC_ARG_ENABLE([gcc],
     [AC_HELP_STRING([--enable-gcc],
-        [install GNU compilers @<:@default=no@:>@])],
-	[if test "$enableval" = yes ; then install_gcc=yes; else install_gcc=no; fi],
+        [install GNU compilers (no, c,c++,fortran)@<:@default=no@:>@])],
+	[if test "$enableval" != no ; then install_gcc=yes; gcc_languages=$enableval; else install_gcc=no; fi],
 	[install_gcc=no])
+AC_SUBST(gcc_languages)
 AM_CONDITIONAL([INSTALL_GCC], [test "$install_gcc" = yes])
+AM_CONDITIONAL([GCC_FORTRAN_ONLY], [test "$gcc_languages" = fortran])
 
 # PYTHON
 AC_ARG_ENABLE([python],
@@ -475,7 +477,7 @@
 echo ""
 echo "PyLith dependencies to be installed:"
 echo ""
-echo "  gcc: $install_gcc"
+echo "  gcc: $install_gcc, languages: $gcc_languages"
 echo "  Python: $install_python"
 echo "  mpi: $install_mpi"
 echo "  cppunit: $install_cppunit"