Respect LDFLAGS. Thanks to Stefan Behte and Kacper Kowalik for the patch. Bug #350742. Stable on amd64 wrt bug #349436

Package-Manager: portage-2.1.9.39/cvs/Linux x86_64

4 files changed, 62 insertions, 12 deletions

diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index d08284c43e38..e84791341390 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/iscsitarget
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.39 2010/12/25 19:42:25 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.40 2011/02/16 22:16:27 hwoarang Exp $
+
+  16 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
+  iscsitarget-1.4.20.2.ebuild, +files/iscsitarget-1.4.20.2-respect-flags.patch:
+  Respect LDFLAGS. Thanks to Stefan Behte and Kacper Kowalik for the patch. Bug
+  #350742. Stable on amd64 wrt bug #349436
 
   25 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
   iscsitarget-1.4.20.2.ebuild:
diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
index fd1be27fd43f..f0683cfc3b90 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX ietd-conf.d 1073 RMD160 ade5301c8e2eb8cbc16dfae4bfa80e22393e2953 SHA1 1bb990e26b847169d4937e5d2fc28a5f86d55003 SHA256 28c4a6ddfe555d9f400513de04e2e44473263c4505434fc6e926d2b2fe89c414
 AUX ietd-init.d-2 2482 RMD160 4cfb3ef4690dc601ddd08578138dd988ab9041be SHA1 3856c74da1d45aefeb1ef0c9617da36e381f85f4 SHA256 299692c81e51fa5c8309b955732d29e3f82a4406e13fe9a826b842ad30f807d9
@@ -10,19 +10,30 @@ AUX iscsitarget-0.4.17+linux-2.6.30.patch 1145 RMD160 12b2488ecbc10c71b3cbd21509
 AUX iscsitarget-0.4.17-build.patch 580 RMD160 a770b10dfc4f7c16daefa3e5e0827d1a2164e470 SHA1 81d46f22fd9ff73dbe7baa1792706c79c5ed7a2a SHA256 f1a29431674e4e185d3565df045ad575800c48f49de3a2a53d5723c7b2b7383d
 AUX iscsitarget-1.4.18+linux-2.6.32.patch 1342 RMD160 f03339491c509b2c831012d32b2beed8b0c2d593 SHA1 8e25df9b2778f40eca624142df5db4b7d968a90d SHA256 7ad2db023826e4861d644646d855406c0bbffe007b7a81d1f209948d0d58d336
 AUX iscsitarget-1.4.19+linux-2.6.33.patch 594 RMD160 f28c6741807f9f52558e273d922c9d66e33a8d72 SHA1 fefddb9e4138a1b864e15b9f25076e49f6fd3ac9 SHA256 2e50daac88dff35a268a56950491fc9b7b9533eebd2a690f3c4eb448990f8352
+AUX iscsitarget-1.4.20.2-respect-flags.patch 878 RMD160 1a90627c6e1fbea0a44cf291ba8a40b1a06d332d SHA1 708f6099cc424ccdf43e8a0531d9d841bf2e1ff3 SHA256 4657f3a7739ed5d2a75f8a8a4ca715f3a3098edd717c4acd1070638fcda2d80a
 AUX iscsitarget-1.4.20.2_kernel-2.6.36.patch 339 RMD160 0f88eecf46fed45ea9847a5c80943ca975fa53d4 SHA1 2af61df45fdbfeb444aafeef5cd5b3ffff93d856 SHA256 1a2b44da24a89fd2ba204600668351c0130c28eacace1ff0d362ef370cb3aaec
 DIST iscsitarget-0.4.17.tar.gz 107884 RMD160 2f0413d8bb242d09593f07eb35846c0f9dd2934c SHA1 9c287b76a5bc50995d86d351968368302e70b224 SHA256 bc554508174f2657c93ddb0501adad0256d1c6801a3c1ee54ff721bc92ff8778
 DIST iscsitarget-1.4.19.tar.gz 124288 RMD160 60189a94a70eb35c3d9bd995a09ffa6983a1a036 SHA1 96af4ad9343960c700dc46f98a3b9ce2ffbe2231 SHA256 a9fc5e43a2806b8aa95513b2af06d97bb9181ef5fedc906d69144d93a86e664a
 DIST iscsitarget-1.4.20.2.tar.gz 138464 RMD160 707138c0dd9a440f0d7ae5955d9d7f8bd0303398 SHA1 adfa2ff4defe93df7c26878b554731a268f0ecac SHA256 0f3c8e2c2038fbbd7059d1efdd428260013212daca75c1d56abbeec33cb8d388
 EBUILD iscsitarget-0.4.17.ebuild 1947 RMD160 876c1b3f1216e78b9f46390ba9a18310a18a5743 SHA1 fd29c29f8a31ada3b3afcf5093745f3c70ad2d4f SHA256 b71ae15ee537c66b74becab9d81d5693a28a130fcd66df3a3fb306e05625c5d3
 EBUILD iscsitarget-1.4.19.ebuild 2141 RMD160 377ead0c5fce50b5dd87a7dbb7ae9f8e30ca2c72 SHA1 f3268a81e6859c562ab92d4209e925ffa1088ccb SHA256 1fe32e93dff5504dca70ade38c97d991d17fe8884709c7d6e13c8882cfe94c37
