Date: Sat, 2 May 2020 04:18:42 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533652 - head/science/lammps Message-ID: <202005020418.0424Igsb056754@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sat May 2 04:18:42 2020 New Revision: 533652 URL: https://svnweb.freebsd.org/changeset/ports/533652 Log: science/lammps: Fix plist when MPI=off; Add to CONFLICTS_BUILD Modified: head/science/lammps/Makefile head/science/lammps/pkg-plist Modified: head/science/lammps/Makefile ============================================================================== --- head/science/lammps/Makefile Sat May 2 01:48:23 2020 (r533651) +++ head/science/lammps/Makefile Sat May 2 04:18:42 2020 (r533652) @@ -11,7 +11,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= undefined reference to `__atomic_load' -CONFLICTS_BUILD= ga # conflicts with include/error.h, already fixed in the head +CONFLICTS_BUILD= ga mpich mpich2 # conflicts with include/error.h from ga, already fixed in the head USES= blaslapack:openblas cmake:noninja eigen:3 fortran localbase:ldflags shebangfix USE_GITHUB= yes @@ -29,6 +29,7 @@ OPTIONS_GROUP= PARALLEL OPTIONS_GROUP_PARALLEL= MPI ${OPTIONS_DEFINE_${CHOSEN_COMPILER_TYPE}} OPTIONS_DEFAULT= MPI JPEG PNG GZIP FFMPEG VORONOI LATTE ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}} OPTIONS_DEFAULT_clang= OPENMP +OPTIONS_SUB= yes PARALLEL_DESC= Enable parallelizations: MPI_CMAKE_BOOL= BUILD_MPI Modified: head/science/lammps/pkg-plist ============================================================================== --- head/science/lammps/pkg-plist Sat May 2 01:48:23 2020 (r533651) +++ head/science/lammps/pkg-plist Sat May 2 04:18:42 2020 (r533652) @@ -24,6 +24,7 @@ include/lammps/lmppython.h include/lammps/lmptype.h include/lammps/memory.h include/lammps/modify.h +%%NO_MPI%%include/lammps/mpi/mpi.h include/lammps/neigh_list.h include/lammps/neighbor.h include/lammps/output.h @@ -51,6 +52,7 @@ lib/cmake/LAMMPS/LAMMPSConfigVersion.cmake lib/cmake/LAMMPS/LAMMPS_Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/LAMMPS/LAMMPS_Targets.cmake lib/liblammps.a +%%NO_MPI%%lib/liblammps_mpi_stubs.a libdata/pkgconfig/liblammps.pc man/man1/lmp.1.gz %%DATADIR%%/potentials/Ag_u3.eam
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005020418.0424Igsb056754>