summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2006-11-05 21:55:50 +0000
committerTiziano Müller <dev-zero@gentoo.org>2006-11-05 21:55:50 +0000
commitb4f0e2659c3be24931ec492922e619909d8d6514 (patch)
tree64b1601fb1c3e8ae48ccd4566f3cef39826ea801 /dev-cpp
parentFix gcc 4.1 build error. Thanks to William Keaney in bug #141032. (diff)
downloadgentoo-2-b4f0e2659c3be24931ec492922e619909d8d6514.tar.gz
gentoo-2-b4f0e2659c3be24931ec492922e619909d8d6514.tar.bz2
gentoo-2-b4f0e2659c3be24931ec492922e619909d8d6514.zip
Updated ccext2-as-needed patch, bug 154177, thanks to drizzt.
(Portage version: 2.1.2_rc1-r1)
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/commoncpp2/ChangeLog6
-rw-r--r--dev-cpp/commoncpp2/files/ccext2-as-needed.diff4
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index 86d0b47a501d..5e76ccffb4db 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-cpp/commoncpp2
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.25 2006/11/05 19:20:25 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.26 2006/11/05 21:55:50 dev-zero Exp $
+
+ 05 Nov 2006; Tiziano Müller <dev-zero@gentoo.org>
+ files/ccext2-as-needed.diff:
+ Updated ccext2-as-needed patch, bug 154177, thanks to drizzt.
05 Nov 2006; Tiziano Müller <dev-zero@gentoo.org>
+files/ccgnu2-as-needed.diff, commoncpp2-1.5.1-r1.ebuild:
diff --git a/dev-cpp/commoncpp2/files/ccext2-as-needed.diff b/dev-cpp/commoncpp2/files/ccext2-as-needed.diff
index ac2aab640bfd..72e0d48f4e4c 100644
--- a/dev-cpp/commoncpp2/files/ccext2-as-needed.diff
+++ b/dev-cpp/commoncpp2/files/ccext2-as-needed.diff
@@ -5,7 +5,7 @@
if EXTRAS
-libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
-+libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@ $(SSL_LIBS)
++libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@ @ZSTREAM_LIBS@ $(SSL_LIBS)
libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
if GETOPT_LONG
@@ -16,7 +16,7 @@
private.h nat.h
-@EXTRAS_TRUE@libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
-+@EXTRAS_TRUE@libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@ $(SSL_LIBS)
++@EXTRAS_TRUE@libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@ @ZSTREAM_LIBS@ $(SSL_LIBS)
@EXTRAS_TRUE@libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
@EXTRAS_TRUE@@GETOPT_LONG_TRUE@optincludedir = $(includedir)/cc++2
@EXTRAS_TRUE@@GETOPT_LONG_TRUE@optinclude_HEADERS = getopt.h