media-radio/unixcw: Fix ignored LDFLAGS and --as-needed problems

svn path=/sunrise/; revision=8862

5 files changed, 69 insertions, 3 deletions

diff --git a/media-radio/unixcw/ChangeLog b/media-radio/unixcw/ChangeLog
index 24e134041..7a9509462 100644
--- a/media-radio/unixcw/ChangeLog
+++ b/media-radio/unixcw/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jul 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  unixcw-2.3-r1.ebuild, +files/unixcw-2.3--as-needed.patch,
+  +files/unixcw-2.3-ldflags.patch:
+  Fix ignored LDFLAGS and --as-needed problems
+
   20 Jul 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
   unixcw-2.3-r1.ebuild, +files/unixcw-2.3-parallel-make.patch:
   Fix parallel make issue
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index 26b372602..cb78daa2b 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,7 +1,9 @@
+AUX unixcw-2.3--as-needed.patch 527 RMD160 47d2b22e6c8b211abae913e32576408a6a2c8a69 SHA1 ffae50431bc25e4b4b9f9264c0aef44300a82316 SHA256 b72add7559a0a9df10adc0efa885377ac02ccc2fa840366c1185cbb2485c35e8
 AUX unixcw-2.3-config.patch 1651 RMD160 fc7d2be6f85f60bb841a2c703d303c293af3e6a0 SHA1 69bdd9a053828c8f9548ab73279fd0919445cb7d SHA256 99b79225693636327841948408cc5b7289a39c5ca89bc26c55a08743eb42c8cb
 AUX unixcw-2.3-destdir.patch 420 RMD160 e51ea34244dca4a8fb62d87cd2186280e7ad2263 SHA1 4ef438bf681d5ef31c47113b7eb0227db6a5dc02 SHA256 beb45ffca273ec6ee55484234a808fde7973643de8bd943fd2db6eac45d14bf0
+AUX unixcw-2.3-ldflags.patch 1440 RMD160 d198c5325152b93822a0a3d59516b48c7b6d53f2 SHA1 741a61a083d350d84743f6cde9c18923c7d2acb5 SHA256 41d40ceb0accb8c971bbc69eb00d7c17aa2d62ed8d907d46a310f3ec3b6ff662
 AUX unixcw-2.3-parallel-make.patch 847 RMD160 79664f4fa7f254ef9752df45b018347997fd67e6 SHA1 1440b3012e2482d24d687d83b45871754fab1c87 SHA256 feeb5517239b759e32e0f0d9bdea6882dae1fb924ebcbadec474c66f9480e6a1
 DIST unixcw-2.3.tgz 202048 RMD160 1ba7944d7a7fc92adf7ed1a83d706546e9eaa8be SHA1 2aece1e4b0660618537a94561344dd97026b7924 SHA256 124c60c6c7ef596a7c96c94a0e76204c7d986373564121155f0f206ad71f30a0
-EBUILD unixcw-2.3-r1.ebuild 880 RMD160 d211dcd3db84a51cc4c1bd36c7484619e1b2b161 SHA1 bd5ec4bf221970bcf8eb7fab2ef58dfe3209240b SHA256 2cce41e6c0a5341e6e4f3302baa981710b55eaf1439cf012a207b1025b689de1
-MISC ChangeLog 761 RMD160 17b9c0de4d87b15d92957a2852e5a8fc5bb77c22 SHA1 85195fe5942c295af46fa53249a9f73661e393d7 SHA256 6843b33a166339cc23bfa55c88231f6ed1dc9ad57a281326bd0f85cf6b54fd0f
+EBUILD unixcw-2.3-r1.ebuild 957 RMD160 604a146003696225a2b0ad940d5137f38e733189 SHA1 e73d85482c8097486b4b436f6ef82e528ade9bdd SHA256 204d51debba65f3be43e24b9ca65ef4eafb016070faa0b7c79a706eb7cdd0fe8
+MISC ChangeLog 962 RMD160 aa23cdb671fd8d06a5301624b72d8be3fa1fc398 SHA1 06f69d50142f0ef7fbbd4c6008ef1e947b2f80d0 SHA256 8c5ffd47dfc45a2426db752c4afb023418475751d13542a2f0f52938e41058a2
 MISC metadata.xml 814 RMD160 c9b54021d4fad06a16d4cbf3a264fc2933cf8ee5 SHA1 35b1c62f63111e44d58ba3af19ea6449eaae4b5f SHA256 744881de9bf96a2c3013846d8fe954743ad55d2889f720b3b63d6091910c50d0
