summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-13 00:53:09 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-13 00:53:09 +0000
commitd27b5cb5ae0fd442b929b06427f78410a5029177 (patch)
tree926a3069d41d0aa97c6efb63ed793e0483a1a537 /net-libs/libjingle
parentMask libarchive 2.6 pre-releases (which I'm going to commit soon). (diff)
downloadgentoo-2-d27b5cb5ae0fd442b929b06427f78410a5029177.tar.gz
gentoo-2-d27b5cb5ae0fd442b929b06427f78410a5029177.tar.bz2
gentoo-2-d27b5cb5ae0fd442b929b06427f78410a5029177.zip
Add patch to fix building with --as-needed (bug #238262).
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'net-libs/libjingle')
-rw-r--r--net-libs/libjingle/ChangeLog6
-rw-r--r--net-libs/libjingle/files/libjingle-0.3.12-asneeded.patch26
-rw-r--r--net-libs/libjingle/libjingle-0.3.12.ebuild14
3 files changed, 44 insertions, 2 deletions
diff --git a/net-libs/libjingle/ChangeLog b/net-libs/libjingle/ChangeLog
index 0297c919bca0..c081d9fe044e 100644
--- a/net-libs/libjingle/ChangeLog
+++ b/net-libs/libjingle/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libjingle
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.11 2008/09/17 13:35:06 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.12 2008/11/13 00:53:09 flameeyes Exp $
+
+ 13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
+ +files/libjingle-0.3.12-asneeded.patch, libjingle-0.3.12.ebuild:
+ Add patch to fix building with --as-needed (bug #238262).
*libjingle-0.3.12 (17 Sep 2008)
diff --git a/net-libs/libjingle/files/libjingle-0.3.12-asneeded.patch b/net-libs/libjingle/files/libjingle-0.3.12-asneeded.patch
new file mode 100644
index 000000000000..522659a21181
--- /dev/null
+++ b/net-libs/libjingle/files/libjingle-0.3.12-asneeded.patch
@@ -0,0 +1,26 @@
+Index: libjingle-0.3.12/talk/base/Makefile.am
+===================================================================
+--- libjingle-0.3.12.orig/talk/base/Makefile.am
++++ libjingle-0.3.12/talk/base/Makefile.am
+@@ -31,7 +31,7 @@ libjinglebase_la_SOURCES = socketaddres
+ signalthread.cc \
+ socketpool.cc
+
+-libjinglebase_la_LIBADD = -lrt
++libjinglebase_la_LIBADD = -lrt -lssl -lcrypto
+
+ libjinglebase_includedir = $(includedir)/libjingle-@LIBJINGLE_MAJORMINOR@/talk/base
+ libjinglebase_include_HEADERS = asyncfile.h \
+Index: libjingle-0.3.12/talk/p2p/base/Makefile.am
+===================================================================
+--- libjingle-0.3.12.orig/talk/p2p/base/Makefile.am
++++ libjingle-0.3.12/talk/p2p/base/Makefile.am
+@@ -38,7 +38,7 @@ libjinglep2pbase_include_HEADERS = candi
+ sessionresponsemessage.h \
+ sessionmessagefactory.h
+
+-libjinglep2pbase_la_LIBADD = -lssl -lcrypto
++libjinglep2pbase_la_LIBADD =
+
+ AM_CPPFLAGS = -DPOSIX
+
diff --git a/net-libs/libjingle/libjingle-0.3.12.ebuild b/net-libs/libjingle/libjingle-0.3.12.ebuild
index 5fea7f4d6152..b5808cb46790 100644
--- a/net-libs/libjingle/libjingle-0.3.12.ebuild
+++ b/net-libs/libjingle/libjingle-0.3.12.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.12.ebuild,v 1.1 2008/09/17 13:35:06 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.12.ebuild,v 1.2 2008/11/13 00:53:09 flameeyes Exp $
+
+inherit autotools eutils
DESCRIPTION="Google's jabber voice extension library modified by Tapioca/Farsight"
HOMEPAGE="http://farsight.freedesktop.org/"
@@ -16,6 +18,16 @@ RDEPEND="dev-libs/openssl
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # See bug #238262
+ epatch "${FILESDIR}/${P}-asneeded.patch"
+
+ eautomake
+}
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed."
dodoc AUTHORS ChangeLog NEWS README