diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-12-21 13:57:56 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-21 13:57:56 +0000 |
| commit | 84ce9061346106c8df2fd5daaebcc4241bd3ca4a (patch) | |
| tree | 9c1aa21a4b00dfa1acc26636ca11ff2a5994ecdf /net-irc | |
| parent | Restore more e* output style. (diff) | |
| download | gentoo-2-84ce9061346106c8df2fd5daaebcc4241bd3ca4a.tar.gz gentoo-2-84ce9061346106c8df2fd5daaebcc4241bd3ca4a.tar.bz2 gentoo-2-84ce9061346106c8df2fd5daaebcc4241bd3ca4a.zip | |
Fix building with -Wl,--as-needed wrt #248016 by Kacper Kowalik.
(Portage version: 2.2_rc59/cvs/Linux x86_64)
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/cwirc/ChangeLog | 6 | ||||
| -rw-r--r-- | net-irc/cwirc/cwirc-2.0.0.ebuild | 5 | ||||
| -rw-r--r-- | net-irc/cwirc/files/cwirc-2.0.0-asneeded.patch | 29 |
3 files changed, 37 insertions, 3 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/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 \ |