- properly fix python linking issue

diff --git a/boost-link.patch b/boost-link.patch
index 72d7ab2017f4442f59b1d3e8d0c03ad24d8ccbd4..c2336d611319978fe250d69d95f7d88c55da116a 100644 (file)
--- a/boost-link.patch
+++ b/boost-link.patch
@@ -1,23 +1,20 @@
-diff -ur boost_1_41_0/libs/python/build/Jamfile.v2 boost_1_41_0.new/libs/python/build/Jamfile.v2
---- boost_1_41_0/libs/python/build/Jamfile.v2  2009-10-14 00:37:59.000000000 +0200
-+++ boost_1_41_0.new/libs/python/build/Jamfile.v2      2009-11-20 08:52:07.423214282 +0100
-@@ -46,6 +46,8 @@
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
- 
-+lib pythonlib : : <name>python <link>shared ;
-+
- rule lib_boost_python ( is-py3 ? )
+--- boost_1_57_0/tools/build/src/tools/python.jam~     2015-02-15 19:23:08.000000000 +0100
++++ boost_1_57_0/tools/build/src/tools/python.jam      2015-02-15 19:46:59.298672754 +0100
+@@ -375,7 +375,7 @@
+ #
+ local rule split-version ( version )
  {
- 
-@@ -80,6 +82,9 @@
-         import.cpp
-         exec.cpp
-         object/function_doc_signature.cpp
-+
-+    pythonlib
-+
-         :   # requirements
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-Tylko w boost_1_41_0.new/libs/python/build: Jamfile.v2~
+-    local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ;
++    local major-minor = [ MATCH ^([0-9]+)\.([0-9m]+)(.*)$ : $(version) : 1 2 3 ] ;
+     if ! $(major-minor[2]) || $(major-minor[3])
+     {
+         ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ;
+@@ -992,7 +992,7 @@
+             :
+             : $(target-requirements)
+             :
+-            : $(usage-requirements)
++            : $(usage-requirements) <library>python.lib
+             ;
+     }
+ }