Respect user defined LDFLAGS (bug #337923)

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

4 files changed, 46 insertions, 19 deletions

diff --git a/sys-block/iscsi-initiator-core-tools/ChangeLog b/sys-block/iscsi-initiator-core-tools/ChangeLog
index 5e48f85b4305..65fa0b743beb 100644
--- a/sys-block/iscsi-initiator-core-tools/ChangeLog
+++ b/sys-block/iscsi-initiator-core-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/iscsi-initiator-core-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsi-initiator-core-tools/ChangeLog,v 1.6 2009/09/23 20:30:33 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsi-initiator-core-tools/ChangeLog,v 1.7 2010/09/27 11:46:12 cla Exp $
+
+  27 Sep 2010; Dawid Węgliński <cla@gentoo.org>
+  iscsi-initiator-core-tools-2.3.ebuild, +files/fix-ldflags.patch:
+  Respect user defined LDFLAGS (bug #337923)
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   iscsi-initiator-core-tools-2.3.ebuild:
diff --git a/sys-block/iscsi-initiator-core-tools/Manifest b/sys-block/iscsi-initiator-core-tools/Manifest
index 18a0f36f2646..c2857d0bc562 100644
--- a/sys-block/iscsi-initiator-core-tools/Manifest
+++ b/sys-block/iscsi-initiator-core-tools/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fix-ldflags.patch 960 RMD160 fb573b2a69c8dcc65cc473a7259d29ab6634f6e1 SHA1 3f155fe2d3dc43f45ff34055c0e04337fa731191 SHA256 da6c6e7c39c8b9223c7a6c9d51197bc483eeee68c1a76b4ad0aa1871af4c71a6
 DIST iscsi-initiator-core-tools-2.3.tar.bz2 51623 RMD160 d3ca4706c27ce8e0e30130f1e3a54966b5047123 SHA1 ce47747b2922eb302916f592f193d657506e5f5d SHA256 87c1dbf6637bfd3b50ce55902b1884db9db54b2080272b80c3f0541e6f285f8d
-EBUILD iscsi-initiator-core-tools-2.3.ebuild 1420 RMD160 5e9d05a6a1b5b10969e4383b28329d58bc7a1c1e SHA1 ad7fa9cc4bbe544ab9decad4b21a0650541dae68 SHA256 19f88180645e80f24b7d20da46bd4b99bfdb033bd5dbc51c9418cc808f09589b
-MISC ChangeLog 1244 RMD160 9a44cbf237a863076ad8a9e4431a92b25be76101 SHA1 219c28a3f851bca12b8ffa468429e4122a7fd51b SHA256 238cb100283de097168da9491526e1f0d16f4e5d5529199a94813140f64d0883
+EBUILD iscsi-initiator-core-tools-2.3.ebuild 1505 RMD160 f2a749275f080d945b484ba23f545a506cce9a08 SHA1 cd7a0a239942b49144f644da38456b3075a4648d SHA256 b3f76066dc96aa05d44bbcf79ff4a99c3468c351d7337b2050d5c70e3e4fa30b
+MISC ChangeLog 1403 RMD160 9da56dc0a2a1b3461d0c7056b50e149c3c2f63fe SHA1 f467768a3a76412b29a33e010c00582d0f6b4f13 SHA256 181a0b30fc1320e591b930afab0e723b33fae4241a27fddba4d37736d3c33b7e
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAkyKiDYACgkQIiMqcbOVdxThEgP+IU0ZhInf7ExRHkmRuOVjvM8I
-ERUv/Qpe8gbZ7dY6QeyEu2ttIgT0uFHgiGnM/V60dq2UllmGQy+VfqElW52ikkE7
-fwX/pf8W4rLugyQQMxwXC5CPIu/0bKp7SD+5J2lOhbt3Z4UdermAFMuNH26N3A69
-vbpa5sJQ6eY3UGMo6pM=
-=8DU6
------END PGP SIGNATURE-----
diff --git a/sys-block/iscsi-initiator-core-tools/files/fix-ldflags.patch b/sys-block/iscsi-initiator-core-tools/files/fix-ldflags.patch
new file mode 100644
index 000000000000..b0224f53dab3
--- /dev/null
+++ b/sys-block/iscsi-initiator-core-tools/files/fix-ldflags.patch
@@ -0,0 +1,28 @@
+diff -Naur iscsi-initiator-core-tools-2.3.old/ipyxd/Makefile iscsi-initiator-core-tools-2.3/ipyxd/Makefile
+--- iscsi-initiator-core-tools-2.3.old/ipyxd/Makefile	2005-04-01 10:35:54.000000000 +0200
++++ iscsi-initiator-core-tools-2.3/ipyxd/Makefile	2010-09-27 13:39:25.000000000 +0200
+@@ -51,19 +51,19 @@
+ 	fi
+ 
+ ${MD5}.o : ${SRC}${MD5}.c
+-	${CC} ${AUTHFLAGS} -c $<
++	${CC} ${LDFLAGS} ${AUTHFLAGS} -c $<
+ 
+ ${CHAP}.o : ${SRC}${CHAP}.c
+-	${CC} ${AUTHFLAGS} -c $<
++	${CC} ${LDFLAGS} ${AUTHFLAGS} -c $<
+ 
+ ${AUTH} : ${SRC}${AUTH}.c
+-	${CC} ${AUTHFLAGS} -o $@ $< ${LOBJECTS} ${AUTHLIBS}
++	${CC} ${LDFLAGS} ${AUTHFLAGS} -o $@ $< ${LOBJECTS} ${AUTHLIBS}
+ 
+ ${INIT} : ${SRC}${INIT}.c
+-	${CC} ${DEBUGFLAGS} ${INCLUDE} -o $@ $<
++	${CC} ${LDFLAGS} ${DEBUGFLAGS} ${INCLUDE} -o $@ $<
+ 
+ ${INAME} : ${SRC}${INAME}.c
+-	 ${CC} ${DEBUGFLAGS} ${INCLUDE} -o $@ $< ${MD5}.o
++	 ${CC} ${LDFLAGS} ${DEBUGFLAGS} ${INCLUDE} -o $@ $< ${MD5}.o
+ 
+ devpts:
+ 	$(RM) -rf $(DESTDIR)/dev/iscsi
diff --git a/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild b/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild
index 205e168f8366..552eb7334cff 100644
--- a/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild
+++ b/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild,v 1.4 2009/09/23 20:30:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild,v 1.5 2010/09/27 11:46:12 cla Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="iscsi-initiator-core is a full featured iSCSI Initiator stack."
 #HOMEPAGE="http://iscsi-initiator-core.org/"
@@ -15,6 +15,12 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/fix-ldflags.patch"
+}
+
 src_compile() {
 	cd "${S}"/ipyxd/
 	append-flags -DLINUX -Iinclude/