Respect CC,CFLAGS, fix install paths, don't strip binaries. Simplify ebuild. Fixes bug 374805 by Diego Elio Pettenò <flameeyes@gentoo.org>

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 75 insertions, 8 deletions

diff --git a/sys-infiniband/rds-tools/ChangeLog b/sys-infiniband/rds-tools/ChangeLog
index d3bd890486ca..bc7ffc7a0b55 100644
--- a/sys-infiniband/rds-tools/ChangeLog
+++ b/sys-infiniband/rds-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-infiniband/rds-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/rds-tools/ChangeLog,v 1.2 2011/07/02 20:30:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/rds-tools/ChangeLog,v 1.3 2011/08/27 19:46:47 xarthisius Exp $
+
+  27 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> rds-tools-2.0.4.ebuild,
+  +files/rds-tools-2.0.4-qa.patch:
+  Respect CC,CFLAGS, fix install paths, don't strip binaries. Simplify ebuild.
+  Fixes bug 374805 by Diego Elio Pettenò <flameeyes@gentoo.org>
 
   02 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> rds-tools-2.0.4.ebuild:
   Add ~amd64-linux keywrod
diff --git a/sys-infiniband/rds-tools/files/rds-tools-2.0.4-qa.patch b/sys-infiniband/rds-tools/files/rds-tools-2.0.4-qa.patch
new file mode 100644
index 000000000000..0a8e1a575c4a
--- /dev/null
+++ b/sys-infiniband/rds-tools/files/rds-tools-2.0.4-qa.patch
@@ -0,0 +1,59 @@
+Respect CC,CFLAGS, fix install paths, don't strip binaries
+
+https://bugs.gentoo.org/show_bug.cgi?id=374805
+--- Makefile.in
++++ Makefile.in
+@@ -1,12 +1,15 @@
+-prefix		= $(DESTDIR)@prefix@
+-exec_prefix	= $(DESTDIR)@exec_prefix@
+-bindir		= $(DESTDIR)@bindir@
+-mandir		= $(DESTDIR)@mandir@
+-incdir		= $(DESTDIR)@includedir@
++bindir = @bindir@
++exec_prefix = @exec_prefix@
++includedir = @includedir@
++libdir = @libdir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++prefix = @prefix@
++INSTALL = /usr/bin/install
+ 
+ all: all-programs
+ 
+-CFLAGS = -O2 -Wall -Iinclude
++CFLAGS += -Wall -Iinclude
+ CPPFLAGS = -DDEBUG_EXE -DRDS_VERSION=\"@VERSION@\" -MD -MP -MF $(@D)/.$(basename $(@F)).d
+ 
+ HEADERS = kernel-list.h pfhack.h include/rds.h
+@@ -29,14 +32,14 @@
+ all-programs: $(PROGRAMS)
+ 
+ install: $(PROGRAMS)
+-	install -d $(bindir)
+-	install -m 555 -s $(PROGRAMS) $(bindir)
+-	install -d $(mandir)/man1
+-	install -d $(mandir)/man7
+-	install -m 644 *.1 $(mandir)/man1
+-	install -m 644 *.7 $(mandir)/man7
+-	install -d $(incdir)/net
+-	install -m 444 include/rds.h $(incdir)/net
++	$(INSTALL) -d $(DESTDIR)$(bindir)
++	$(INSTALL) -m 555 $(PROGRAMS) $(DESTDIR)$(bindir)
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man7
++	$(INSTALL) -m 644 *.1 $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -m 644 *.7 $(DESTDIR)$(mandir)/man7
++	$(INSTALL) -d $(DESTDIR)$(includedir)/net
++	$(INSTALL) -m 444 include/rds.h $(DESTDIR)$(includedir)/net
+ 
+ clean:
+ 	rm -f $(PROGRAMS) $(CLEAN_OBJECTS)
+@@ -47,7 +50,7 @@
+ 
+ 
+ $(PROGRAMS) : % : %.o $(COMMON_OBJECTS)
+-	gcc $(CFLAGS) $(LDFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ LOCAL_DFILES := $(wildcard .*.d)
+ ifneq ($(LOCAL_DFILES),)
diff --git a/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild b/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild
index a5076ab2fcee..035e3d07f1fe 100644
--- a/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild
+++ b/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild
@@ -1,23 +1,26 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild,v 1.2 2011/07/02 20:30:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild,v 1.3 2011/08/27 19:46:47 xarthisius Exp $
 
-EAPI="4"
+EAPI=4
 
 OFED_VER="1.5.3.1"
 OFED_SUFFIX="1"
 
-inherit openib
+inherit base openib toolchain-funcs
 
 DESCRIPTION="OpenIB userspace rds-tools"
+
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}
-		!sys-infiniband/openib-userspace"
+	!sys-infiniband/openib-userspace"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}"/${P}-qa.patch )
 
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README
+pkg_setup() {
+	tc-export CC
 }