dont use ldflags to link to libraries, bug #226899

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)

4 files changed, 50 insertions, 14 deletions

diff --git a/media-sound/rawrec/ChangeLog b/media-sound/rawrec/ChangeLog
index 059be4d823da..29f13635fa3e 100644
--- a/media-sound/rawrec/ChangeLog
+++ b/media-sound/rawrec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rawrec
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rawrec/ChangeLog,v 1.13 2007/06/10 13:28:51 drac Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rawrec/ChangeLog,v 1.14 2008/07/12 09:14:53 aballier Exp $
+
+  12 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/rawrec-libs.patch, rawrec-0.9.98.ebuild, rawrec-0.9.991.ebuild:
+  dont use ldflags to link to libraries, bug #226899
 
 *rawrec-0.9.991 (10 Jun 2007)
 
diff --git a/media-sound/rawrec/files/rawrec-libs.patch b/media-sound/rawrec/files/rawrec-libs.patch
new file mode 100644
index 000000000000..c894c5ba692d
--- /dev/null
+++ b/media-sound/rawrec/files/rawrec-libs.patch
@@ -0,0 +1,22 @@
+Index: src/Makefile
+===================================================================
+--- src.orig/Makefile
++++ src/Makefile
+@@ -19,7 +19,7 @@ OPTFLAGS = -O2
+ CFLAGS = $(WARNFLAGS) $(OPTFLAGS) $(DEBUGFLAGS) -DUSEBUFFLOCK \
+          $(FANCY_THREAD_DEFINES) -D_REENTRANT -D_GNU_SOURCE \
+          -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+-LDFLAGS = -lm -lpthread
++LIBS = -lm -lpthread
+ 
+ # The GNU way is just too painful.  I'm not writing three tiers of
+ # variables just to get to /usr/local/man/man1.  If it starts to seem 
+@@ -35,7 +35,7 @@ MAN_DIR = /usr/local/man/man1
+ all: $(PROG) $(ALT_INVOC)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(OBJS) $(LDFLAGS) -o $(PROG)
++	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG) $(LIBS)
+ 
+ # Everything is rebuilt if this Makefile (which is hopefully named
+ # "Makefile") or any header changes.
diff --git a/media-sound/rawrec/rawrec-0.9.98.ebuild b/media-sound/rawrec/rawrec-0.9.98.ebuild
index db25d0d8599a..f5f9423fb735 100644
--- a/media-sound/rawrec/rawrec-0.9.98.ebuild
+++ b/media-sound/rawrec/rawrec-0.9.98.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rawrec/rawrec-0.9.98.ebuild,v 1.13 2007/02/13 10:55:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rawrec/rawrec-0.9.98.ebuild,v 1.14 2008/07/12 09:14:53 aballier Exp $
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs eutils
 
 IUSE=""
 
@@ -16,9 +16,14 @@ KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 S=${S}/src
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-libs.patch"
+}
+
 src_compile() {
-	append-ldflags -lm -lpthread
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
diff --git a/media-sound/rawrec/rawrec-0.9.991.ebuild b/media-sound/rawrec/rawrec-0.9.991.ebuild
index 03667ec16314..e0e8de9394ef 100644
--- a/media-sound/rawrec/rawrec-0.9.991.ebuild
+++ b/media-sound/rawrec/rawrec-0.9.991.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rawrec/rawrec-0.9.991.ebuild,v 1.1 2007/06/10 13:28:51 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rawrec/rawrec-0.9.991.ebuild,v 1.2 2008/07/12 09:14:53 aballier Exp $
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="CLI program to play and record audiofiles."
 HOMEPAGE="http://rawrec.sourceforge.net"
@@ -15,14 +15,19 @@ IUSE=""
 
 S="${S}"/src
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-libs.patch"
+}
+
 src_compile() {
-	append-ldflags -lm -lpthread
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed."
+	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed."
 }
 
 src_install() {
-	emake EXE_DIR=${D}/usr/bin \
-		MAN_DIR=${D}/usr/share/man/man1 install || die "emake install failed."
+	emake EXE_DIR="${D}/usr/bin" \
+		MAN_DIR="${D}/usr/share/man/man1" install || die "emake install failed."
 
 	einfo "Removing SUID from binary.."
 	fperms 755 /usr/bin/rawrec