diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2020-05-02 04:18:42 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2020-05-02 04:18:42 +0000 |
| commit | a6394a47adab2a7906900520c2ccb0fbd83f0de6 (patch) | |
| tree | 14e91a6d162fcb81cff1c354c12c25ec0f8e4270 /science/lammps | |
| parent | 6ba3e4bbbe5e8287457886b1551eaf5a82ebe752 (diff) | |
| download | ports-a6394a47adab2a7906900520c2ccb0fbd83f0de6.tar.gz ports-a6394a47adab2a7906900520c2ccb0fbd83f0de6.zip | |
science/lammps: Fix plist when MPI=off; Add to CONFLICTS_BUILD
Notes
Notes:
svn path=/head/; revision=533652
Diffstat (limited to 'science/lammps')
| -rw-r--r-- | science/lammps/Makefile | 3 | ||||
| -rw-r--r-- | science/lammps/pkg-plist | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/science/lammps/Makefile b/science/lammps/Makefile index c44da4d7fdce..1578f94dc669 100644 --- a/science/lammps/Makefile +++ b/science/lammps/Makefile @@ -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 diff --git a/science/lammps/pkg-plist b/science/lammps/pkg-plist index 05901ea57545..7e96cea72cad 100644 --- a/science/lammps/pkg-plist +++ b/science/lammps/pkg-plist @@ -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 |