- for 1.34.0

Changed files:
    boost-python.patch -> 1.6

diff --git a/boost-python.patch b/boost-python.patch
index 8dfe46f374e0feba4a0e70165c8e2558d754c937..59868d9dbaacafb66fc5496f11b3d2f9d0ab7b8c 100644 (file)
--- a/boost-python.patch
+++ b/boost-python.patch
@@ -1,52 +1,34 @@
---- boost_1_31_0/libs/python/build/Jamfile.orig        2003-11-04 19:30:37.000000000 +0100
-+++ boost_1_31_0/libs/python/build/Jamfile     2004-02-19 00:07:10.072772224 +0100
-@@ -60,6 +60,8 @@
-     : ../src/$(sources)
-     : $(BOOST_PYTHON_V2_PROPERTIES)
-       <define>BOOST_PYTHON_SOURCE
-+      <cxxflags>-fno-strict-aliasing
-+      <find-library>python$(PYTHON_VERSION)
-       $(bpl-linkflags)
-         <msvc-stlport><release>$(msvc-stlport-workarounds)
-         <darwin><*><linkflags>-bind_at_load
-@@ -79,6 +81,7 @@
-       $(BOOST_PYTHON_V2_PROPERTIES)
-       <define>BOOST_PYTHON_SOURCE
-       <define>BOOST_STATIC_LIB
-+      <cxxflags>-fno-strict-aliasing
-       $(bpl-linkflags)
-         <msvc-stlport><release>$(msvc-stlport-workarounds)
-       ;
---- boost_1_33_1/libs/python/src/object_protocol.cpp.orig      2004-07-26 02:32:11.000000000 +0200
-+++ boost_1_33_1/libs/python/src/object_protocol.cpp   2006-09-06 00:46:35.567981500 +0200
-@@ -106,7 +106,7 @@
-       PySequenceMethods *sq = tp->tp_as_sequence;
+--- boost_1_34_0/tools/build/v2/tools/python.jam.orig  2007-04-06 20:17:43.000000000 +0200
++++ boost_1_34_0/tools/build/v2/tools/python.jam       2007-06-17 00:19:00.865685036 +0200
+@@ -911,30 +911,7 @@
+           ;
+     }
  
-       if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) {
--          int ilow = 0, ihigh = INT_MAX;
-+          Py_ssize_t ilow = 0, ihigh = INT_MAX;
-           if (!_PyEval_SliceIndex(v, &ilow))
-               return NULL;
-           if (!_PyEval_SliceIndex(w, &ihigh))
-@@ -133,7 +133,7 @@
-       PySequenceMethods *sq = tp->tp_as_sequence;
+-    # On *nix, we don't want to link either Boost.Python or Python
+-    # extensions to libpython, because the Python interpreter itself
+-    # provides all those symbols. If we linked to libpython, we'd get
+-    # duplicate symbols. So declare two targets -- one for building
+-    # extensions and another for embedding
+-    #
+-    # Unlike most *nix systems, Mac OS X's linker does not permit undefined
+-    # symbols when linking a shared library. So, we still need to link
+-    # against the Python framework, even when building extensions.
+-    # Note that framework builds of Python always use shared libraries,
+-    # so we do not need to worry about duplicate Python symbols.
+-    if $(target-os) in windows cygwin darwin
+-    {
+-        alias python_for_extensions : python : $(target-requirements) ;
+-    }
+-    else
+-    {
+-        alias python_for_extensions
+-                     :
+-                     : $(target-requirements)
+-                     :
+-                     : $(usage-requirements)
+-                     ;
+-    }
++    alias python_for_extensions : python : $(target-requirements) ;
+ }
  
-       if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) {
--          int ilow = 0, ihigh = INT_MAX;
-+          Py_ssize_t ilow = 0, ihigh = INT_MAX;
-           if (!_PyEval_SliceIndex(v, &ilow))
-               return -1;
-           if (!_PyEval_SliceIndex(w, &ihigh))
---- boost_1_33_1/libs/python/src/object_protocol.cpp~  2007-01-11 01:41:12.236117736 +0200
-+++ boost_1_33_1/libs/python/src/object_protocol.cpp   2007-01-11 01:41:13.476145496 +0200
-@@ -7,6 +7,10 @@
- #include <boost/python/errors.hpp>
- #include <boost/python/object.hpp>
- 
-+#if (PY_VERSION_HEX < 0x02050000)
-+typedef ssize_t     Py_ssize_t;
-+#endif
-+
- namespace boost { namespace python { namespace api {
- 
- BOOST_PYTHON_DECL object getattr(object const& target, object const& key)
+ rule configured ( )