diff options
author | knarf <knarf@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2010-06-04 20:53:59 +0000 |
---|---|---|
committer | knarf <knarf@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2010-06-04 20:53:59 +0000 |
commit | c0268c532b744bf5dabb8da9a6299b499e8f80f1 (patch) | |
tree | 035e6394c3f9e91280c8d81aa2bdece27db590cc /LORENE.sh | |
parent | b8a8dd19a3019f6fe0536f5d7436fd2dbfb9c4ac (diff) |
- use parallel build if specified
- update from CVS Lorene (removed one old local patch)
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@11 5c1b1641-b641-47ec-b3d9-0f93d4c445ee
Diffstat (limited to 'LORENE.sh')
-rw-r--r-- | LORENE.sh | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -16,7 +16,6 @@ LORENE_DIR=${INSTALL_DIR}/build-${NAME}/${NAME} # Clean up environment unset LIBS -unset MAKEFLAGS @@ -49,8 +48,8 @@ unset MAKEFLAGS pushd build-${NAME} ${TAR} xzf ${SRCDIR}/dist/${NAME}.tar.gz ${PATCH} -p0 < ${SRCDIR}/dist/des.patch + ${PATCH} -p0 < ${SRCDIR}/dist/makesystem.patch ${PATCH} -p0 < ${SRCDIR}/dist/pgplot.patch - ${PATCH} -p0 < ${SRCDIR}/dist/spheroid.patch # Prevent overly long lines for file in $(find ${NAME} -name '*.f'); do # Remove CVS Header comments @@ -62,12 +61,6 @@ unset MAKEFLAGS # Break long lines perl -pi -e 's{^([ 0-9].{71})(.+)}{$1\n \$$2}' $file done - # Do not build the debug version of the Lorene libraries - for file in $(find ${NAME} -name Makefile); do - perl -pi -e 's{\t\$\(MAKE\) -f Makefile_lib_g}{#\t\$(MAKE) -f Makefile_lib_g}' $file - perl -pi -e 's{\tmv \*.o Objects_g}{#\tmv *.o Objects_g}' $file - perl -pi -e 's{install: \$\(LIB\) \$\(LIB\)/liblorenef77_g.a \$\(LIB\)/liblorenef77.a}{install: \$(LIB) \$(LIB)/liblorenef77.a}' $file - done popd echo "LORENE: Configuring..." @@ -91,6 +84,7 @@ LIB_CXX = ${LIBS} LIB_LAPACK = ${LAPACK_LIBS} ${BLAS_LIBS} LIB_PGPLOT = LIB_GSL = ${GSL_LIBS} +DONTBUILDDEBUGLIB = yes EOF echo "LORENE: Building..." |