From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 21:10:50 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 64A085DEB7B; Mon, 12 Apr 2021 21:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FK1cB2PMZz4tfh; Mon, 12 Apr 2021 21:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 452DB1E86A; Mon, 12 Apr 2021 21:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13CLAoaU040410; Mon, 12 Apr 2021 21:10:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13CLAoS5040409; Mon, 12 Apr 2021 21:10:50 GMT (envelope-from git) Date: Mon, 12 Apr 2021 21:10:50 GMT Message-Id: <202104122110.13CLAoS5040409@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 0c8a1a6d2bfc - main - math/Imath: fix build with PYTHON option MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c8a1a6d2bfc516b19dbd5c2f2c8a774cb118ba7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 21:10:50 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c8a1a6d2bfc516b19dbd5c2f2c8a774cb118ba7 commit 0c8a1a6d2bfc516b19dbd5c2f2c8a774cb118ba7 Author: Matthias Andree AuthorDate: 2021-04-12 21:09:20 +0000 Commit: Matthias Andree 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