summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-12-21 13:57:56 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-12-21 13:57:56 +0000
commit9cd7a7dcbe46c96ec81baf64cdf8f9bacf4769e9 (patch)
tree9701d986f5b5e51fe72d44f2d5e2ad2521d1a580 /net-irc
parentRestore more e* output style. (diff)
downloadhistorical-9cd7a7dcbe46c96ec81baf64cdf8f9bacf4769e9.tar.gz
historical-9cd7a7dcbe46c96ec81baf64cdf8f9bacf4769e9.tar.bz2
historical-9cd7a7dcbe46c96ec81baf64cdf8f9bacf4769e9.zip
Fix building with -Wl,--as-needed wrt #248016 by Kacper Kowalik.
Package-Manager: portage-2.2_rc59/cvs/Linux x86_64
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/cwirc/ChangeLog6
-rw-r--r--net-irc/cwirc/Manifest5
-rw-r--r--net-irc/cwirc/cwirc-2.0.0.ebuild5
-rw-r--r--net-irc/cwirc/files/cwirc-2.0.0-asneeded.patch29
4 files changed, 40 insertions, 5 deletions
diff --git a/net-irc/cwirc/ChangeLog b/net-irc/cwirc/ChangeLog
index 4deadce967a8..23201814a3a7 100644
--- a/net-irc/cwirc/ChangeLog
+++ b/net-irc/cwirc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-irc/cwirc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/ChangeLog,v 1.24 2009/11/30 20:24:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/ChangeLog,v 1.25 2009/12/21 13:57:56 ssuominen Exp $
+
+ 21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> cwirc-2.0.0.ebuild,
+ +files/cwirc-2.0.0-asneeded.patch:
+ Fix building with -Wl,--as-needed wrt #248016 by Kacper Kowalik.
30 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
files/cwirc-1.7.1-gentoo.patch, cwirc-2.0.0.ebuild:
diff --git a/net-irc/cwirc/Manifest b/net-irc/cwirc/Manifest
index f676b736817c..511e45e017fe 100644
--- a/net-irc/cwirc/Manifest
+++ b/net-irc/cwirc/Manifest
@@ -1,5 +1,6 @@
AUX cwirc-1.7.1-gentoo.patch 617 RMD160 fd0e93eb20b9e38812b6407701c1b7744ffb4e54 SHA1 26549def38d1645429f0c1d064d6c7461590db50 SHA256 4388db975f4a3ced68b7b5f5e0bc74a7a37781d4007ff41f9611f3afa41c8cc3
+AUX cwirc-2.0.0-asneeded.patch 969 RMD160 b534254c96ae1783dba4fef049ee4d1e2386615d SHA1 95e634a50ef91d48ef6d96b953fefb934af9d47a SHA256 6157d379a07ba7dc5d5a2295b5287dd2911b73991a2f4993fe11af993255ac08
DIST cwirc-2.0.0.tar.gz 180759 RMD160 f44f6453399fa2cfb1726febca81502491581a91 SHA1 9cc6426b3f3d7cddf8961151c01722b6360b01e5 SHA256 90e3bfa916fb8e5478739dc4d14b111bb2ffd1d1fd8ea81ab43486dc1e7e35c0
-EBUILD cwirc-2.0.0.ebuild 933 RMD160 1077020085469ef6128e50d50b430daca866a87d SHA1 8d72122a782944f91a068d1ef83a49b351c284c1 SHA256 489b4db78758d17b683ece5731ba943316b3af0961e731172b0090dc0790bd17
-MISC ChangeLog 3285 RMD160 bd3f64c02400e9b2301c77370eb1d3a539d9d0ff SHA1 25ea6aed7d2815192243d1ecaac1deb140919870 SHA256 adad67af0b1419594031ed94c63cd84a6426ff5f5811d1ab7f566d406fe39e55
+EBUILD cwirc-2.0.0.ebuild 971 RMD160 7e2bd1edff9e5234b60e815a16791a7c224d4faf SHA1 be54f9cb4ea45aaf194d53d378e77a4408980aea SHA256 61665a110c7ded8f984eb3f0adb1c05081020cf0282ba23a2979bfa9c1c2ae2d
+MISC ChangeLog 3464 RMD160 8eac52454da5b613996332295f573d5082c035c9 SHA1 b50cfcdf9682d94b115001d23f43ad8668e7b393 SHA256 a607174b400ac131fd11c2a087ab46a01e66986f22d901637f590c4472585665
MISC metadata.xml 427 RMD160 d225216c0a6cb65a1d74c45c9c0a12e4a1e93045 SHA1 f60b4f42648f4cd18e37005c1d56c339fd7246e2 SHA256 9ec879a36f44116dc56e30970a3416cd4f9440925eda39e6569b235163c4d987
diff --git a/net-irc/cwirc/cwirc-2.0.0.ebuild b/net-irc/cwirc/cwirc-2.0.0.ebuild
index 50dd44257e4f..2663d83f42ff 100644
--- a/net-irc/cwirc/cwirc-2.0.0.ebuild
+++ b/net-irc/cwirc/cwirc-2.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/cwirc-2.0.0.ebuild,v 1.5 2009/11/30 20:24:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/cwirc-2.0.0.ebuild,v 1.6 2009/12/21 13:57:56 ssuominen Exp $
EAPI=2
inherit eutils multilib toolchain-funcs
@@ -20,7 +20,8 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/cwirc-1.7.1-gentoo.patch
+ epatch "${FILESDIR}"/cwirc-1.7.1-gentoo.patch \
+ "${FILESDIR}"/${P}-asneeded.patch
}
src_compile() {
diff --git a/net-irc/cwirc/files/cwirc-2.0.0-asneeded.patch b/net-irc/cwirc/files/cwirc-2.0.0-asneeded.patch
new file mode 100644
index 000000000000..462b63e44ea2
--- /dev/null
+++ b/net-irc/cwirc/files/cwirc-2.0.0-asneeded.patch
@@ -0,0 +1,29 @@
+--- cwirc-2.0.0.orig/Makefile 2009-10-15 22:54:05.388287074 +0200
++++ cwirc-2.0.0/Makefile 2009-10-15 22:55:32.084285919 +0200
+@@ -62,8 +62,8 @@
+ XCHAT_INC=-I$(XCHAT_PLUGIN_INCLUDE_PATH)
+ CFLAGS=-Wall -Wstrict-prototypes -O2 -D$(TARGET_OS)
+ GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
+-LDFLAGS=-lm ${EXTRA_LDFLAGS}
+-GTK_LDFLAGS=`pkg-config --libs gtk+-2.0`
++LIBS=-lm `pkg-config --libs-only-l gtk+-2.0`
++GTK_LDFLAGS=`pkg-config --libs-only-L gtk+-2.0`
+
+ all: missing_settings \
+ $(PLUGIN) \
+@@ -102,12 +102,12 @@
+ extension.o
+
+ $(PLUGIN): $(PLUGIN_OBJS)
+- $(CC) -shared $(LDFLAGS) -o $@ $(PLUGIN_OBJS)
++ $(CC) -shared $(LDFLAGS) -o $@ $(PLUGIN_OBJS) -lm
+ $(STRIP) $@
+
+ $(FRONTEND): $(FRONTEND_OBJS)
+- $(CC) $(LDFLAGS) $(GTK_LDFLAGS) -o $@ $(FRONTEND_OBJS)
+- $(STRIP) $@
++ $(CC) $(LDFLAGS) $(GTK_LDFLAGS) -o $@ $(FRONTEND_OBJS) $(LIBS)
++ $(STRIP) $@
+
+ plugin.shared.o: plugin.c \
+ $(XCHAT_PLUGIN_INCLUDE_PATH)/xchat-plugin.h \