[Python-modules-commits] r29581 - in packages/python-hiredis/trunk/debian/patches (1 file)

[apoikos at users.alioth.debian.org]

    Date: Wednesday, July 2, 2014 @ 08:17:12
  Author: apoikos
Revision: 29581

Refresh 0001-Use-system-libhiredis.patch

Modified:
  packages/python-hiredis/trunk/debian/patches/0001-Use-system-libhiredis.patch

Modified: packages/python-hiredis/trunk/debian/patches/0001-Use-system-libhiredis.patch
===================================================================
--- packages/python-hiredis/trunk/debian/patches/0001-Use-system-libhiredis.patch	2014-07-02 08:07:35 UTC (rev 29580)
+++ packages/python-hiredis/trunk/debian/patches/0001-Use-system-libhiredis.patch	2014-07-02 08:17:12 UTC (rev 29581)
@@ -1,39 +1,38 @@
-From: Apollon Oikonomopoulos <apollon at skroutz.gr>
-Date: Mon, 22 Apr 2013 10:51:27 +0300
+From: Apollon Oikonomopoulos <apoikos at debian.org>
+Date: Wed, 2 Jul 2014 10:51:27 +0300
 Subject: Use system libhiredis
 
 Patch setup.py to not build hiredis in vendor/
 
 Forwarded: no
-Last-Updated: 2013-04-22
----
- setup.py |    7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
+Last-Updated: 2014-07-02
 diff --git a/setup.py b/setup.py
-index cb6bd26..f22628d 100755
+index c2c4dcd..529cb38 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -20,13 +20,9 @@ class install_lib(_install_lib.install_lib):
-         if self.distribution.has_ext_modules():
-           self.run_command('build_ext')
+@@ -41,7 +41,8 @@ lib = ("hiredis_for_hiredis_py", {
  
--lib = ("hiredis", {
--  "sources": ["vendor/hiredis/%s.c" % src for src in ("hiredis", "net", "sds")],
--  "include_dirs": ["vendor/hiredis"]})
--
  ext = Extension("hiredis.hiredis",
    sources=glob.glob("src/*.c"),
--  include_dirs=["src", "vendor"],
-+  include_dirs=["src"],
-   libraries=["hiredis"])
+-  include_dirs=["vendor"])
++  include_dirs=["vendor"],
++  extra_link_args=["-lhiredis"])
  
  setup(
-@@ -39,7 +35,6 @@ setup(
+   name="hiredis",
+@@ -53,11 +54,13 @@ setup(
    keywords=["Redis"],
    license="BSD",
    packages=["hiredis"],
 -  libraries=[lib],
++  # Disabled in Debian, we use the system hiredis library
++  # libraries=[lib],
    ext_modules=[ext],
  
    # Override "install_lib" command
+-  cmdclass={ "install_lib": install_lib },
++  # Debian: disable and link against the system hiredis library
++  # cmdclass={ "install_lib": install_lib },
+ 
+   classifiers=[
+     'Development Status :: 5 - Production/Stable',