diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2009-01-04 15:09:36 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2009-01-04 15:09:36 +0000 |
| commit | 069711bc5afa5be46437a1e39046ab7de86f667e (patch) | |
| tree | 1f2f8ca0b2ddf06b70ed6b6977e79d8540af58f1 /app-text/cwtext | |
| parent | Fix missing kde4-meta_src_prepare call. (diff) | |
| download | gentoo-2-069711bc5afa5be46437a1e39046ab7de86f667e.tar.gz gentoo-2-069711bc5afa5be46437a1e39046ab7de86f667e.tar.bz2 gentoo-2-069711bc5afa5be46437a1e39046ab7de86f667e.zip | |
QA: Fix compilation with --as-needed (bug 246958), respect LDFLAGS
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'app-text/cwtext')
| -rw-r--r-- | app-text/cwtext/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/cwtext/cwtext-0.94.ebuild | 19 | ||||
| -rw-r--r-- | app-text/cwtext/files/cwtext-0.94-asneeded.patch | 19 |
3 files changed, 33 insertions, 13 deletions
diff --git a/app-text/cwtext/ChangeLog b/app-text/cwtext/ChangeLog index 1358f65f2b9e..6af38d8b507d 100644 --- a/app-text/cwtext/ChangeLog +++ b/app-text/cwtext/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/cwtext -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/cwtext/ChangeLog,v 1.15 2008/04/07 20:18:14 armin76 Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/cwtext/ChangeLog,v 1.16 2009/01/04 15:09:35 angelos Exp $ + + 04 Jan 2009; Christoph Mende <angelos@gentoo.org> + +files/cwtext-0.94-asneeded.patch, cwtext-0.94.ebuild: + QA: Fix compilation with --as-needed (bug 246958), respect LDFLAGS 07 Apr 2008; Raúl Porcel <armin76@gentoo.org> cwtext-0.94.ebuild: Some fixes and sparc stable, thanks to Tiago Cunha diff --git a/app-text/cwtext/cwtext-0.94.ebuild b/app-text/cwtext/cwtext-0.94.ebuild index 8bdc5e14f4ce..81cd6a298526 100644 --- a/app-text/cwtext/cwtext-0.94.ebuild +++ b/app-text/cwtext/cwtext-0.94.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/cwtext/cwtext-0.94.ebuild,v 1.13 2008/04/07 20:18:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/cwtext/cwtext-0.94.ebuild,v 1.14 2009/01/04 15:09:35 angelos Exp $ -inherit toolchain-funcs +inherit eutils toolchain-funcs DESCRIPTION="Text to Morse Code converter" HOMEPAGE="http://cwtext.sourceforge.net" -SRC_URI="mirror://sourceforge/cwtext/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -KEYWORDS="amd64 mips ppc sparc x86" -SLOT="0" LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 mips ppc sparc x86" IUSE="" src_unpack() { @@ -21,15 +21,12 @@ src_unpack() { sed -i -e "/^PREFIX/ s:=.*:=\"${S}\":" makefile || \ die "sed makefile failed" + epatch "${FILESDIR}"/${P}-asneeded.patch tc-export CC } -src_compile() { - emake install || die -} - src_install() { - dobin cwtext cwpcm cwmm + dobin cwtext cwpcm cwmm || die "dobin failed" dodoc Changes README TODO } diff --git a/app-text/cwtext/files/cwtext-0.94-asneeded.patch b/app-text/cwtext/files/cwtext-0.94-asneeded.patch new file mode 100644 index 000000000000..ab0f16ee75b3 --- /dev/null +++ b/app-text/cwtext/files/cwtext-0.94-asneeded.patch @@ -0,0 +1,19 @@ +--- makefile.orig 2009-01-04 16:00:44.467365615 +0100 ++++ makefile 2009-01-04 16:02:16.338692800 +0100 +@@ -8,13 +8,13 @@ + install -sc cwmm ${PREFIX}/bin + + cwmm: cwmm.o morse.o +- ${CC} ${CFLAGS} -o cwmm $^ ++ ${CC} ${CFLAGS} $(LDFLAGS) -o cwmm $^ + + cwpcm: cwpcm.o morse.o pcm.o +- ${CC} ${CFLAGS} -o cwpcm -lm $^ ++ ${CC} ${CFLAGS} $(LDFLAGS) -o cwpcm $^ -lm + + cwtext: cwtext.o morse.o +- ${CC} ${CFLAGS} -o cwtext $^ ++ ${CC} ${CFLAGS} $(LDFLAGS) -o cwtext $^ + + cwpcm.o: cwpcm.c morse.h pcm.h + ${CC} ${CFLAGS} -c cwpcm.c |