Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Oct 2018 21:17:45 +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: r481401 - head/math/deal.ii
Message-ID:  <201810062117.w96LHj1n092910@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Sat Oct  6 21:17:44 2018
New Revision: 481401
URL: https://svnweb.freebsd.org/changeset/ports/481401

Log:
  math/deal.ii: Fix build by disabling the MPI option; Add several other options for various libraries
  
  Also add boost dependency
  
  Reported by:	fallout (breakage)

Modified:
  head/math/deal.ii/Makefile

Modified: head/math/deal.ii/Makefile
==============================================================================
--- head/math/deal.ii/Makefile	Sat Oct  6 21:13:47 2018	(r481400)
+++ head/math/deal.ii/Makefile	Sat Oct  6 21:17:44 2018	(r481401)
@@ -3,8 +3,8 @@
 PORTNAME=	deal.II
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.0.0
-PORTREVISION=	1
-CATEGORIES=	math devel
+PORTREVISION=	2
+CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Finite element Differential Equations Analysis Library (DEAL)
@@ -12,10 +12,9 @@ COMMENT=	Finite element Differential Equations Analysi
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgsl.so:math/gsl \
-		libhdf5.so:science/hdf5 \
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/config.hpp:devel/boost-libs
+LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libmetis.so:math/metis \
-		libsundials_arkode.so:math/sundials \
 		libtbb.so:devel/tbb
 
 USES=		cmake:outsource compiler:c++17-lang localbase:ldflags
@@ -25,31 +24,48 @@ GH_PROJECT=	${PORTNAME:tl:S/.//}
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	DEAL_II_ALLOW_BUNDLED DEAL_II_COMPONENT_EXAMPLES \
-		DEAL_II_WITH_P4EST DEAL_II_WITH_TRILINOS DEAL_II_WITH_UMFPACK DEAL_II_WITH_SLEPC \
-		DEAL_II_WITH_NANOFLANN DEAL_II_WITH_MUPARSER DEAL_II_WITH_ASSIMP DEAL_II_WITH_ARPACK \
-		DEAL_II_WITH_ADOLC DEAL_II_WITH_SUNDIALS DEAL_II_WITH_HDF5
+		DEAL_II_WITH_P4EST DEAL_II_WITH_TRILINOS DEAL_II_WITH_UMFPACK \
+		DEAL_II_WITH_NANOFLANN DEAL_II_WITH_MUPARSER DEAL_II_WITH_ASSIMP \
+		DEAL_II_WITH_HDF5
 
-OPTIONS_DEFINE=		LAPACK MPI NETCDF OPENCASCADE PETSC SCALAPACK
-OPTIONS_DEFAULT=	MPI
+OPTIONS_DEFINE=		ADOLC ARPACK GSL LAPACK MPI NETCDF OPENCASCADE PETSC SCALAPACK SLEPC SUNDIALS
+OPTIONS_DEFAULT=	GSL LAPACK SUNDIALS
 
-LAPACK_DESC=		Build with LAPACK for matrix operations
+ADOLC_DESC=		Compile with ADOL-C
+ADOLC_CMAKE_BOOL=	DEAL_II_WITH_ADOLC
+ADOLC_LIB_DEPENDS=	libadolc.so:math/adol-c
+ADOLC_BROKEN=		requires the development version: see https://github.com/dealii/dealii/issues/7293
+
+ARPACK_DESC=		Compile with Arpack and PArpack (only with MPI, LAPACK)
+ARPACK_CMAKE_BOOL=	DEAL_II_WITH_ARPACK
+ARPACK_CMAKE_ON=	-DARPACK_LINKER_FLAGS:STRING="${LDFLAGS}"
+ARPACK_BUILD_DEPENDS=	arpack-ng>0:math/arpack-ng
+ARPACK_RUN_DEPENDS=	arpack-ng>0:math/arpack-ng # itself doesn't link to arpack, but makes depending project link to it
+ARPACK_IMPLIES=		LAPACK
+
+GSL_DESC=		Compile with gsl
+GSL_CMAKE_BOOL=		DEAL_II_WITH_GSL
+GSL_LIB_DEPENDS=	libgsl.so:math/gsl
+
+LAPACK_DESC=		Compile with LAPACK for matrix operations
 LAPACK_USES=		fortran
 LAPACK_CMAKE_BOOL=	DEAL_II_WITH_LAPACK
-LAPACK_LIB_DEPENDS=	libblas.so:math/blas \
-			liblapack.so:math/lapack
-LAPACK_BROKEN=		can't find lapack library
+LAPACK_CMAKE_ON=	-DLAPACK_LINKER_FLAGS:STRING="${LDFLAGS}"
+LAPACK_LIB_DEPENDS=	libopenblas.so:math/openblas
 
 MPI_USES=		fortran
 MPI_CMAKE_BOOL=		DEAL_II_WITH_MPI
+MPI_CMAKE_ON=		-DMPI_LINKER_FLAGS:STRING="${LDFLAGS}"
 MPI_LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 			libmpi.so:net/openmpi
+MPI_BROKEN=		Could not find any suitable mpi library! (need to investigate)
 
 NETCDF_DESC=		Compile with Netcdf (only with MPI)
 NETCDF_CMAKE_BOOL=	DEAL_II_WITH_NETCDF
 NETCDF_CMAKE_ON=	-DNETCDF_INCLUDE_DIR:STRING=${LOCALBASE}/include -DNETCDF_CPLUSPLUS_LIBRARY:STRING=${LOCALBASE}/lib/libnetcdf_c++4.so
 NETCDF_BROKEN=		see https://github.com/dealii/dealii/issues/7263
 
-OPENCASCADE_DESC=	Build with OpenCascade
+OPENCASCADE_DESC=	Compile with OpenCascade
 OPENCASCADE_CMAKE_BOOL=	DEAL_II_WITH_OPENCASCADE
 OPENCASCADE_CMAKE_ON=	-DOPENCASCADE_INCLUDE_DIR:STRING=${LOCALBASE}/include/OpenCASCADE
 OPENCASCADE_LIB_DEPENDS=	libTKernel.so:cad/opencascade
@@ -62,5 +78,14 @@ PETSC_BROKEN=		see https://github.com/dealii/dealii/is
 SCALAPACK_DESC=		Compile with ScaLAPACK (only with MPI)
 SCALAPACK_CMAKE_BOOL=	DEAL_II_WITH_SCALAPACK
 SCALAPACK_IMPLIES=	MPI LAPACK
+
+SLEPC_DESC=		Compile with SLEPC (only with PETSC)
+SLEPC_CMAKE_BOOL=	DEAL_II_WITH_SLEPC
+SLEPC_LIB_DEPENDS=	libslepc.so:math/slepc
+SLEPC_IMPLIES=		PETSC
+
+SUNDIALS_DESC=		Compile with SUNDIALS
+SUNDIALS_CMAKE_BOOL=	DEAL_II_WITH_SUNDIALS
+SUNDIALS_LIB_DEPENDS=	libsundials_arkode.so:math/sundials
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810062117.w96LHj1n092910>