This commit was manufactured by cvs2git to create branch 'REL-0_15'.

Sprout from master 2010-07-09 22:10:49 UTC Artur Frysiak <artur@frysiak.net> '- fix building with python 2.7'
Delete:
    bashizm.patch
    disable-valloc.patch
    py27.patch

diff --git a/bashizm.patch b/bashizm.patch
deleted file mode 100644 (file)
index 6c2f60a..0000000
--- a/bashizm.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- libtorrent-rasterbar-0.14.6/configure.in.wiget     2009-11-14 13:39:06.000000000 +0100
-+++ libtorrent-rasterbar-0.14.6/configure.in   2009-11-14 13:44:58.000000000 +0100
-@@ -185,7 +185,7 @@ AC_ARG_WITH(
- # this works around a bug in asio in boost-1.39
- # see: https://svn.boost.org/trac/boost/ticket/3095
- AC_DEFINE(BOOST_ASIO_HASH_MAP_BUCKETS,1021,)
--COMPILETIME_OPTIONS+="-DBOOST_ASIO_HASH_MAP_BUCKETS=1021 "
-+COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 "
- 
- dnl Check the value for the --with-logging switch
- AC_MSG_CHECKING([what form of logging to use])
-@@ -196,12 +196,12 @@ case "$logging" in
-       "default")
-               AC_MSG_RESULT(default)
-               AC_DEFINE(TORRENT_LOGGING,,[define to use some logging])
--              COMPILETIME_OPTIONS+="-DTORRENT_LOGGING "
-+              COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_LOGGING "
-               ;;
-       "verbose")
-               AC_MSG_RESULT(verbose)
-               AC_DEFINE(TORRENT_VERBOSE_LOGGING,,[define to use verbose logging])
--              COMPILETIME_OPTIONS+="-DTORRENT_VERBOSE_LOGGING "
-+              COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_VERBOSE_LOGGING "
-               ;;
-       *)
-               AC_MSG_RESULT()
-@@ -225,12 +225,12 @@ case "$dht" in
-       "off")
-               AC_MSG_RESULT(off)
-               AC_DEFINE(TORRENT_DISABLE_DHT,,[define not to use DHT support])
--              COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_DHT "
-+              COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DISABLE_DHT "
-               ;;
-       "logging")
-               AC_MSG_RESULT(logging)
-               AC_DEFINE(TORRENT_DHT_VERBOSE_LOGGING,,[define to use DHT support with extra logging])
--              COMPILETIME_OPTIONS+="-DTORRENT_DHT_VERBOSE_LOGGING "
-+              COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DHT_VERBOSE_LOGGING "
-               ;;
-       *)
-               AC_MSG_RESULT()
-@@ -254,13 +254,13 @@ case "$encryption" in
-                AC_MSG_RESULT(on)
-                CHECK_SSL()
-                AC_DEFINE(TORRENT_USE_OPENSSL,,[define to use openssl with libtorrent-rasterbar])
--               COMPILETIME_OPTIONS+="-DTORRENT_USE_OPENSSL "
-+               COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_USE_OPENSSL "
- 
-                ;;
-        "off")
-                AC_MSG_RESULT(off)
-                AC_DEFINE(TORRENT_DISABLE_ENCRYPTION,,[define not to use encryption support])
--               COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_ENCRYPTION "
-+               COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DISABLE_ENCRYPTION "
-                ;;
-        *)
-                AC_MSG_RESULT()
-@@ -476,11 +476,11 @@ esac
- dnl Set some defines if we are building a shared library
- if [[ "x$enable_shared" == "xyes" ]]; then
-       AC_DEFINE(TORRENT_BUILDING_SHARED,,[Make sure the functions and classes are exported.])
--      COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "
-+      COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_LINKING_SHARED "
- fi
- 
- AC_DEFINE(BOOST_EXCEPTION_DISABLE,,[We do not need boost.exception features])
--COMPILETIME_OPTIONS+="-DBOOST_EXCEPTION_DISABLE "
-+COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DBOOST_EXCEPTION_DISABLE "
- 
- dnl want some debugging symbols with that?
- AC_ARG_ENABLE(
-@@ -490,11 +490,11 @@ AC_ARG_ENABLE(
-               no)
-                       AC_DEFINE(NDEBUG,,[Define to disable debugging])
-                       DEBUGFLAGS="-Os"
--#                     COMPILETIME_OPTIONS+="-DNDEBUG "
-+#                     COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DNDEBUG "
-                       ;;
-               yes)
-                       DEBUGFLAGS="-g"
--                      COMPILETIME_OPTIONS+="-DTORRENT_DEBUG "
-+                      COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DEBUG "
-                       AC_DEFINE(TORRENT_DEBUG,,[Define to enable libtorrent debug build])
-                       ;;
-               *)
-@@ -504,7 +504,7 @@ AC_ARG_ENABLE(
-       esac],
-       [DEBUGFLAGS="-Os"
-       AC_DEFINE(NDEBUG,,[Define to disable debugging])
--#     COMPILETIME_OPTIONS+="-DNDEBUG "
-+#     COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DNDEBUG "
-       ]
- )
- AC_SUBST(DEBUGFLAGS)

diff --git a/disable-valloc.patch b/disable-valloc.patch
deleted file mode 100644 (file)
index 23fafe3..0000000
--- a/disable-valloc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libtorrent-rasterbar-0.15.0.orig/configure 2010-03-31 14:32:43.088649904 -0700
-+++ libtorrent-rasterbar-0.15.0/configure      2010-03-31 14:35:23.284694490 -0700
-@@ -15297,8 +15297,8 @@
- fi
- 
- 
--
--
-+# Use posix_memalign() instead of valloc() to avoid issues with eglibc
-+$as_echo "#define TORRENT_USE_POSIX_MEMALIGN 1" >>confdefs.h
- 
- # Check whether --with-boost-system was given.
- if test "${with_boost_system+set}" = set; then :

diff --git a/py27.patch b/py27.patch
deleted file mode 100644 (file)
index 95584ea..0000000
--- a/py27.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtorrent-rasterbar-0.14.10/m4/ax_python-fixed.m4.wiget   2010-07-09 23:38:46.485060875 +0200
-+++ libtorrent-rasterbar-0.14.10/m4/ax_python-fixed.m4 2010-07-09 23:39:15.082559709 +0200
-@@ -58,7 +58,7 @@
- AC_DEFUN([AX_PYTHON],
- [AC_MSG_CHECKING(for python build information)
- AC_MSG_RESULT([])
--for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
-+for python in python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
- # AC_CHECK_PROGS(PYTHON_BIN, [$python])
- PYTHON_BIN=$python
- ax_python_bin=$PYTHON_BIN