Respect user LDFLAGS when linking apps #332517 by Diego E. Pettenò.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 41 insertions, 10 deletions

diff --git a/sys-libs/libhugetlbfs/ChangeLog b/sys-libs/libhugetlbfs/ChangeLog
index a89c06e9f00c..3a34ff8b2ea2 100644
--- a/sys-libs/libhugetlbfs/ChangeLog
+++ b/sys-libs/libhugetlbfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libhugetlbfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/ChangeLog,v 1.5 2010/08/04 06:55:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/ChangeLog,v 1.6 2010/08/14 00:15:25 vapier Exp $
+
+  14 Aug 2010; Mike Frysinger <vapier@gentoo.org> libhugetlbfs-2.9.ebuild,
+  +files/libhugetlbfs-2.9-build.patch:
+  Respect user LDFLAGS when linking apps #332517 by Diego E. Pettenò.
 
 *libhugetlbfs-2.9 (04 Aug 2010)
 
diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch
new file mode 100644
index 000000000000..827e2a58d101
--- /dev/null
+++ b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.9-build.patch
@@ -0,0 +1,31 @@
+--- Makefile.orig	2010-08-13 20:14:18.000000000 -0400
++++ Makefile	2010-08-13 20:14:42.000000000 -0400
+@@ -314,24 +314,24 @@
+ $(BIN_OBJ_DIR)/hugectl: $(BIN_OBJ_DIR)/hugectl.o
+ 	@$(VECHO) LDHOST $@
+ 	mkdir -p $(BIN_OBJ_DIR)
+-	$(CCBIN) $(CPPFLAGS) $(CFLAGS) -o $@ $^
++	$(CCBIN) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ $(BIN_OBJ_DIR)/hugeedit: $(BIN_OBJ_DIR)/hugeedit.o
+ 	@$(VECHO) LDHOST $@
+ 	mkdir -p $(BIN_OBJ_DIR)
+-	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^
++	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ $(LDFLAGS)
+ 
+ HUGEADM_OBJ=hugeadm.o libhugetlbfs_privutils.a
+ $(BIN_OBJ_DIR)/hugeadm: $(foreach file,$(HUGEADM_OBJ),$(BIN_OBJ_DIR)/$(file))
+ 	@$(VECHO) LDHOST $@
+ 	mkdir -p $(BIN_OBJ_DIR)
+-	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^
++	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ $(LDFLAGS)
+ 
+ PAGESIZE_OBJ=pagesize.o libhugetlbfs_privutils.a
+ $(BIN_OBJ_DIR)/pagesize: $(foreach file,$(PAGESIZE_OBJ),$(BIN_OBJ_DIR)/$(file))
+ 	@$(VECHO) LDHOST $@
+ 	mkdir -p $(BIN_OBJ_DIR)
+-	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^
++	$(CCBIN) $(CPPFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $^ $(LDFLAGS)
+ 
+ clean:
+ 	@$(VECHO) CLEAN
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.9.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.9.ebuild
index 4404446674ae..df067142b9c8 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.9.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.9.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/libhugetlbfs-2.9.ebuild,v 1.1 2010/08/04 06:55:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/libhugetlbfs-2.9.ebuild,v 1.2 2010/08/14 00:15:25 vapier Exp $
+
+EAPI="2"
 
-EAPI=2
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="easy hugepage access"
@@ -14,9 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
-DEPEND=""
-
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.9-build.patch #332517
 	epatch "${FILESDIR}"/${PN}-2.6-noexec-stack.patch
 	epatch "${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
 	sed -i \
@@ -33,10 +33,6 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
-	:
-}
-
 src_compile() {
 	tc-export AR CC
 	emake libs tools || die
@@ -45,7 +41,7 @@ src_compile() {
 src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc HOWTO NEWS README
-	rm "${D}"/usr/bin/oprofile*
+	rm "${D}"/usr/bin/oprofile* || die
 }
 
 src_test_alloc_one() {