Bug #400619: respect user CC/AR values during build.

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 72 insertions, 6 deletions

diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index faf0c2cede0f..875af0438b5b 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/open-iscsi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.40 2012/02/09 08:35:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.41 2012/02/09 09:19:21 robbat2 Exp $
+
+  09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch,
+  open-iscsi-2.0.872.ebuild:
+  Bug #400619: respect user CC/AR values during build.
 
   09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
   files/iscsid-2.0.871-r1.init.d, files/iscsid-conf.d:
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 508fa710fa5b..6175eb69dfd8 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -13,6 +13,7 @@ AUX open-iscsi-2.0.872-glibc212.patch 266 RMD160 604ad6250d64180d8eb668ef4e80e48
 AUX open-iscsi-2.0.872-init.d 2971 RMD160 a4d6abc8bd2e2d19ec81490ac0c41a43c89e870b SHA1 66b583bec26b9176e50788f0628865b17ace385c SHA256 ff62e08cd55d659ef5df1f477bd835a1d29984fd707801a9ef4d0dfe9c7caf79
 AUX open-iscsi-2.0.872-isns-slp.patch 871 RMD160 ad64013b7d7c1adbc2563a5905b255470a80c857 SHA1 de23ec2624c98e79705ce7195e2d30242d9565dc SHA256 d83640c9a7f9d7fed2b502d0164f6f8a91adb87f45e79a793954eae536a22138
 AUX open-iscsi-2.0.872-ldflags.patch 309 RMD160 d947a35dcaed347d63395e9e8c58370fcfaed33d SHA1 8d258286c2d0187a366e62a0097e2eadfacdc29d SHA256 b8544087dfbc579209d326f825a251f6fc10898ca29ce46264d4a86ceac95941
+AUX open-iscsi-2.0.872-makefile-cleanup-pass2.patch 2134 RMD160 7709cba1e3bda65d3933b815575ee406e525e052 SHA1 061e9f486492a0224c35c1a9ac39533d240d97cb SHA256 8725f8aba89f86c275f9a53bfb066d392b43e6ba5496c09bc2d9543453f45122
 AUX open-iscsi-2.0.872-makefile-cleanup.patch 839 RMD160 3b80ae2baa0cac7cc45240d6fc81b9f7c7286f26 SHA1 5f746bedb32dfd79b58501b0945a78be11df9d81 SHA256 c0e92ba2211dd74e89dcc0c5793e02ad8ad06b41a07a0687007bba6415546dfd
 DIST open-iscsi-2.0-870.3.tar.gz 301242 RMD160 f3be0aeaa7b2988a794983bc6d88511026605b13 SHA1 bc8253558b1a6b0c12ec0fbb0f01d6cb56d39395 SHA256 8ca6708895b17424efe20a4f6cbdf32ea44c40e7d9faa0f9c44bd720bae715ec
 DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb
@@ -22,6 +23,6 @@ EBUILD open-iscsi-2.0.870.3-r1.ebuild 3063 RMD160 1d359925cb33027b1be5ab7aaddb7f
 EBUILD open-iscsi-2.0.871-r1.ebuild 2580 RMD160 c7263baf111067c7016098ec971a8f5c5b4386cc SHA1 467b5930c326c7473ab7704733edae2bc4ad7436 SHA256 fd81629f599293eb565086527f1099414528fb620bbf51a1ea2130cfa217f0f3
 EBUILD open-iscsi-2.0.871.3.ebuild 2564 RMD160 d745fadfa0ec9bf5b24bca51e42cdc8498d69675 SHA1 20aa4def05cd16242d330c9a17c7ee39c8896d51 SHA256 47c655f1da09451d18812965074d8a164dc417064bef584738b964bf88e5ecf7
 EBUILD open-iscsi-2.0.871.ebuild 3148 RMD160 24d72a0703ebacbb7f696aabb58087d6ef290b72 SHA1 42f9b5f3500113a1a5b0e3ceb64a5443d4473295 SHA256 89724af6ae57f974c653eec749df99a59d8308436f148781f4b8885844e31a89
