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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 54 insertions, 12 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/Manifest b/sys-libs/libhugetlbfs/Manifest
index 201ac9b61980..163df44743f4 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 RMD160 af0851949f0f90a668cf0312d6776cbeb9468643 SHA1 f3ff80fb584da46d0572dce303caab3823280fcd SHA256 60d0e4a9a3a99e7ceab04f1479e6893403d43cb50bb740e8f2f632b05a2ec523
 AUX libhugetlbfs-2.6-noexec-stack.patch 1497 RMD160 1e776f4fda19798084dd5bcc6872a15fd543b1d5 SHA1 cff4e5a2dbabe1b3fde7c73cb663ae87ef70362d SHA256 24de0b668c25568b70c705dbd3e1533c6358ad774ee96720b963ab7cd5226f2f
+AUX libhugetlbfs-2.9-build.patch 1163 RMD160 bffb529ec754a7b6e72707bded9a03df6fc66623 SHA1 0586bd31371677edf8a5161af9a750791d96781d SHA256 7814841600b4cbaa67d041e61a42e81c243f73f3d689b09d23744e9c943c0f78
 DIST libhugetlbfs-2.6.tar.gz 148202 RMD160 541d98c6c5828ec57dc374657596ea1cac8b141e SHA1 eec97b9ae34bce559f7eaf977eeb215359cca141 SHA256 6195fdecee0b370d8a82c76a6c2a5b9892e547de319d8a7f52138a796505e890
 DIST libhugetlbfs-2.9.tar.gz 167149 RMD160 1329327d9a41aa0c09315809f7e683a4dfe2c5e2 SHA1 84ccceda582b01f4f9fd857e4d3aee003f593236 SHA256 8f2adfb85ef5cf83b6024f4249514751901cfea0bb663b7812eac07cae8e8623
 EBUILD libhugetlbfs-2.6.ebuild 3882 RMD160 4b2778b5f41099cdb5caed3d916903f9c1486bfa SHA1 09047d9b220caed1d147984170d058b741f3c908 SHA256 e0778c70402b5b687d19f60dc1f8416478850293cb066d3521ff046ec2b61a27
-EBUILD libhugetlbfs-2.9.ebuild 3882 RMD160 88967bc7e4ae226ed0823a50d2fd1c2c62141032 SHA1 236c0d1b7f942a2cf093d1aba86b33cf0e768854 SHA256 c057f7403e6ea314cb8ca09cf8a65010ff8d328ab05f396515b7f0571a3f591e
-MISC ChangeLog 1117 RMD160 3fb1aaec1de0c21b1543898761f12850fadaf082 SHA1 28da86aa50bc400f812a4b488a71a772c2a10696 SHA256 f8a0ff2fb1d75a5584a52af28c7f20dbe31685ef47faf9ff492323cedbea4bb5
+EBUILD libhugetlbfs-2.9.ebuild 3908 RMD160 885a743179ec4fe67ce6727f04c42d678a1c3245 SHA1 9f7d6b1c4a35cdb7eeef72a8fac147213c4d77f8 SHA256 6829bfb112e50158153889785923d6e7a6cc3cebb8a06ccdba1a559366e92012
+MISC ChangeLog 1302 RMD160 495ef89ac5703bbdf6d6124063aab7b69836ba86 SHA1 4ed2bf44d625aa98e0067288bc0c3790bc4d2786 SHA256 4a0824ff934199dca1ee196a7f9387634a57d4ced30662c2aa026b49d42e0f18
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkxl4JkACgkQTwhj9JtAlp6QqAD+N+F9xL2kyOnlOdc+0fNGExiI
+ll/NHirFpYQIvk0XOvEBAJVISfVeP6YN7ls+tazgbli+Uqf6LgTAbZnRaDqCi5DN
+=TL4k
+-----END PGP SIGNATURE-----
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() {