diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-01-28 19:32:19 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-01-28 19:32:19 +0000 |
| commit | 6d86463d9dec4d33c71bd695f227c925f5941573 (patch) | |
| tree | 5a616ae784d6fca49d26940ca0a55840e9dbecc4 /net-irc | |
| parent | [bump] dev-perl/IO-Socket-SSL-1.820.0 (diff) | |
| download | gentoo-2-6d86463d9dec4d33c71bd695f227c925f5941573.tar.gz gentoo-2-6d86463d9dec4d33c71bd695f227c925f5941573.tar.bz2 gentoo-2-6d86463d9dec4d33c71bd695f227c925f5941573.zip | |
Do not remove "duplicate" CFLAGS args. Respect LDFLAGS.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/bitchx/ChangeLog | 6 | ||||
| -rw-r--r-- | net-irc/bitchx/bitchx-1.2.ebuild | 11 | ||||
| -rw-r--r-- | net-irc/bitchx/files/bitchx-1.2-build.patch | 21 |
3 files changed, 34 insertions, 4 deletions
diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog index fb33d9b4438f..d4b3dc8c5f60 100644 --- a/net-irc/bitchx/ChangeLog +++ b/net-irc/bitchx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-irc/bitchx # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.72 2013/01/28 17:06:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.73 2013/01/28 19:32:19 jer Exp $ + + 28 Jan 2013; Jeroen Roovers <jer@gentoo.org> bitchx-1.2.ebuild, + files/bitchx-1.2-build.patch: + Do not remove "duplicate" CFLAGS args. Respect LDFLAGS. 28 Jan 2013; Jeroen Roovers <jer@gentoo.org> bitchx-1.2.ebuild: Restore missing keywords (bug #425634). Fix quoting issue. diff --git a/net-irc/bitchx/bitchx-1.2.ebuild b/net-irc/bitchx/bitchx-1.2.ebuild index fa59119f3093..dca5a9f9e62a 100644 --- a/net-irc/bitchx/bitchx-1.2.ebuild +++ b/net-irc/bitchx/bitchx-1.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.2.ebuild,v 1.2 2013/01/28 17:06:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.2.ebuild,v 1.3 2013/01/28 19:32:19 jer Exp $ EAPI=4 -inherit flag-o-matic eutils +inherit autotools eutils flag-o-matic MY_PN=BitchX MY_P=${MY_PN}-${PV}-final @@ -25,12 +25,17 @@ RDEPEND="${DEPEND}" src_prepare() { sed -i \ -e "s/#undef LATIN1/#define LATIN1 ON/;" \ - include/config.h + include/config.h || die epatch "${FILESDIR}"/${P}-build.patch # Do epatch_user since even BX-1.2 has A LOT of patches and A LOT # of behaviour controlled by manually editing config.h epatch_user + + sed -i \ + -e 's|$(SHLIB_LD)|& $(LDFLAGS)|g' \ + dll/*/Makefile.in || die + eautoreconf } src_configure() { diff --git a/net-irc/bitchx/files/bitchx-1.2-build.patch b/net-irc/bitchx/files/bitchx-1.2-build.patch index 3335bde25b7b..4d8bdbd9cc21 100644 --- a/net-irc/bitchx/files/bitchx-1.2-build.patch +++ b/net-irc/bitchx/files/bitchx-1.2-build.patch @@ -63,3 +63,24 @@ index 83b4fd9..00d7059 100644 $(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR) - $(INSTALL) $(srcdir)/BitchX.hints $(DESTDIR)$(PLUGINDIR)/@HINT_FILE@ + $(INSTALL_DATA) $(srcdir)/BitchX.hints $(DESTDIR)$(PLUGINDIR)/@HINT_FILE@ +--- a/configure.in ++++ b/configure.in +@@ -993,18 +993,6 @@ + done + LIBS="$NEW_LIBS" + +-NEW_CFLAGS="" +-for CFLAG_IN in $CFLAGS; do +- for CFLAG_OUT in $NEW_CFLAGS; do +- if test x"$CFLAG_OUT" = x"$CFLAG_IN"; then +- CFLAG_IN="" +- break +- fi +- done +- NEW_CFLAGS="$NEW_CFLAGS $CFLAG_IN" +-done +-CFLAGS="$NEW_CFLAGS" +- + RM="rm -f" + CP="cp -f" + MV="mv -f" |