Date: Tue, 2 Mar 2021 21:16:59 +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: r566984 - head/cad/scotch Message-ID: <202103022116.122LGxiv063008@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Tue Mar 2 21:16:59 2021 New Revision: 566984 URL: https://svnweb.freebsd.org/changeset/ports/566984 Log: Optionize and set USES=mpi. Modified: head/cad/scotch/Makefile head/cad/scotch/pkg-plist Modified: head/cad/scotch/Makefile ============================================================================== --- head/cad/scotch/Makefile Tue Mar 2 21:16:04 2021 (r566983) +++ head/cad/scotch/Makefile Tue Mar 2 21:16:59 2021 (r566984) @@ -14,13 +14,15 @@ LICENSE_NAME= CeCILL-C LICENSE_FILE= ${WRKSRC}/doc/CeCILL-C_V1-en.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS= gbase-0.* gmap-2015.* - USES= bison:alias gmake localbase +CONFLICTS= gbase-0.* gmap-2015.* + MAKE_JOBS_UNSAFE=yes -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES MPICH +OPTIONS_DEFAULT=MPICH +OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} BUILD_WRKSRC= ${WRKSRC}/src @@ -36,19 +38,11 @@ DOCVER= ${PORTVERSION:R:R} PORTDOCS= ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf scotch_example.f LIBS= esmumps scotch scotcherr scotcherrexit scotchmetis -.if !defined(WITHOUT_MPI) -LIB_DEPENDS+= libmpi.so:net/mpich +MPICH_USES= mpi:mpich +MPICH_ALL_TARGET= ptesmumps +MPICH_TEST_TARGET= ptcheck +MPICH_LIBS+= ptesmumps ptscotch ptscotcherr ptscotcherrexit ptscotchparmetis -ALL_TARGET+= ptesmumps -TEST_TARGET+= ptcheck - -LIBS+= ptesmumps ptscotch ptscotcherr ptscotcherrexit ptscotchparmetis - -PLIST_SUB+= MPI="" -.else -PLIST_SUB+= MPI="@comment " -.endif - .include <bsd.port.options.mk> .if ${ARCH} == "i386" @@ -58,7 +52,7 @@ MF= x86-64 .endif pre-everything:: -.if !defined(WITHOUT_MPI) +.if !defined(WITHOUT_MPICH) @${ECHO_MSG} @${ECHO_MSG} "Define WITHOUT_MPI if PT-Scotch is not wanted." @${ECHO_MSG} Modified: head/cad/scotch/pkg-plist ============================================================================== --- head/cad/scotch/pkg-plist Tue Mar 2 21:16:04 2021 (r566983) +++ head/cad/scotch/pkg-plist Tue Mar 2 21:16:59 2021 (r566984) @@ -6,12 +6,12 @@ bin/amk_hy bin/amk_m2 bin/amk_p2 bin/atst -%%MPI%%bin/dggath -%%MPI%%bin/dgmap -%%MPI%%bin/dgord -%%MPI%%bin/dgpart -%%MPI%%bin/dgscat -%%MPI%%bin/dgtst +%%MPICH%%bin/dggath +%%MPICH%%bin/dgmap +%%MPICH%%bin/dgord +%%MPICH%%bin/dgpart +%%MPICH%%bin/dgscat +%%MPICH%%bin/dgtst bin/gbase bin/gcv bin/gmap @@ -32,22 +32,22 @@ bin/mmk_m2 bin/mmk_m3 bin/mord bin/mtst -include/ptscotch.h -include/ptscotchf.h +%%MPICH%%include/ptscotch.h +%%MPICH%%include/ptscotchf.h include/scotch.h include/scotchf.h lib/libesmumps.so lib/libesmumps.so.0 -%%MPI%%lib/libptesmumps.so -%%MPI%%lib/libptesmumps.so.0 -%%MPI%%lib/libptscotch.so -%%MPI%%lib/libptscotch.so.0 -%%MPI%%lib/libptscotcherr.so -%%MPI%%lib/libptscotcherr.so.0 -%%MPI%%lib/libptscotcherrexit.so -%%MPI%%lib/libptscotcherrexit.so.0 -%%MPI%%lib/libptscotchparmetis.so -%%MPI%%lib/libptscotchparmetis.so.0 +%%MPICH%%lib/libptesmumps.so +%%MPICH%%lib/libptesmumps.so.0 +%%MPICH%%lib/libptscotch.so +%%MPICH%%lib/libptscotch.so.0 +%%MPICH%%lib/libptscotcherr.so +%%MPICH%%lib/libptscotcherr.so.0 +%%MPICH%%lib/libptscotcherrexit.so +%%MPICH%%lib/libptscotcherrexit.so.0 +%%MPICH%%lib/libptscotchparmetis.so +%%MPICH%%lib/libptscotchparmetis.so.0 lib/libscotch.so lib/libscotch.so.0 lib/libscotcherr.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103022116.122LGxiv063008>