On 2021/10/27 10:43, Jeremie Courreges-Anglas wrote:
> Since nothing uses it, I propose removing the library. If someone needs
> numpy support in boost and riscv64 still doesn't have lang/gcc, we can
> reintroduce numpy support in a subpackage. IMO that complexity isn't worth
> it as long as there is no consumer.
>
> ok?
+1 from me
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/boost/Makefile,v
> retrieving revision 1.120
> diff -u -p -r1.120 Makefile
> --- Makefile 24 Oct 2021 12:38:41 -0000 1.120
> +++ Makefile 27 Oct 2021 09:36:19 -0000
> @@ -10,7 +10,7 @@ EPOCH = 0
> DISTNAME= boost_${VERSION:S/./_/g}
> PKGNAME-main= boost-${VERSION}
> PKGNAME-md= boost-md-${VERSION}
> -REVISION-main= 1
> +REVISION-main= 2
> REVISION-md= 0
> CATEGORIES= devel
> MASTER_SITES=
> https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
> @@ -37,7 +37,6 @@ BOOST_LIBS= boost_atomic-mt \
> boost_math_tr1f-mt boost_math_tr1f \
> boost_math_tr1l-mt boost_math_tr1l \
> boost_nowide-mt boost_nowide \
> - boost_numpy38-mt boost_numpy38 \
> boost_prg_exec_monitor-mt boost_prg_exec_monitor \
> boost_program_options-mt boost_program_options \
> boost_python38-mt boost_python38 \
> @@ -81,8 +80,6 @@ MULTI_PACKAGES= -main -md
> MODULES= lang/python
> MODPY_RUNDEP= No
>
> -BUILD_DEPENDS= math/py-numpy${MODPY_FLAVOR}
> -
> LIB_DEPENDS= archivers/bzip2 \
> textproc/icu4c
>
> @@ -143,13 +140,16 @@ do-configure:
> @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} /bin/sh ./bootstrap.sh
> ${BOOTSTRAP}
>
> do-build:
> - @cd ${WRKSRC} && export ${MAKE_ENV} && ./b2 ${BJAM_CONFIG}
> + # Create a fake numpy.py module to hide the possibly installed package
> + mkdir -p ${WRKDIR}/dummy; touch ${WRKDIR}/dummy/numpy.py
> + @cd ${WRKSRC} && export ${MAKE_ENV} PYTHONPATH="${WRKDIR}/dummy:" &&
> ./b2 ${BJAM_CONFIG}
>
> do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/include/boost
> ${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
> cd ${WRKSRC}/boost && \
> pax -rw -s ':^.*\.orig$$::' . ${PREFIX}/include/boost
> + rm -Rf ${PREFIX}/include/boost/python/numpy*
> find ${PREFIX}/include/boost -type d -exec chmod ${DIRMODE} {} +
> find ${PREFIX}/include/boost -type f -exec chmod ${SHAREMODE} {} +
>
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/devel/boost/pkg/PLIST-main,v
> retrieving revision 1.19
> diff -u -p -r1.19 PLIST-main
> --- pkg/PLIST-main 24 Oct 2021 12:38:41 -0000 1.19
> +++ pkg/PLIST-main 27 Oct 2021 09:36:21 -0000
> @@ -1,7 +1,7 @@
> @comment $OpenBSD: PLIST-main,v 1.19 2021/10/24 12:38:41 sthen Exp $
> -@pkgpath devel/boost
> @conflict boost-md-<1.76.0p0v0
> @conflict leatherman-<1.12.4p0
> +@pkgpath devel/boost
> include/boost/
> include/boost/accumulators/
> include/boost/accumulators/accumulators.hpp
> @@ -12176,17 +12176,6 @@ include/boost/python/make_function.hpp
> include/boost/python/manage_new_object.hpp
> include/boost/python/module.hpp
> include/boost/python/module_init.hpp
> -include/boost/python/numpy/
> -include/boost/python/numpy.hpp
> -include/boost/python/numpy/config.hpp
> -include/boost/python/numpy/dtype.hpp
> -include/boost/python/numpy/internal.hpp
> -include/boost/python/numpy/invoke_matching.hpp
> -include/boost/python/numpy/matrix.hpp
> -include/boost/python/numpy/ndarray.hpp
> -include/boost/python/numpy/numpy_object_mgr_traits.hpp
> -include/boost/python/numpy/scalars.hpp
> -include/boost/python/numpy/ufunc.hpp
> include/boost/python/object/
> include/boost/python/object.hpp
> include/boost/python/object/add_to_namespace.hpp
> @@ -16084,10 +16073,6 @@ include/boost/yap/yap.hpp
> @lib lib/libboost_nowide-mt.so.${LIBboost_nowide-mt_VERSION}
> @static-lib lib/libboost_nowide.a
> @lib lib/libboost_nowide.so.${LIBboost_nowide_VERSION}
> -@static-lib lib/libboost_numpy38-mt.a
> -@lib lib/libboost_numpy38-mt.so.${LIBboost_numpy38-mt_VERSION}
> -@static-lib lib/libboost_numpy38.a
> -@lib lib/libboost_numpy38.so.${LIBboost_numpy38_VERSION}
> @static-lib lib/libboost_prg_exec_monitor-mt.a
> @lib
> lib/libboost_prg_exec_monitor-mt.so.${LIBboost_prg_exec_monitor-mt_VERSION}
> @static-lib lib/libboost_prg_exec_monitor.a
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
