On 2020/11/13 17:41, Jeremie Courreges-Anglas wrote:
> On Fri, Nov 13 2020, Stuart Henderson <s...@spacehopper.org> wrote:
> > On 2020/11/08 01:46, Jeremie Courreges-Anglas wrote:
> >>
> >> This diff drops boost_python27 and boost_numpy27.
> >
> > Dropping boost_python27* needs work first;
>
> That is correct, I had a draft mail about it but ENOTIME.
> tl;dr my grep-fu failed me, sorry folks.
>
> This is what I came up with to disable just boost_numpy27. A bit
> hackish but seems to work fine.
BTW the only failure in an i386 build with the original diff was
py-tagpy (openimageio is broken on at least i386/powerpc, and
vegastrike is amd64-only as one of the deps is broken on i386).
Nothing on i386 had problems with removing the b2 files.
I've sent out a py-tagpy diff, openimageio is literally just
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} and bump REVISION (I'm
building blender with it to be sure, which will take a while, but
unlikely to have any problems). I think those two make sense
regardless.
Then we can either go for your new diff, or the original one and
mark vegastrike broken for now..
> ===================================================================
> RCS file: /cvs/ports/devel/boost/Makefile,v
> retrieving revision 1.102
> diff -u -p -r1.102 Makefile
> --- Makefile 11 Nov 2020 15:53:41 -0000 1.102
> +++ Makefile 13 Nov 2020 16:38:52 -0000
> @@ -6,6 +6,7 @@ COMMENT-main= free peer-reviewed portabl
> COMMENT-md= machine-dependent libraries for boost
>
> VERSION= 1.70.0
> +REVISION-main= 0
> DISTNAME= boost_${VERSION:S/./_/g}
> PKGNAME-main= boost-${VERSION}
> PKGNAME-md= boost-md-${VERSION}
> @@ -33,7 +34,6 @@ BOOST_LIBS= boost_atomic-mt \
> boost_math_tr1l-mt boost_math_tr1l \
> boost_prg_exec_monitor-mt boost_prg_exec_monitor \
> boost_program_options-mt boost_program_options \
> - boost_numpy27-mt boost_numpy27 \
> boost_numpy38-mt boost_numpy38 \
> boost_python27-mt boost_python27 \
> boost_python38-mt boost_python38 \
> @@ -82,8 +82,7 @@ MODULES= lang/python
> MODPY_RUNDEP= No
>
> # extras needed until py2 support can be removed
> -BUILD_DEPENDS+= math/py-numpy \
> - math/py-numpy,python3 \
> +BUILD_DEPENDS+= math/py-numpy,python3 \
> lang/python/${MODPY_DEFAULT_VERSION_3}
>
> LIB_DEPENDS= archivers/bzip2 \
> @@ -185,7 +184,10 @@ do-build:
> # Second run of bootstrap/b2, setup for py2 environment:
> sed 's;\(using python.*PYTHON_ROOT\).*;\1 : ${PY2_INC} \;;' \
> < ${WRKSRC}/bootstrap.sh > ${WRKSRC}/bootstrap.sh.tmp
> - cd ${WRKSRC} && export ${MAKE_ENV} && \
> + # dummy numpy module that will fail autodetection
> + mkdir -p ${WRKDIR}/dummy
> + touch ${WRKDIR}/dummy/numpy.py
> + cd ${WRKSRC} && export ${MAKE_ENV} PYTHONPATH="${WRKDIR}/dummy:" && \
> /bin/sh ./bootstrap.sh.tmp ${BOOTSTRAP} ${PY2_BOOTSTRAP} && \
> ./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_2}
>
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/devel/boost/pkg/PLIST-main,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST-main
> --- pkg/PLIST-main 5 Nov 2020 11:23:03 -0000 1.10
> +++ pkg/PLIST-main 13 Nov 2020 16:38:52 -0000
> @@ -15088,10 +15088,6 @@ include/boost/yap/yap.hpp
> @lib lib/libboost_math_tr1l-mt.so.${LIBboost_math_tr1l-mt_VERSION}
> @static-lib lib/libboost_math_tr1l.a
> @lib lib/libboost_math_tr1l.so.${LIBboost_math_tr1l_VERSION}
> -@static-lib lib/libboost_numpy27-mt.a
> -@lib lib/libboost_numpy27-mt.so.${LIBboost_numpy27-mt_VERSION}
> -@static-lib lib/libboost_numpy27.a
> -@lib lib/libboost_numpy27.so.${LIBboost_numpy27_VERSION}
> @static-lib lib/libboost_numpy38-mt.a
> @lib lib/libboost_numpy38-mt.so.${LIBboost_numpy38-mt_VERSION}
> @static-lib lib/libboost_numpy38.a
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
