From 698a43baa1702c011af48c5eaf2ac3452375cdb0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 15 Feb 2015 21:21:38 +0100 Subject: [PATCH] - properly fix python linking issue --- boost-link.patch | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/boost-link.patch b/boost-link.patch index 72d7ab2..c2336d6 100644 --- 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 : : python 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 - static:BOOST_PYTHON_STATIC_LIB - 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) python.lib + ; + } + } -- 2.44.0