diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-20 16:14:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-20 16:14:30 +0000 |
| commit | 66fec84d2a18d8299a931383cd92050be5a39650 (patch) | |
| tree | 2aaa9da48f56ed532c71483a821e51984539d16a /net-misc | |
| parent | Stable for AMD64, wrt bug #395317 (diff) | |
| download | gentoo-2-66fec84d2a18d8299a931383cd92050be5a39650.tar.gz gentoo-2-66fec84d2a18d8299a931383cd92050be5a39650.tar.bz2 gentoo-2-66fec84d2a18d8299a931383cd92050be5a39650.zip | |
Set LIBSSL when using pkg-config as the NTLM check uses it #395349 by Vladimir Berezhnoy.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/wget/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog index e457ff888b75..b8220b221b63 100644 --- a/net-misc/wget/ChangeLog +++ b/net-misc/wget/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/wget # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.150 2011/12/01 16:53:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.151 2011/12/20 16:14:30 vapier Exp $ + + 20 Dec 2011; Mike Frysinger <vapier@gentoo.org> + files/wget-1.13.4-openssl-pkg-config.patch: + Set LIBSSL when using pkg-config as the NTLM check uses it #395349 by + Vladimir Berezhnoy. 01 Dec 2011; Mike Frysinger <vapier@gentoo.org> wget-1.13.4-r1.ebuild: Fix the static-libs logic the right way #392713 by Piotr Karbowski. diff --git a/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch b/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch index c052b4a189e3..97037cee724a 100644 --- a/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch +++ b/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch @@ -2,7 +2,7 @@ detect openssl via pkg-config if it's available --- a/configure.ac +++ b/configure.ac -@@ -234,7 +234,16 @@ dnl +@@ -234,7 +234,17 @@ dnl dnl Checks for libraries. dnl @@ -14,6 +14,7 @@ detect openssl via pkg-config if it's available + AC_LIBOBJ([openssl]) + LIBS="$OPENSSL_LIBS $LIBS" + CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS" ++ LIBSSL=" " # ntlm check below wants this #395349 + ], [ + dnl some versions of openssl use zlib compression |