-EBUILD open-iscsi-2.0.872.ebuild 3005 RMD160 2d9d59e65592eb94781bd0d4c3460620b3ecc358 SHA1 d2716580d4973fcffc61a4ca214b4826595cd3dc SHA256 23b09e3dfe1893de0820353a513b985c9e04c07b1b47e13015815d40cf43fd59
-MISC ChangeLog 8778 RMD160 51acd90b9dac79a0f10d60319550425057c59de2 SHA1 61f5c045cb6b81e58c8dc8e363fb530e40b7b718 SHA256 9881f2bddcc42424e748218aa35e27fc57efd13460676ad6a323d83461df3304
+EBUILD open-iscsi-2.0.872.ebuild 3135 RMD160 8afea9c86b33dfa21da428a75904a776d1fa445c SHA1 087c4647bcf51ddf282739e5304012ecbb3de0c8 SHA256 508b9c930c9644b9697c0a6f336d741c8e0fc47c41a78ba6a13225851077e291
+MISC ChangeLog 8974 RMD160 7b17db4a6516cd805027c6a9eecf856a8b1f6eb7 SHA1 a62a01fceb61c1868874691e28f8435f0a373138 SHA256 94d1a9bdc954da27eafe7fcf55753fa3133b011542742bf32fdd6f94d8d29779
 MISC metadata.xml 358 RMD160 151359f69c3aaca1234142bb4bfc10672d889db0 SHA1 c66b54154a95aed7882dca23751cfac819045a66 SHA256 4ab139872bd983e7fb651198aa9aadd1053ed613568bfdbcb612bfc508b8f856
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch
new file mode 100644
index 000000000000..fb563d10e1bc
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch
@@ -0,0 +1,55 @@
+diff -NuarwbB open-iscsi-2.0-872/usr/Makefile open-iscsi-2.0-872.orig/usr/Makefile
+--- open-iscsi-2.0-872.orig/usr/Makefile	2012-02-09 08:58:04.402623915 +0000
++++ open-iscsi-2.0-872/usr/Makefile	2012-02-09 08:56:51.159070006 +0000
+@@ -65,6 +65,6 @@
+ 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
+ 
+ depend:
++	$(CC) $(CFLAGS) -M `ls *.c` > .depend
+-	gcc $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+diff -NuarwbB open-iscsi-2.0-872/utils/fwparam_ibft/Makefile open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile
+--- open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile	2012-02-09 08:57:58.579273051 +0000
++++ open-iscsi-2.0-872/utils/fwparam_ibft/Makefile	2010-08-11 15:27:07.000000000 +0000
+@@ -38,6 +38,6 @@
+ $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
+ 
+ depend:
++	$(CC) $(CFLAGS) -M `ls *.c` > .depend
+-	gcc $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+diff -NuarwbB open-iscsi-2.0-872/utils/Makefile open-iscsi-2.0-872.orig/utils/Makefile
+--- open-iscsi-2.0-872.orig/utils/Makefile	2012-02-09 08:57:37.825877235 +0000
++++ open-iscsi-2.0-872/utils/Makefile	2012-02-09 08:56:51.145736633 +0000
+@@ -12,6 +12,6 @@
+ 	rm -f *.o $(PROGRAMS) .depend
+ 
+ depend:
++	$(CC) $(CFLAGS) -M `ls *.c` > .depend
+-	gcc $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+diff -NuarwbB open-iscsi-2.0-872/utils/open-isns/Makefile.in open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in
+--- open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in	2012-02-09 08:57:47.812573971 +0000
++++ open-iscsi-2.0-872/utils/open-isns/Makefile.in	2010-08-11 15:27:07.000000000 +0000
+@@ -77,6 +77,6 @@
+ 	ar cr $@ $(LIBOBJS)
+ 
+ depend:
++	$(CC) $(CFLAGS) -M `ls *.c` > .depend
+-	gcc $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+diff -NuarwbB open-iscsi-2.0-872/utils/sysdeps/Makefile open-iscsi-2.0-872.orig/utils/sysdeps/Makefile
+--- open-iscsi-2.0-872.orig/utils/sysdeps/Makefile	2012-02-09 08:57:43.459227530 +0000
++++ open-iscsi-2.0-872/utils/sysdeps/Makefile	2010-08-11 15:27:07.000000000 +0000
+@@ -10,6 +10,6 @@
+ 	rm -f *.o .depend
+ 
+ depend:
++	$(CC) $(CFLAGS) -M `ls *.c` > .depend
+-	gcc $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
index cfcc3c9f78a4..397e88e59b6a 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v 1.4 2012/02/09 08:29:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v 1.5 2012/02/09 09:19:21 robbat2 Exp $
 
 EAPI=2
-inherit versionator linux-info eutils flag-o-matic
+inherit versionator linux-info eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.org/"
@@ -46,6 +46,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-dont-call-configure.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 	epatch "${FILESDIR}"/${P}-isns-slp.patch
+	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch
 }
 
 src_configure() {
@@ -60,7 +61,11 @@ src_compile() {
 	local SLP_LIBS
 	use slp && SLP_LIBS="-lslp"
 	cd "${S}" && \
-	KSRC="${KV_DIR}" CFLAGS="" emake OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" user \
+	KSRC="${KV_DIR}" CFLAGS="" \
+	emake \
+		OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \
+		AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		user \
 		|| die "emake failed"
 }