[cig-commits] r20679 - short/3D/PyLith/pylith_installer/trunk
brad at geodynamics.org
brad at geodynamics.org
Tue Sep 4 11:02:58 PDT 2012
Author: brad
Date: 2012-09-04 11:02:58 -0700 (Tue, 04 Sep 2012)
New Revision: 20679
Modified:
short/3D/PyLith/pylith_installer/trunk/INSTALL
short/3D/PyLith/pylith_installer/trunk/Makefile.am
short/3D/PyLith/pylith_installer/trunk/README
short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Added ability for user to specify CFLAGS, CXXFLAGS, and FCFLAGS.
Modified: short/3D/PyLith/pylith_installer/trunk/INSTALL
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/INSTALL 2012-09-04 17:47:54 UTC (rev 20678)
+++ short/3D/PyLith/pylith_installer/trunk/INSTALL 2012-09-04 18:02:58 UTC (rev 20679)
@@ -118,14 +118,14 @@
Download the installer.
- http://www.geodynamics.org/cig/software/pylith/pylith-installer-1.7.1-0.tgz
+ http://www.geodynamics.org/cig/software/pylith/pylith-installer-1.7.2-0.tgz
Untar the source code for the installer:
mkdir -p $HOME/src/pylith
cd $HOME/src/pylith
- mv $HOME/Downloads/pylith-installer-1.7.1-0.tgz
- tar -zxf pylith-installer-1.7.1-0.tgz
+ mv $HOME/Downloads/pylith-installer-1.7.2-0.tgz
+ tar -zxf pylith-installer-1.7.2-0.tgz
----------------------------------------------------------------------
@@ -146,7 +146,7 @@
Run configure with --help to see all of the command line arguments.
- $HOME/src/pylith/pylith-installer-1.7.1-0/configure --help
+ $HOME/src/pylith/pylith-installer-1.7.2-0/configure --help
-------
DEFAULT
@@ -158,7 +158,7 @@
* MPI
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.7.1-0/configure \
+ $HOME/src/pylith/pylith-installer-1.7.2-0/configure \
--with-make-threads=2 \
--prefix=$HOME/pylith
@@ -172,7 +172,7 @@
* MPI
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.7.1-0/configure \
+ $HOME/src/pylith/pylith-installer-1.7.2-0/configure \
--with-fortran=no \
--with-make-threads=2 \
--petsc_options="--download-chaco=1 --download-c-blas-lapack=1" \
@@ -196,7 +196,7 @@
* cppunit
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.7.1-0/configure \
+ $HOME/src/pylith/pylith-installer-1.7.2-0/configure \
--disable-cppunit \
--disable-numpy \
--disable-proj4 \
@@ -216,7 +216,7 @@
* C, C++, Fortran compilers
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.7.1-0/configure \
+ $HOME/src/pylith/pylith-installer-1.7.2-0/configure \
--enable-python \
--enable-mpi=openmpi \
--with-make-threads=2 \
@@ -241,7 +241,7 @@
* C/C++ compilers
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.7.1-0/configure \
+ $HOME/src/pylith/pylith-installer-1.7.2-0/configure \
--enable-gcc=fortran \
--enable-python \
--enable-mpi=openmpi \
@@ -261,7 +261,7 @@
* MPI
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.7.1-0/configure \
+ $HOME/src/pylith/pylith-installer-1.7.2-0/configure \
--enable-python \
--with-make-threads=2 \
--prefix=$HOME/pylith
@@ -287,7 +287,7 @@
* Mercurial
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.7.1-0/configure \
+ $HOME/src/pylith/pylith-installer-1.7.2-0/configure \
--with-pylith-svn=stable \
--with-make-threads=2 \
--prefix=$HOME/pylith
@@ -406,5 +406,5 @@
"pic_flag" and "wl" parameters are set in the Fortan sections. They
should be set via something like:
- pic_flag="-fPIC"
+ pic_flag=" -fPIC"
wl="-Wl,"
Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am 2012-09-04 17:47:54 UTC (rev 20678)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am 2012-09-04 18:02:58 UTC (rev 20679)
@@ -139,7 +139,7 @@
# Environment settings.
# ----------------------------------------------------------------------
abs_builddir=`pwd`
-env_flags = CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+env_flags = CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS) -DMPICH_IGNORE_CXX_SEEK" FCFLAGS="$(FCFLAGS)"
if WITH_FORTRAN
env_compilers = CC=$(CC) CXX=$(CXX) FC=$(FC)
@@ -437,7 +437,6 @@
../hdf5-$(HDF5_VER)/configure \
--enable-parallel --enable-shared --enable-unsupported \
--disable-static --prefix=$(prefix) $(hdf5_options) \
- CXXFLAGS=-DMPICH_IGNORE_CXX_SEEK \
$(env_flags) $(env_mpicompilers) ; \
make -j $(make_threads) && \
make install && \
@@ -709,7 +708,6 @@
cd petsc-dev && \
./configure --prefix=$(prefix) \
--with-c2html=0 --with-x=0 \
- --CXXFLAGS=-DMPICH_IGNORE_CXX_SEEK \
--with-clanguage=C++ \
--with-mpicompilers=1 \
--with-debugging=0 \
Modified: short/3D/PyLith/pylith_installer/trunk/README
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/README 2012-09-04 17:47:54 UTC (rev 20678)
+++ short/3D/PyLith/pylith_installer/trunk/README 2012-09-04 18:02:58 UTC (rev 20679)
@@ -1,4 +1,4 @@
-We are pleased to announce release of PyLith Installer version 1.7.1-0.
+We are pleased to announce release of PyLith Installer version 1.7.2-0.
Please submit bug reports via the World Wide Web at:
http://geodynamics.org/roundup
Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac 2012-09-04 17:47:54 UTC (rev 20678)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac 2012-09-04 18:02:58 UTC (rev 20679)
@@ -17,7 +17,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([PyLith Installer], [1.7.1-0], [cig-short at geodynamics.org])
+AC_INIT([PyLith Installer], [1.7.2-0], [cig-short at geodynamics.org])
AC_CONFIG_AUX_DIR([./aux-config])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
More information about the CIG-COMMITS
mailing list