Build fix.

Spotted by: pointyhat
This commit is contained in:
Maho Nakata 2007-03-06 12:18:15 +00:00
parent 328d0d3274
commit 5725d0ca32
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=186665
3 changed files with 24 additions and 10 deletions

View File

@ -18,7 +18,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libmatc.a:${PORTSDIR}/science/elmer-matc \
${LOCALBASE}/lib/libeiof.a:${PORTSDIR}/science/elmer-eio \
${LOCALBASE}/lib/libhuti.a:${PORTSDIR}/science/elmer-hutiter \
${LOCALBASE}/lib/libumfpack_elmer.a:${PORTSDIR}/math/elmer-umfpack
RUN_DEPENDS= ElmerGrid:${PORTSDIR}/science/elmergrid \
Mesh2D:${PORTSDIR}/science/elmer-meshgen2d
@ -62,12 +61,17 @@ CFLAGS+= -fPIC
FCFLAGS+= -fPIC
FFLAGS+= -fPIC ${FCFLAGS}
.endif
CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FCFLAGS="${FCFLAGS}"
CONFIGURE_ARGS+= --with-umfpack="-L${LOCALBASE}/lib -lumfpack_elmer" \
--with-blas="-L${LOCALBASE}/lib ${BLAS}" \
--with-lapack="-L${LOCALBASE}/lib ${LAPACK}" \
--with-eiof="-L${LOCALBASE}/lib -leiof"
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FCFLAGS="${FCFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}"
CONFIGURE_ARGS+= --with-umfpack="-lumfpack_elmer" \
--with-blas="${BLAS}" \
--with-lapack="${LAPACK}" \
--with-eiof="-leiof" \
--with-matc="-lmatc -lm"
pre-configure:
${REINPLACE_CMD} -e 's|make|${GMAKE}|g' ${WRKSRC}/tests/runtests.in

View File

@ -1,11 +1,11 @@
--- configure.in.orig Wed Feb 15 18:56:07 2006
+++ configure.in Wed Feb 15 18:56:45 2006
@@ -68,7 +68,7 @@
FCFLAGS="$FCFLAGS -I."
FFLAGS="$FCFLAGS -I."
@@ -69,7 +69,7 @@
FCFLAGS="$FCFLAGS -I. ${INCLUDE_MODULE_FLAG}binio"
FFLAGS="$FFLAGS -I."
ELMER_HOME="$prefix"
-FCPPFLAGS="-P $TRADITIONAL_CPP_FLAGS -I. -I$prefix/include -DFULL_INDUCTION -DUSE_ARPACK"
+FCPPFLAGS="-P -traditional -I. -I$prefix/include -DFULL_INDUCTION -DUSE_ARPACK"
+FCPPFLAGS="-P -traditional -I. $CPPFLAGS -I$prefix/include -DFULL_INDUCTION -DUSE_ARPACK"
TESTS_FCFLAGS=""
ELMER_LIBERRORMSG="wasn't found, make sure it is in the prefix, or CFLAGS and LIBS are correct if they are somewhere else."

View File

@ -4,6 +4,7 @@ bin/GebhardtFactors
bin/ViewFactors
bin/elmerf90
lib/libelmersolver.so
include/binio.mod
%%DATADIR%%/include/adaptive.mod
%%DATADIR%%/include/bandmatrix.mod
%%DATADIR%%/include/bandwidthoptimize.mod
@ -56,6 +57,10 @@ lib/libelmersolver.so
%%DATADIR%%/include/timeintegrate.mod
%%DATADIR%%/include/types.mod
%%DATADIR%%/include/viewfactorglobals.mod
%%DATADIR%%/include/dxfile.mod
%%DATADIR%%/include/exchangecorrelations.mod
%%DATADIR%%/include/harmonicsolve.mod
%%DATADIR%%/include/vtklegacyfile.mod
%%DATADIR%%/lib/AdvectionDiffusion.so
%%DATADIR%%/lib/ArteryOutlet.so
%%DATADIR%%/lib/ArtificialCompressibility.so
@ -95,6 +100,11 @@ lib/libelmersolver.so
%%DATADIR%%/lib/TransportEquation.so
%%DATADIR%%/lib/elements.def
%%DATADIR%%/lib/libelmersolver.so
%%DATADIR%%/lib/DFTSolver.so
%%DATADIR%%/lib/FlowSolve.so
%%DATADIR%%/lib/HeatSolve.so
%%DATADIR%%/lib/MeshSolve.so
%%DATADIR%%/lib/ShellSolve.so
@dirrm %%DATADIR%%/lib
@dirrm %%DATADIR%%/include
@dirrm %%DATADIR%%