QA: Fixed compilation with --as-needed (bug 246951), respect CC (bug 243706), respect LDFLAGS

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

3 files changed, 58 insertions, 8 deletions

diff --git a/app-shells/rrs/ChangeLog b/app-shells/rrs/ChangeLog
index eab1bd2c1f32..4fa820e28bee 100644
--- a/app-shells/rrs/ChangeLog
+++ b/app-shells/rrs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/rrs
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/ChangeLog,v 1.13 2008/08/23 18:30:46 maekke Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/ChangeLog,v 1.14 2009/01/03 14:07:29 angelos Exp $
+
+  03 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +files/rrs-1.70-asneeded.patch, rrs-1.70.ebuild:
+  QA: Fixed compilation with --as-needed (bug 246951), respect CC (bug
+  243706), respect LDFLAGS
 
   23 Aug 2008; Markus Meier <maekke@gentoo.org> rrs-1.70.ebuild:
   add ~amd64, bug #235414
diff --git a/app-shells/rrs/files/rrs-1.70-asneeded.patch b/app-shells/rrs/files/rrs-1.70-asneeded.patch
new file mode 100644
index 000000000000..9ed9ee16fbee
--- /dev/null
+++ b/app-shells/rrs/files/rrs-1.70-asneeded.patch
@@ -0,0 +1,38 @@
+--- Makefile.orig	2004-05-30 02:14:14.000000000 +0200
++++ Makefile	2009-01-03 15:02:19.253460887 +0100
+@@ -8,8 +8,8 @@
+ # if your system doesn't have GNU's getopt_long(), add -DWITHOUT_GNU_GETOPT
+ CFLAGS=-I/usr/local/include -Wall -O2
+ # openpty() is in libutil on most Unix-like operating systems
+-LDFLAGS=-L/usr/local/lib -s -lstdc++ -lm -lutil -lssl -lcrypto
+-LDFLAGSNOSSL=-s -lstdc++ -lm -lutil
++LDFLAGS=-L/usr/local/lib -lstdc++ -lm -lutil -lssl -lcrypto
++LDFLAGSNOSSL=-lstdc++ -lm -lutil
+ 
+ PREFIX=/usr/local
+ BINDIR=bin
+@@ -36,9 +36,9 @@
+ generic-nossl: clean compile-generic-nossl
+ 
+ qnx: clean
+-	$(MAKE) LDFLAGS="-L/usr/local/lib -s -lsocket -lssl -lcrypto" compile-qnx
++	$(MAKE) LDFLAGS="-L/usr/local/lib -lsocket -lssl -lcrypto" compile-qnx
+ qnx-nossl: clean
+-	$(MAKE) LDFLAGSNOSSL="-s -lsocket" compile-qnx-nossl
++	$(MAKE) LDFLAGSNOSSL="-lsocket" compile-qnx-nossl
+ 
+ distclean: clean
+ 
+@@ -47,10 +47,10 @@
+ 
+ ## generic
+ compile-generic:
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(LDEXTRA) -o $(out) rrs.c md5.c sha1.c farm9crypt.cc twofish2.cc
++	$(CC) $(CFLAGS) $(LDEXTRA) -o $(out) rrs.c md5.c sha1.c farm9crypt.cc twofish2.cc $(LDFLAGS)
+ 
+ compile-generic-nossl:
+-	$(CC) -DWITHOUT_SSL $(CFLAGS) $$CFLAGS $(LDFLAGSNOSSL) $(LDEXTRA) -o $(out) rrs.c md5.c sha1.c farm9crypt.cc twofish2.cc
++	$(CC) -DWITHOUT_SSL $(CFLAGS) $$CFLAGS $(LDEXTRA) -o $(out) rrs.c md5.c sha1.c farm9crypt.cc twofish2.cc $(LDFLAGSNOSSL)
+ 
+ ## qnx
+ compile-qnx:
diff --git a/app-shells/rrs/rrs-1.70.ebuild b/app-shells/rrs/rrs-1.70.ebuild
index cc13f9b44ae5..6fbbaf30b570 100644
--- a/app-shells/rrs/rrs-1.70.ebuild
+++ b/app-shells/rrs/rrs-1.70.ebuild
@@ -1,6 +1,8 @@
-# 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-shells/rrs/rrs-1.70.ebuild,v 1.8 2008/08/23 18:30:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/rrs-1.70.ebuild,v 1.9 2009/01/03 14:07:29 angelos Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Reverse Remote Shell"
 HOMEPAGE="http://www.cycom.se/dl/rrs"
@@ -11,16 +13,21 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="ssl"
 
-DEPEND="ssl? ( dev-libs/openssl )
-	virtual/libc"
+DEPEND="ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
 
 src_compile() {
 	local target=""
 	use ssl || target="-nossl"
 
 	sed -i -e "s/-s //g" Makefile
-	emake generic${target} \
-		CFLAGS="${CFLAGS}" || die "emake failed"
+	emake generic${target} CFLAGS="${CFLAGS}" LDEXTRA="${LDFLAGS}" \
+		CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {