Date: Sun, 14 Jun 2020 09:14:40 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538718 - head/french/aster Message-ID: <202006140914.05E9EeJV001607@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sun Jun 14 09:14:40 2020 New Revision: 538718 URL: https://svnweb.freebsd.org/changeset/ports/538718 Log: Switch from mpich2 to mpich and chase ScaLAPACK´s upgrade. Modified: head/french/aster/Makefile Modified: head/french/aster/Makefile ============================================================================== --- head/french/aster/Makefile Sun Jun 14 09:14:21 2020 (r538717) +++ head/french/aster/Makefile Sun Jun 14 09:14:40 2020 (r538718) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006140914.05E9EeJV001607>