From a1e865061c2f80be160bc4d42f3c6edcac41df27 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Sat, 22 Jul 2006 07:12:10 +0000 Subject: [PATCH] Don't link Boost.Python to python library, and don't require multi for embedding applications. * libs/python/build/Jamfile.v2: (boost_python): Don't link to /python//python. Use /python//python_for_extensions. * libs/python/test/Jamfile.v2: Remove multi project requirements. (py-run): Link to /python//python. (exec): Likewise. * tools/build/v2/tools/python.jam: (pthread): Declare. (init-unix): Add 'pthread' to extra-libs. ( [SVN r34662] --- build/Jamfile.v2 | 7 ++++++- test/Jamfile.v2 | 6 ++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 66427745..50169cc7 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -59,7 +59,12 @@ lib boost_python : # requirements static:BOOST_PYTHON_STATIC_LIB BOOST_PYTHON_SOURCE - /python//python + # We don't link to Python library itself. If + # Boost.Python is used for extension, all Python + # symbols are available in Python interpreter. + # If Boost.Python is used for extending, client + # is required to link to /python//python itself. + /python//python_for_extensions : # default build shared : # usage requirements diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 925f6cf5..8e000ec4 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -2,11 +2,9 @@ use-project /boost/python : ../build ; project /boost/python/test ; -project : requirements multi ; - rule py-run ( sources * ) { - return [ run $(sources) /boost/python//boost_python ] ; + return [ run $(sources) /boost/python//boost_python /python//python ] ; } rule py-compile ( sources * ) @@ -36,7 +34,7 @@ test-suite python : [ - run exec.cpp ../build//boost_python/static + run exec.cpp ../build//boost_python/static /python//python : # program args : exec.py : # requirements