summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2009-01-04 15:09:36 +0000
committerChristoph Mende <angelos@gentoo.org>2009-01-04 15:09:36 +0000
commitc4c4c89301dd26d75d08b8d64ae3b888e3377211 (patch)
treefb9933d6a9f308ba65eeba7f280b1f69b99b7dd0 /app-text/cwtext
parentFix missing kde4-base_src_prepare call. (diff)
downloadhistorical-c4c4c89301dd26d75d08b8d64ae3b888e3377211.tar.gz
historical-c4c4c89301dd26d75d08b8d64ae3b888e3377211.tar.bz2
historical-c4c4c89301dd26d75d08b8d64ae3b888e3377211.zip
QA: Fix compilation with --as-needed (bug 246958), respect LDFLAGS
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64
Diffstat (limited to 'app-text/cwtext')
-rw-r--r--app-text/cwtext/ChangeLog8
-rw-r--r--app-text/cwtext/Manifest15
-rw-r--r--app-text/cwtext/cwtext-0.94.ebuild19
-rw-r--r--app-text/cwtext/files/cwtext-0.94-asneeded.patch19
4 files changed, 46 insertions, 15 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/Manifest b/app-text/cwtext/Manifest
index 9f4975f85e4b..9e0ef2695c88 100644
--- a/app-text/cwtext/Manifest
+++ b/app-text/cwtext/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cwtext-0.94-asneeded.patch 525 RMD160 6c0f4fcc88c84364e5af7e603227ceec6d899f7d SHA1 a0ccdf6c93ac6b92391a941edc89e144dd4cfa65 SHA256 866c36048048815c99c7b6ece57245a6369f8cc01d9d5c4bb5e8e85e2e5dc493
DIST cwtext-0.94.tar.gz 12957 RMD160 5b7f78dd84665850de383489df20a8c4b1428a96 SHA1 ad2dc3002cbb977d8b735680820d4264bb7cc184 SHA256 7aa753003e055b2a1edddf353db1553a247dd0aaa7d269d293b809f636ba2cbe
-EBUILD cwtext-0.94.ebuild 737 RMD160 3dde4c0c7b4be88065dbe519d17ea34636252c6d SHA1 fa0bc9cf50a71eea83c2851654cabe86ff92c4fb SHA256 4d8965863dc8d97be425fda680004cef303c26f236ec1f637be893ae313a5fce
-MISC ChangeLog 1705 RMD160 5630ff98f3a1431a789b992489e7cfa8be1a6865 SHA1 72f7a24e5b9772be9385fa2d3d9af754d8c0aaa8 SHA256 88e04896fd311df008e6788022c780f8f2d568711641a280b978773319d0e36b
+EBUILD cwtext-0.94.ebuild 766 RMD160 8a194bd215710ae40c4309f01df6e61a7d219c3b SHA1 adc2659551abd40385bbe9d92646ac5de6768dcb SHA256 040b2ced47340ad13940ccbd13d3444592fc84c2ced2c7016b9d1844d3829833
+MISC ChangeLog 1884 RMD160 4f6dddf03224b57b5176d2e255a33df4b4a3177a SHA1 6407df35e2924a57952ebefd50d8d26731ae1c39 SHA256 34e412c4fabc85286dedd34306e520eab53e6110e0778f9c98d796d2ab8de6da
MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklg0TYACgkQKhnDs22gwa8LNwCg3avzThooGs74nRDAmm+j7Zmd
+yfsAn33j3lFL2aNng/5qGqAM5MKqffJa
+=dbFS
+-----END PGP SIGNATURE-----
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