diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2020-06-14 09:14:40 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2020-06-14 09:14:40 +0000 |
| commit | b675b9e8163a8172aaa0a777c2db57f00f39b762 (patch) | |
| tree | 0c6e2d79ad426328417a6a92b2933328d1ae3c48 /french | |
| parent | f37ee436a9d3d0c095e433ec40dfffbd8b9d9430 (diff) | |
| download | ports-b675b9e8163a8172aaa0a777c2db57f00f39b762.tar.gz ports-b675b9e8163a8172aaa0a777c2db57f00f39b762.zip | |
Switch from mpich2 to mpich and chase ScaLAPACK´s upgrade.
Notes
Notes:
svn path=/head/; revision=538718
Diffstat (limited to 'french')
| -rw-r--r-- | french/aster/Makefile | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/french/aster/Makefile b/french/aster/Makefile index 4b6cfb7271d0..0146b14f6da0 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -3,7 +3,7 @@ PORTNAME= aster DISTVERSION= ${ASTER_DISTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= french cad MAINTAINER= thierry@FreeBSD.org @@ -55,6 +55,8 @@ USES= bison fortran gettext python:3.6+ qt:5 tk USE_BINUTILS= yes USE_QT= linguisttools_build +CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.* + .if defined(WITH_ATLAS) USES+= blaslapack:atlas .else @@ -127,14 +129,13 @@ MPISEQ= -lmpiseq MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord ${MPISEQ} LIB_DEPENDS+= libmpiseq.so.5:math/mumps .else -BUILD_DEPENDS+= ${LOCALBASE}/lib/libblacs.a:math/blacs \ - ${LOCALBASE}/lib/libscalapack.a:math/scalapack -MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich -lmpl +BUILD_DEPENDS+= ${LOCALBASE}/lib/libscalapack.a:math/scalapack +MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lscalapack -lexecinfo -L${LOCALBASE}/lib -lmpi LIB_DEPENDS+= libcmumps.so.5:math/mumps .endif .if defined(WITH_MPI) -LIB_DEPENDS+= libmpich.so:net/mpich2 +LIB_DEPENDS+= libmpi.so:net/mpich HOME_MPI= ${LOCALBASE} .endif @@ -207,11 +208,6 @@ BASH2RC= products_data.py ExportPATH?= /tmp/maillages -pre-everything:: -.if defined(WITH_MPI) - @${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run \`mpd &'" -.endif - pre-configure: ${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|' \ ${WRKSRC}/setup.cfg @@ -422,8 +418,7 @@ post-install: .for f in aster_pkginfo.cpython-${PYTHON_SUFFIX}.pyc aster_pkginfo.cpython-${PYTHON_SUFFIX}.opt-1.pyc ${RM} ${STAGEDIR}${inst_dir}/${VE}/lib/aster/__pycache__/${f} .endfor - ${FIND} ${STAGEDIR}${inst_dir}/${VE}/share/aster/tests -name "*.datg" | \ - ${XARGS} ${REINPLACE_CMD} -e 's|/home/PHIMECA/maillages/|${ExportPATH}|' + ${FIND} ${STAGEDIR}${PREFIX} -name "*.bak" -delete .if defined(MAINTAINER_MODE) regression-test: install |