Fri Dec 24 22:28:28 2021 UTC ()
py-boost: revert previous

Re-enable py-numpy dependency, since it's used when it's installed.

However py-numpy for python 2.x seems broken and the numpy extension
is not built for that version, so mark the extension as "for python 3.x"
in the PLIST.

Tested with python27 and python39.

Bump PKGREVISION.


(wiz)
diff -r1.17 -r1.18 pkgsrc/devel/py-boost/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/py-boost/PLIST
cvs diff -r1.17 -r1.18 pkgsrc/devel/py-boost/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-boost/Makefile 2021/12/16 13:17:37 1.17
+++ pkgsrc/devel/py-boost/Makefile 2021/12/24 22:28:28 1.18
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.17 2021/12/16 13:17:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.18 2021/12/24 22:28:28 wiz Exp $
2 2
3BOOST_PACKAGE= python 3BOOST_PACKAGE= python
4BOOST_COMMENT= (Boost.Python binary library) 4BOOST_COMMENT= (Boost.Python binary library)
5BOOST_CONFIG= installed 5BOOST_CONFIG= installed
6 6
7INSTALLATION_DIRS+= lib 7INSTALLATION_DIRS+= lib
8 8
9.include "../../meta-pkgs/boost/Makefile.common" 9.include "../../meta-pkgs/boost/Makefile.common"
10 10
11PKGNAME= ${PYPKGPREFIX}-boost-${BOOST_VERSION} 11PKGNAME= ${PYPKGPREFIX}-boost-${BOOST_VERSION}
12PKGREVISION= 1 12PKGREVISION= 2
13 13
14BJAM_ARGS+= --user-config=${WRKSRC}/user-config.jam 14BJAM_ARGS+= --user-config=${WRKSRC}/user-config.jam
15BJAM_ARGS+= --with-python 15BJAM_ARGS+= --with-python
16MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC} 16MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC}
17 17
18PYTHON_VERSIONS_INCOMPATIBLE= 36 # py-numpy 18PYTHON_VERSIONS_INCOMPATIBLE= 36 # py-numpy
19 19
20.include "../../devel/boost-jam/bjam.mk" 20.include "../../devel/boost-jam/bjam.mk"
21.include "../../lang/python/pyversion.mk" 21.include "../../lang/python/pyversion.mk"
22 22
23post-configure: 23post-configure:
24 ${ECHO} 'using python : ${PYVERSSUFFIX} :' \ 24 ${ECHO} 'using python : ${PYVERSSUFFIX} :' \
25 '${PREFIX}/bin/python${PYVERSSUFFIX} : ${PREFIX}/include/python${PYVERSSUFFIX} ;' \ 25 '${PREFIX}/bin/python${PYVERSSUFFIX} : ${PREFIX}/include/python${PYVERSSUFFIX} ;' \
26 >${WRKSRC}/user-config.jam 26 >${WRKSRC}/user-config.jam
27 27
28do-build: bjam-build 28do-build: bjam-build
29 29
30do-install: boost-install-libs 30do-install: boost-install-libs
31 31
32PLIST_SUBST+= PYVER=${_PYTHON_VERSION} 32PLIST_SUBST+= PYVER=${_PYTHON_VERSION}
33 33
34BUILDLINK_TRANSFORM.SunOS+= rm:-lutil 34BUILDLINK_TRANSFORM.SunOS+= rm:-lutil
35 35
36#.include "../../math/py-numpy/buildlink3.mk" 36.include "../../math/py-numpy/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/devel/py-boost/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/py-boost/PLIST 2021/12/16 13:17:37 1.11
+++ pkgsrc/devel/py-boost/PLIST 2021/12/24 22:28:28 1.12
@@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
1@comment $NetBSD: PLIST,v 1.11 2021/12/16 13:17:37 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.12 2021/12/24 22:28:28 wiz Exp $
 2${PLIST.py3x}lib/libboost_numpy${PYVER}.a
 3${PLIST.py3x}lib/libboost_numpy${PYVER}.so
 4${PLIST.py3x}lib/libboost_numpy${PYVER}.so.${PKGVERSION}
2lib/libboost_python${PYVER}.a 5lib/libboost_python${PYVER}.a
3lib/libboost_python${PYVER}.so 6lib/libboost_python${PYVER}.so
4lib/libboost_python${PYVER}.so.${PKGVERSION} 7lib/libboost_python${PYVER}.so.${PKGVERSION}