diff options
| author |   Jesus Rivero <neurogeek@gentoo.org> | 2012-04-18 21:41:41 +0000 |
|---|---|---|
| committer | Jesus Rivero <neurogeek@gentoo.org> | 2012-04-18 21:41:41 +0000 |
| commit | 33c0ac05d2455a45e8cb93aaf6831c171ca28cbe (patch) | |
| tree | a68ddccdd47d83762944d8536fb1f3210fcbd142 /dev-python/pycurl | |
| parent | x86 stable, bug #409403 (diff) | |
| download | gentoo-2-33c0ac05d2455a45e8cb93aaf6831c171ca28cbe.tar.gz gentoo-2-33c0ac05d2455a45e8cb93aaf6831c171ca28cbe.tar.bz2 gentoo-2-33c0ac05d2455a45e8cb93aaf6831c171ca28cbe.zip | |
Modified patch to account for curl USE flag mixture: ssl nss gnutls. Closes bug #329987
(Portage version: 2.2.0_alpha100/cvs/Linux i686)
Diffstat (limited to 'dev-python/pycurl')
| -rw-r--r-- | dev-python/pycurl/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-python/pycurl/files/pycurl-7.19.0-linking.patch | 14 |
2 files changed, 18 insertions, 5 deletions
diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog index 2c10ecba3e45..a938b762862a 100644 --- a/dev-python/pycurl/ChangeLog +++ b/dev-python/pycurl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/pycurl -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.68 2011/04/10 12:35:02 klausman Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.69 2012/04/18 21:41:41 neurogeek Exp $ + + 18 Apr 2012; Jesus Rivero <neurogeek@gentoo.org> + files/pycurl-7.19.0-linking.patch: + Modified patch to account for curl USE flag mixture: ssl nss gnutls. Closes + bug #329987 10 Apr 2011; Tobias Klausmann <klausman@gentoo.org> pycurl-7.19.0.ebuild: Stable on alpha, bug #343309 diff --git a/dev-python/pycurl/files/pycurl-7.19.0-linking.patch b/dev-python/pycurl/files/pycurl-7.19.0-linking.patch index 7fff5baad890..108672660317 100644 --- a/dev-python/pycurl/files/pycurl-7.19.0-linking.patch +++ b/dev-python/pycurl/files/pycurl-7.19.0-linking.patch @@ -1,6 +1,6 @@ ---- setup.py -+++ setup.py -@@ -96,9 +96,7 @@ +--- setup.py.org 2012-04-18 13:03:25.000000000 -0400 ++++ setup.py 2012-04-18 13:04:53.000000000 -0400 +@@ -96,15 +96,14 @@ include_dirs.append(e[2:]) else: extra_compile_args.append(e) @@ -11,3 +11,11 @@ for e in libs: if e[:2] == "-l": libraries.append(e[2:]) +- if e[2:] == 'ssl': ++ if e[2:] in ('ssl', 'ssl3'): + define_macros.append(('HAVE_CURL_OPENSSL', 1)) + if e[2:] == 'gnutls': ++ libraries.append("gcrypt") + define_macros.append(('HAVE_CURL_GNUTLS', 1)) + elif e[:2] == "-L": + library_dirs.append(e[2:]) |