diff --git a/media-radio/unixcw/files/unixcw-2.3--as-needed.patch b/media-radio/unixcw/files/unixcw-2.3--as-needed.patch
new file mode 100644
index 000000000..ae96329b8
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-2.3--as-needed.patch
@@ -0,0 +1,16 @@
+--- src/cwlib/Makefile.orig	2009-07-21 06:34:13.000000000 +0000
++++ src/cwlib/Makefile	2009-07-21 06:34:39.000000000 +0000
+@@ -43,11 +43,11 @@
+ libcw.so.0.0.0: cwlib.o
+ 	if [ "$(CC_LINKS_SO)" = "yes" ]; then				\
+ 		$(CC) -shared -Wl,-soname,libcw.so.0			\
+-			-o libcw.so.0.0.0 cwlib.o;			\
++			-o libcw.so.0.0.0 cwlib.o -lm;			\
+ 	else								\
+ 		if [ "$(LD_LINKS_SO)" = "yes" ]; then			\
+ 			$(LD) -G -Wl,-soname,libcw.so.0			\
+-				-o libcw.so.0.0.0 cwlib.o;		\
++				-o libcw.so.0.0.0 cwlib.o -lm;		\
+ 		fi							\
+ 	fi
+ 
diff --git a/media-radio/unixcw/files/unixcw-2.3-ldflags.patch b/media-radio/unixcw/files/unixcw-2.3-ldflags.patch
new file mode 100644
index 000000000..bbd1c7402
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-2.3-ldflags.patch
@@ -0,0 +1,41 @@
+diff -u -r src.orig/cw/Makefile src/cw/Makefile
+--- src.orig/cw/Makefile	2009-07-21 15:08:34.000000000 +0200
++++ src/cw/Makefile	2009-07-21 15:09:16.000000000 +0200
+@@ -34,7 +34,7 @@
+ cw.o: cw.c ../cwlib/cwlib.h
+ 
+ cw: cw.o
+-	$(CC) -o $@ cw.o ../cwutils/i18n.o ../cwutils/cmdline.o	\
++	$(CC) $(LDFLAGS) -o $@ cw.o ../cwutils/i18n.o ../cwutils/cmdline.o	\
+ 	../cwutils/memory.o $(LIBS) -lm
+ 
+ # Install targets.
+diff -u -r src.orig/cwgen/Makefile src/cwgen/Makefile
+--- src.orig/cwgen/Makefile	2009-07-21 15:08:34.000000000 +0200
++++ src/cwgen/Makefile	2009-07-21 15:09:34.000000000 +0200
+@@ -32,7 +32,7 @@
+ cwgen.o: cwgen.c
+ 
+ cwgen: cwgen.o
+-	$(CC) -o $@ cwgen.o ../cwutils/i18n.o ../cwutils/cmdline.o \
++	$(CC) $(LDFLAGS) -o $@ cwgen.o ../cwutils/i18n.o ../cwutils/cmdline.o \
+ 	../cwutils/memory.o
+ 
+ # Install targets.
+diff -u -r src.orig/cwlib/Makefile src/cwlib/Makefile
+--- src.orig/cwlib/Makefile	2009-07-21 15:14:58.000000000 +0200
++++ src/cwlib/Makefile	2009-07-21 15:15:25.000000000 +0200
+@@ -42,11 +42,11 @@
+ 
+ libcw.so.0.0.0: cwlib.o
+ 	if [ "$(CC_LINKS_SO)" = "yes" ]; then				\
+-		$(CC) -shared -Wl,-soname,libcw.so.0			\
++		$(CC) $(LDFLAGS) -shared -Wl,-soname,libcw.so.0			\
+ 			-o libcw.so.0.0.0 cwlib.o -lm;			\
+ 	else								\
+ 		if [ "$(LD_LINKS_SO)" = "yes" ]; then			\
+-			$(LD) -G -Wl,-soname,libcw.so.0			\
++			$(LD) $(LDFLAGS) -G -Wl,-soname,libcw.so.0			\
+ 				-o libcw.so.0.0.0 cwlib.o -lm;		\
+ 		fi							\
+ 	fi
diff --git a/media-radio/unixcw/unixcw-2.3-r1.ebuild b/media-radio/unixcw/unixcw-2.3-r1.ebuild
index 75a83b054..b6dd46ef1 100644
--- a/media-radio/unixcw/unixcw-2.3-r1.ebuild
+++ b/media-radio/unixcw/unixcw-2.3-r1.ebuild
@@ -22,7 +22,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-destdir.patch \
 		"${FILESDIR}"/${P}-config.patch \
-		"${FILESDIR}"/${P}-parallel-make.patch
+		"${FILESDIR}"/${P}-parallel-make.patch \
+		"${FILESDIR}"/${P}--as-needed.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 	eautoreconf
 }