diff --git a/boost-python-vs-x86-64.patch b/boost-python-vs-x86-64.patch new file mode 100644 index 0000000..2fa43d4 --- /dev/null +++ b/boost-python-vs-x86-64.patch @@ -0,0 +1,37 @@ +--- boost/python/detail/wrap_python.hpp 4 Nov 2005 21:38:29 -0000 1.22 ++++ boost/python/detail/wrap_python.hpp 12 Apr 2006 15:55:11 -0000 +@@ -141,6 +141,12 @@ + # include + #endif + ++#if PY_VERSION_HEX < 0x02050000 ++typedef int Py_ssize_t; ++#define PY_SSIZE_T_MIN INT_MIN ++#define PY_SSIZE_T_MAX INT_MAX ++#endif ++ + #ifdef BOOST_PYTHON_ULONG_MAX_UNDEFINED + # undef ULONG_MAX + # undef BOOST_PYTHON_ULONG_MAX_UNDEFINED + +diff -u -r1.7 object_protocol.cpp +--- libs/python/src/object_protocol.cpp 26 Jul 2004 00:32:11 -0000 1.7 ++++ libs/python/src/object_protocol.cpp 12 Apr 2006 15:55:31 -0000 +@@ -106,7 +106,7 @@ + PySequenceMethods *sq = tp->tp_as_sequence; + + if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) { +- int ilow = 0, ihigh = INT_MAX; ++ Py_ssize_t ilow = 0, ihigh = PY_SSIZE_T_MAX; + if (!_PyEval_SliceIndex(v, &ilow)) + return NULL; + if (!_PyEval_SliceIndex(w, &ihigh)) +@@ -133,7 +133,7 @@ + PySequenceMethods *sq = tp->tp_as_sequence; + + if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) { +- int ilow = 0, ihigh = INT_MAX; ++ Py_ssize_t ilow = 0, ihigh = PY_SSIZE_T_MAX; + if (!_PyEval_SliceIndex(v, &ilow)) + return -1; + if (!_PyEval_SliceIndex(w, &ihigh)) diff --git a/boost.spec b/boost.spec index e03ba82..739e626 100644 --- a/boost.spec +++ b/boost.spec @@ -1,7 +1,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.33.1 -Release: 11%{?dist} +Release: 12%{?dist} License: Boost Software License (GPL-Compatible, Free Software License) URL: http://www.boost.org/ Group: System Environment/Libraries @@ -27,6 +27,7 @@ Patch5: boost-serialization-warnings.patch Patch6: boost-spirit-warnings.patch Patch7: boost-bind-gcc41.patch Patch8: boost-cxxflags-debug.patch +Patch9: boost-python-vs-x86-64.patch %description Boost provides free peer-reviewed portable C++ source libraries. The @@ -76,6 +77,7 @@ rm -rf %{buildroot} %patch6 -p0 %patch7 -p0 %patch8 -p0 +%patch9 -p0 %build #build bjam @@ -181,8 +183,11 @@ rm -rf %{buildroot} %doc %{_docdir}/boost-%{version} %changelog -* Mon Mar 26 2007 Benjamin Kosnik 1.33.1-11 +* Mon Mar 26 2007 Benjamin Kosnik 1.33.1-12 - (#233523: libboost_python needs rebuild against python 2.5) + Use patch. + +* Mon Mar 26 2007 Benjamin Kosnik 1.33.1-11 - (#225622: Merge Review: boost) Source to http. BuildRoot to preferred value.