Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Jun 2021 17:59:16 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9d873e8ca054 - main - math/openturns: Disable the math/hmat-oss dependency; Add missing python dependencies
Message-ID:  <202106231759.15NHxGj0080140@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9d873e8ca054483b3dea95edc0ca4f7d200cc6dd

commit 9d873e8ca054483b3dea95edc0ca4f7d200cc6dd
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-06-23 17:57:37 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-06-23 17:59:12 +0000

    math/openturns: Disable the math/hmat-oss dependency; Add missing python dependencies
    
    openturns isn't compatible with the latest hmat-oss versions.
    
    Reported by:    fallout (math/hmat-oss part)
---
 math/openturns/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/math/openturns/Makefile b/math/openturns/Makefile
index 2c33fe0cdc7b..95dbfd3f49aa 100644
--- a/math/openturns/Makefile
+++ b/math/openturns/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openturns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -27,7 +27,6 @@ LIB_DEPENDS=	libbonmin.so:math/bonmin \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libhdf5_cpp.so:science/hdf5 \
-		libhmat.so:math/hmat-oss \
 		libipopt.so:math/ipopt \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
@@ -48,6 +47,7 @@ CMAKE_ARGS=	-DBLAS_LIBRARIES=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES=
 		-DOPENTURNS_EXAMPLE_PATH:STRING=share/examples/openturns \
 		-DOPENTURNS_DOC_PATH:STRING=share/doc/openturns
 CMAKE_OFF=	USE_DOXYGEN USE_SPHINX
+CMAKE_OFF+=	USE_HMAT # broken with hmat-oss-1.7.1: https://github.com/openturns/openturns/issues/1868
 
 OPTIONS_DEFINE=		PYTHON EXAMPLES
 OPTIONS_DEFAULT=	PYTHON
@@ -56,9 +56,15 @@ OPTIONS_SUB=		yes
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_CMAKE_ON=	-DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig
+PYTHON_PY_DEPENDS=	${PYNUMPY} \
+			${PYTHON_PKGNAMEPREFIX}chaospy>0:math/py-chaospy@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 PYTHON_BUILD_DEPENDS=	swig:devel/swig \
-			${PYTHON_RUN_DEPENDS}
-PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
+			${PYTHON_PY_DEPENDS}
+PYTHON_RUN_DEPENDS=	${PYTHON_PY_DEPENDS}
 
 PORTEXAMPLES=		*
 



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