Date: Mon, 12 Apr 2021 21:10:50 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0c8a1a6d2bfc - main - math/Imath: fix build with PYTHON option Message-ID: <202104122110.13CLAoS5040409@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c8a1a6d2bfc516b19dbd5c2f2c8a774cb118ba7 commit 0c8a1a6d2bfc516b19dbd5c2f2c8a774cb118ba7 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2021-04-12 21:09:20 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2021-04-12 21:10:46 +0000 math/Imath: fix build with PYTHON option - substitute Python version into pkg-plist - depend on NumPy Reported by: olgeni@ --- math/Imath/Makefile | 5 ++++- math/Imath/pkg-plist | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/math/Imath/Makefile b/math/Imath/Makefile index 78b3b78adb52..7667dcba655d 100644 --- a/math/Imath/Makefile +++ b/math/Imath/Makefile @@ -21,7 +21,8 @@ CMAKE_ARGS+= -DCMAKE_DEBUG_POSTFIX= \ PLIST_SUB= MAJORVER=${_MAJORVER} \ MINVER=${_MINVER} \ PLVER=${_PLVER} \ - VER=${_VER} + VER=${_VER} \ + PYVER=${PYTHON_VER:S/./_/} PORTDOCS= README.md OPTIONS_DEFINE= DOCS LARGE_STACK PYTHON @@ -33,6 +34,8 @@ LARGE_STACK_CMAKE_BOOL= IMATH_ENABLE_LARGE_STACK PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_USES= python PYTHON_CMAKE_BOOL= PYTHON +PYTHON_BUILD_DEPENDS= ${PYNUMPY} +PYTHON_RUN_DEPENDS= ${PYNUMPY} _MAJORVER= 3_0 _VER= 27 diff --git a/math/Imath/pkg-plist b/math/Imath/pkg-plist index d91437901ce9..c123a91ee9d8 100644 --- a/math/Imath/pkg-plist +++ b/math/Imath/pkg-plist @@ -82,9 +82,9 @@ libdata/pkgconfig/Imath.pc %%PYTHON%%include/Imath/PyImathVec4Impl.h %%PYTHON%%include/Imath/PyImathVecOperators.h %%PYTHON%%lib/cmake/Imath/ImathConfig-%%CMAKE_BUILD_TYPE%%.cmake -%%PYTHON%%lib/libPyImath_Python3_7-%%MAJORVER%%.so -%%PYTHON%%lib/libPyImath_Python3_7-%%MAJORVER%%.so.27 -%%PYTHON%%lib/libPyImath_Python3_7-%%MAJORVER%%.so.27.0.0 +%%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so +%%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so.27 +%%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so.27.0.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/imath.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/imathnumpy.so %%PYTHON%%libdata/pkgconfig/PyImath.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104122110.13CLAoS5040409>