[gentoo-commits] gentoo-x86 commit in net-libs/rb_libtorrent/files: rb_libtorrent-1.0.2-python.patch rb_libtorrent-0.16.17-python.patch

[gentoo-commits] gentoo-x86 commit in net-libs/rb_libtorrent/files: rb_libtorrent-1.0.2-python.patch rb_libtorrent-0.16.17-python.patch

[Justin Lecher (jlec)]

jlec        15/03/23 12:07:50

  Added:                rb_libtorrent-1.0.2-python.patch
                        rb_libtorrent-0.16.17-python.patch
  Log:
  Fix python stuff, bug #542434
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.1                  net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch?rev=1.1&content-type=text/plain

Index: rb_libtorrent-1.0.2-python.patch
===================================================================
 bindings/python/setup.py |  2 +-
 configure.ac             | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 961395f..c38ef52 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -36,7 +36,7 @@ def target_specific():
 
 try:
 	with open('compile_flags') as _file:
-		extra_cmd = _file.read()
+		extra_cmd = _file.read()  + '-lboost_python-%s-mt' % (platform.python_version()[:3])
 
 except:
 	extra_cmd = None
diff --git a/configure.ac b/configure.ac
index ebb1f7e..dddc403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -539,15 +539,7 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"],
       AC_MSG_RESULT([yes])
 
       AM_PATH_PYTHON([2.4], [], AC_MSG_ERROR([Python interpreter not found.]))
-      AX_PYTHON_DEVEL([>= '2.4'])
-      AX_BOOST_PYTHON()
-
-      AS_IF([test -z "$BOOST_PYTHON_LIB"],
-            [AC_MSG_ERROR([Boost.Python library not found. Try using --with-boost-python=lib.])])
-    ],
-  ["no"], [
-      AC_MSG_RESULT([no])
-    ],
+      AX_PYTHON_DEVEL([>= '2.4'])],
   [AC_MSG_RESULT([$ARG_ENABLE_PYTHON_BINDING])
    AC_MSG_ERROR([Unknown option "$ARG_ENABLE_PYTHON_BINDING". Use either "yes" or "no".])]
 )



1.1                  net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch?rev=1.1&content-type=text/plain

Index: rb_libtorrent-0.16.17-python.patch
===================================================================
 bindings/python/setup.py.in |  6 +++---
 configure.ac                | 10 +---------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
index e58045e..a55f444 100644
--- a/bindings/python/setup.py.in
+++ b/bindings/python/setup.py.in
@@ -61,10 +61,10 @@ if "CFLAGS" in config_vars and "-Wstrict-prototypes" in config_vars["CFLAGS"]:
 if "OPT" in config_vars and "-Wstrict-prototypes" in config_vars["OPT"]:
 	config_vars["OPT"] = config_vars["OPT"].replace("-Wstrict-prototypes", " ")
 
-source_list = os.listdir(os.path.join(os.path.dirname(__file__), "src"))
-source_list = [os.path.join("src", s) for s in source_list if s.endswith(".cpp")]
+source_list = os.listdir(os.path.join('@srcdir@', "src"))
+source_list = [os.path.join('@srcdir@', "src", s) for s in source_list if s.endswith(".cpp")]
 
-extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_PYTHON_LIB@ @PTHREAD_LIBS@ @OPENSSL_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_INCLUDES@'
+extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_SYSTEM_LIB@ @PTHREAD_LIBS@ @OPENSSL_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_INCLUDES@' + '-lboost_python-%s-mt' % (platform.python_version()[:3])
 
 setup( name='python-libtorrent',
 	version='@PACKAGE_VERSION@',
diff --git a/configure.ac b/configure.ac
index f727b81..9b4ccee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -539,15 +539,7 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"],
       AC_MSG_RESULT([yes])
 
       AM_PATH_PYTHON([2.4], [], AC_MSG_ERROR([Python interpreter not found.]))
-      AX_PYTHON_DEVEL([>= '2.4'])
-      AX_BOOST_PYTHON()
-
-      AS_IF([test -z "$BOOST_PYTHON_LIB"],
-            [AC_MSG_ERROR([Boost.Python library not found. Try using --with-boost-python=lib.])])
-    ],
-  ["no"], [
-      AC_MSG_RESULT([no])
-    ],
+      AX_PYTHON_DEVEL([>= '2.4'])],
   [AC_MSG_RESULT([$ARG_ENABLE_PYTHON_BINDING])
    AC_MSG_ERROR([Unknown option "$ARG_ENABLE_PYTHON_BINDING". Use either "yes" or "no".])]
 )