[pkgsrc/trunk]: pkgsrc/www/py-curl Try to prevent to link against static libr...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc5399ec008c
branches:  trunk
changeset: 598658:cc5399ec008c
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Jan 28 13:15:10 2012 +0000

description:
Try to prevent to link against static libraries.
Fixes build failure on NetBSD/amd64, reported by Dieter Roelants via private mail.

diffstat:

 www/py-curl/distinfo         |   4 ++--
 www/py-curl/patches/patch-aa |  35 +++++++++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r c03e00d8068e -r cc5399ec008c www/py-curl/distinfo
--- a/www/py-curl/distinfo      Sat Jan 28 13:12:06 2012 +0000
+++ b/www/py-curl/distinfo      Sat Jan 28 13:15:10 2012 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2012/01/25 13:19:57 obache Exp $
+$NetBSD: distinfo,v 1.17 2012/01/28 13:15:10 obache Exp $
 
 SHA1 (pycurl-7.19.0.tar.gz) = 3fb59eca1461331bb9e9e8d6fe3b23eda961a416
 RMD160 (pycurl-7.19.0.tar.gz) = dab547b3db67ed30cafb556a1a383f567064de49
 Size (pycurl-7.19.0.tar.gz) = 71346 bytes
-SHA1 (patch-aa) = 2635d59e4d8aee29abb6797ffb4b46260f94be72
+SHA1 (patch-aa) = 10d4cf15ea9eae7c7fc0f587fe8b3bd2bf3852e1
diff -r c03e00d8068e -r cc5399ec008c www/py-curl/patches/patch-aa
--- a/www/py-curl/patches/patch-aa      Sat Jan 28 13:12:06 2012 +0000
+++ b/www/py-curl/patches/patch-aa      Sat Jan 28 13:15:10 2012 +0000
@@ -1,8 +1,39 @@
-$NetBSD: patch-aa,v 1.7 2012/01/25 13:19:57 obache Exp $
+$NetBSD: patch-aa,v 1.8 2012/01/28 13:15:11 obache Exp $
+
+* in pkgsrc, OpenSSL is used for cURL SSL support, so disable pick up of
+  static-libs to detect ssl library for REQUIRE_LIB_DEPS=no platforms,
+  and prevent to link with static library additionally.
+* add multi python variant support
 
 --- setup.py.orig      2008-09-09 17:40:34.000000000 +0000
 +++ setup.py
-@@ -149,9 +149,9 @@ def get_data_files():
+@@ -96,16 +96,10 @@ else:
+                 include_dirs.append(e[2:])
+         else:
+             extra_compile_args.append(e)
+-    libs = split_quoted(
+-        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
+-        os.popen("'%s' --static-libs" % CURL_CONFIG).read())
++    libs = split_quoted(os.popen("'%s' --libs" % CURL_CONFIG).read())
+     for e in libs:
+         if e[:2] == "-l":
+             libraries.append(e[2:])
+-            if e[2:] == 'ssl':
+-                define_macros.append(('HAVE_CURL_OPENSSL', 1))
+-            if e[2:] == 'gnutls':
+-                define_macros.append(('HAVE_CURL_GNUTLS', 1))
+         elif e[:2] == "-L":
+             library_dirs.append(e[2:])
+         else:
+@@ -113,6 +107,7 @@ else:
+     for e in split_quoted(os.popen("'%s' --features" % CURL_CONFIG).read()):
+         if e == 'SSL':
+             define_macros.append(('HAVE_CURL_SSL', 1))
++            define_macros.append(('HAVE_CURL_OPENSSL', 1))
+     if not libraries:
+         libraries.append("curl")
+     # Add extra compile flag for MacOS X
+@@ -149,9 +144,9 @@ def get_data_files():
      # a list of tuples with (path to install to, a list of local files)
      data_files = []
      if sys.platform == "win32":