Attachment 190695 Details for Bug 225589 – [patch] address numpy dependency with explicit option [v2]

[patch] [patch] address numpy dependency with explicit option [v2]

pr-boost-python-libs-numpy-fix.v2.diff (text/plain), 3.06 KB, created by John Hein on 2018-02-16 17:48:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2018-02-16 17:48:36 UTC

Size: 3.06 KB

patch

obsolete

>- fix plist for devel/boost-python{,3}-libs if math/py-numpy is installed
>  by added NUMPY option.  If off, disable building libboost_numpy [1].
>  If on, depend on the numpy port [2].
>
>- minor portlint appeasement
>
>bug 225589
>
>[1] There is probably a better way to force disabling the numpy
>build (arg to bjam?)
>
>[2] Not sure if this should also be a runtime dependency, but ldd does
>not indicate a dependency.
>
>Index: Makefile
>===================================================================
>--- Makefile	(revision 462004)
>+++ Makefile	(working copy)
>@@ -2,13 +2,15 @@
> # $FreeBSD$
> 
> PORTNAME=	boost-libs
>-COMMENT=	Framework for interfacing Python 2 and C++
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>+COMMENT=	Framework for interfacing Python 2 and C++
>+
> USES=		python
> USE_PYTHON=	flavors
> 
>-OPTIONS_DEFINE=	DEBUG OPTIMIZED_CFLAGS
>+OPTIONS_DEFINE=	DEBUG NUMPY OPTIMIZED_CFLAGS
>+OPTIONS_SUB=	yes
> 
> .include "${.CURDIR}/../boost-all/common.mk"
> 
>@@ -25,6 +27,9 @@
> 
> BUILD_DEPENDS+=	bjam:devel/boost-jam
> 
>+NUMPY_EXTRA_PATCHES_OFF=${PATCHDIR}/extra-patch-no-numpy
>+NUMPY_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR}
>+
> pre-build:
> 	@${ECHO_CMD} "using python : " ${PYTHON_VER} " : " ${PYTHON_CMD} " : " ${PYTHON_INCLUDEDIR} ";" >> ${WRKSRC}/tools/build/src/site-config.jam
> 
>Index: files/extra-patch-no-numpy
>===================================================================
>--- files/extra-patch-no-numpy	(nonexistent)
>+++ files/extra-patch-no-numpy	(working copy)
>@@ -0,0 +1,13 @@
>+--- tools/build/src/tools/python.jam.orig	2017-12-13 23:56:50 UTC
>++++ tools/build/src/tools/python.jam
>+@@ -834,7 +834,9 @@ local rule configure ( version ? : cmd-o
>+     local full-cmd = $(interpreter-cmd)" -c \"$(full-cmd)\"" ;
>+     debug-message "running command '$(full-cmd)'" ;
>+     local result = [ SHELL $(full-cmd) : strip-eol : exit-status ] ;
>+-    if $(result[2]) = 0
>++    #if $(result[2]) = 0
>++    # skip if NUMPY option is off
>++    if 0 = 1
>+     {
>+         .numpy = true ;
>+         .numpy-include = $(result[1]) ;
>
>Property changes on: files/extra-patch-no-numpy
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 462004)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,12 @@
>+%%NUMPY%%%%PYTHON2%%lib/libboost_numpy.a
>+%%NUMPY%%%%PYTHON2%%lib/libboost_numpy.so
>+%%NUMPY%%%%PYTHON2%%lib/libboost_numpy.so.%%BOOST_SHARED_LIB_VER%%
> %%PYTHON2%%lib/libboost_python.a
> %%PYTHON2%%lib/libboost_python.so
> %%PYTHON2%%lib/libboost_python.so.%%BOOST_SHARED_LIB_VER%%
>+%%NUMPY%%%%PYTHON3%%lib/libboost_numpy3.a
>+%%NUMPY%%%%PYTHON3%%lib/libboost_numpy3.so
>+%%NUMPY%%%%PYTHON3%%lib/libboost_numpy3.so.%%BOOST_SHARED_LIB_VER%%
> %%PYTHON3%%lib/libboost_python3.a
> %%PYTHON3%%lib/libboost_python3.so
> %%PYTHON3%%lib/libboost_python3.so.%%BOOST_SHARED_LIB_VER%%

Actions: View | Diff

Attachments on bug 225589: 190286 | 190695 | 192770