-EBUILD iscsitarget-1.4.20.2.ebuild 1894 RMD160 e3750dd35589a2de21b629bb40a1d1ff609e98e5 SHA1 f93ee1d210377029e7a86de1ba937585c0799abe SHA256 cf58d5be27347a735f28fe2b334a3ac8cd31d5cb79ee724f8da2dfabdd216040
-MISC ChangeLog 7180 RMD160 ada72753b3115199166f0ca021fd914bf36be6af SHA1 a22fee4cf10936fcc7091df6dff98a175ecf6507 SHA256 5510bf27f05d1fc5e5f7b8e288ea3ab57d0d02d34677ffece0ac567990ac6a30
+EBUILD iscsitarget-1.4.20.2.ebuild 1975 RMD160 646e9e529ec039bda27c2cceb3d8cb5a8dfc32d1 SHA1 ff8a6c219e6b933f6970ef130e4f5ef3ab2ee42b SHA256 dddc1b99bef63003a29a715a4cf04d99a27ed1693c559ecc6ae905ab5f04133c
+MISC ChangeLog 7440 RMD160 6f39627efafe0018154abb58d1c9ed2d20b8d028 SHA1 27474e939690281763885ce8aec06833c15eb1f4 SHA256 e7a40e69d60f95c1276b00ef639011ef1a89ff420955b7afa7d0b4c81405379d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0WSdUACgkQNQqtfCuFneNFJACgl0LIsRGruY1zfFWlaWwjHphn
-+jkAnAoWrj+Pytv2OiNP4AfHPFT77gsK
-=oNZp
+iQIcBAEBCgAGBQJNXEwNAAoJEPqDWhW0r/LCHowQAJCh0FgL2yqmAzCWJ1qRl9Rd
+BYEquDFid4RE9SS2mP7EYwRm/mp42ADRwh3ld0XEW5Yk7rQfiYGq+lsYa2qZCw1C
+gBAAoZ/2xvqQsdkSxmCd5J4YEzt2pnbX2HYDQedH9u+p5BsEqNa296ekhvQUfYlL
+ErXolNUTL086SCbKkdVMMu2UezVJ/ApaIDFsFL3vkPywsmy8fDg63UWAFD3l4f73
+WSP7Y6rwt5Ymu+Sf1yzJzeB+ZDaxKhZzsGPuOQLnOfIJH6POJhljUBzNb0ceSYvB
+mmzvPhk2IXWJzmrFvvUESOr27jF5LB96tRQX2VAq8Oe/akxgqq+j/CBQsUtJXGU6
+NsIa/qXdWItn7z2RGB6AF1UkLqDd1QfZoEkEJjhKl0q6rrrnUB0SdorLEjuDowot
+KMhFiPt/ovzddn1sqhlYOt7+tpHIT/t/QSmPkATK8EfTqI7rIpKQiPbQ1HxER4Cd
+iJXGvo3wBdlNcvJZm82dAXTa5ftA9siEVPfK00TPjDekdr4Vj5Is90ftoGtPvDGw
+jWANd4x1hb0zYGskJlTrj4H+6jrq7FvXMN9pwkx+0EdPSnJEchN8Sy4Ou5oikp68
+ZY06rVyz+0dN11SDMJoOXsCDNWm6Dqs+AGNzsiDtDv0d9F+9z99P4mzCGUZtwQ1X
+RcWP+7I5rXD0Y8xic4pv
+=X7Hx
 -----END PGP SIGNATURE-----
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2-respect-flags.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2-respect-flags.patch
new file mode 100644
index 000000000000..347650ab9407
--- /dev/null
+++ b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2-respect-flags.patch
@@ -0,0 +1,32 @@
+--- a/Makefile
++++ b/Makefile
+@@ -26,7 +26,7 @@
+   endif
+ endif
+ 
+-KVER := $(shell $(CC) $(CFLAGS) -E -dM $(VERSION_FILE) | \
++KVER := $(shell $(CC) $(CFLAGS) $(LDFLAGS) -E -dM $(VERSION_FILE) | \
+ 	grep UTS_RELEASE | awk '{ print $$3 }' | sed 's/\"//g')
+ 
+ KMOD := /lib/modules/$(KVER)/extra
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g -I../include
++CFLAGS += -fno-inline -Wall -Wstrict-prototypes -I../include
+ CFLAGS += -D_GNU_SOURCE # required for glibc >= 2.8
+ PROGRAMS = ietd ietadm
+ LIBS =
+@@ -7,10 +7,10 @@
+ 
+ ietd: ietd.o iscsid.o conn.o session.o target.o message.o ctldev.o log.o chap.o event.o param.o plain.o isns.o md5.o sha1.o
+ 
+-	$(CC) $^ -o $@ $(LIBS)
++	$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ ietadm: ietadm.o param.o
+-	$(CC) $^ -o $@
++	$(CC) $(LDFLAGS) $^ -o $@
+ 
+ clean:
+ 	rm -f *.o $(PROGRAMS)
diff --git a/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild
index 750716c8f765..78b8fea75a14 100644
--- a/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild
+++ b/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild,v 1.3 2010/12/25 19:42:25 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-1.4.20.2.ebuild,v 1.4 2011/02/16 22:16:27 hwoarang Exp $
 
 inherit linux-mod eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-libs/openssl"
@@ -24,6 +24,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.4.15-isns-set-scn-flag.patch #180619
+	# Respect LDFLAGS. Bug #350742
+	epatch "${FILESDIR}"/${P}-respect-flags.patch
 	# NIPQUAD removed in 2.6.36, #340449
 	if kernel_is ge 2 6 36; then
 		epatch "${FILESDIR}"/iscsitarget-1.4.20.2_kernel-2.6.36.patch