Attachment #190695 for bug #225589

Lines 2-14 Link Here

(-)Makefile (-2 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= boost-libs	4	PORTNAME= boost-libs
5	COMMENT= Framework for interfacing Python 2 and C++
6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
7		6
		7	COMMENT= Framework for interfacing Python 2 and C++
		8
8	USES= python	9	USES= python
9	USE_PYTHON= flavors	10	USE_PYTHON= flavors
10		11
11	OPTIONS_DEFINE= DEBUG OPTIMIZED_CFLAGS	12	OPTIONS_DEFINE= DEBUG NUMPY OPTIMIZED_CFLAGS
		13	OPTIONS_SUB= yes
12		14
13	.include "${.CURDIR}/../boost-all/common.mk"	15	.include "${.CURDIR}/../boost-all/common.mk"
14		16
Lines 25-30 Link Here
25		27
26	BUILD_DEPENDS+= bjam:devel/boost-jam	28	BUILD_DEPENDS+= bjam:devel/boost-jam
27		29
		30	NUMPY_EXTRA_PATCHES_OFF=${PATCHDIR}/extra-patch-no-numpy
		31	NUMPY_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR}
		32
28	pre-build:	33	pre-build:
29	@${ECHO_CMD} "using python : " ${PYTHON_VER} " : " ${PYTHON_CMD} " : " ${PYTHON_INCLUDEDIR} ";" >> ${WRKSRC}/tools/build/src/site-config.jam	34	@${ECHO_CMD} "using python : " ${PYTHON_VER} " : " ${PYTHON_CMD} " : " ${PYTHON_INCLUDEDIR} ";" >> ${WRKSRC}/tools/build/src/site-config.jam
30		35




--- 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]) ;

Lines 1-6 Link Here

(-)pkg-plist (+6 lines)
		1	%%NUMPY%%%%PYTHON2%%lib/libboost_numpy.a
		2	%%NUMPY%%%%PYTHON2%%lib/libboost_numpy.so
		3	%%NUMPY%%%%PYTHON2%%lib/libboost_numpy.so.%%BOOST_SHARED_LIB_VER%%
1	%%PYTHON2%%lib/libboost_python.a	4	%%PYTHON2%%lib/libboost_python.a
2	%%PYTHON2%%lib/libboost_python.so	5	%%PYTHON2%%lib/libboost_python.so
3	%%PYTHON2%%lib/libboost_python.so.%%BOOST_SHARED_LIB_VER%%	6	%%PYTHON2%%lib/libboost_python.so.%%BOOST_SHARED_LIB_VER%%
		7	%%NUMPY%%%%PYTHON3%%lib/libboost_numpy3.a
		8	%%NUMPY%%%%PYTHON3%%lib/libboost_numpy3.so
		9	%%NUMPY%%%%PYTHON3%%lib/libboost_numpy3.so.%%BOOST_SHARED_LIB_VER%%
4	%%PYTHON3%%lib/libboost_python3.a	10	%%PYTHON3%%lib/libboost_python3.a
5	%%PYTHON3%%lib/libboost_python3.so	11	%%PYTHON3%%lib/libboost_python3.so
6	%%PYTHON3%%lib/libboost_python3.so.%%BOOST_SHARED_LIB_VER%%	12	%%PYTHON3%%lib/libboost_python3.so.%%BOOST_SHARED_LIB_VER%%

Return to bug 225589

Line 0 Link Here

(-)files/extra-patch-no-numpy (+13 lines)
	1	--- tools/build/src/tools/python.jam.orig 2017-12-13 23:56:50 UTC
	2	+++ tools/build/src/tools/python.jam
	3	@@ -834,7 +834,9 @@ local rule configure ( version ? : cmd-o
	4	local full-cmd = $(interpreter-cmd)" -c \"$(full-cmd)\"" ;
	5	debug-message "running command '$(full-cmd)'" ;
	6	local result = [ SHELL $(full-cmd) : strip-eol : exit-status ] ;
	7	- if $(result[2]) = 0
	8	+ #if $(result[2]) = 0
	9	+ # skip if NUMPY option is off
	10	+ if 0 = 1
	11	{
	12	.numpy = true ;
	13	.numpy-include = $(result[1]) ;