Respect the $CC value that autoconf setup.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

6 files changed, 35 insertions, 5 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 4e5d619d88b5..578f563d5869 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.263 2012/03/20 18:56:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.264 2012/03/26 21:22:50 vapier Exp $
+
+  26 Mar 2012; Mike Frysinger <vapier@gentoo.org> lvm2-2.02.88.ebuild,
+  +files/lvm2-2.02.88-respect-cc.patch, lvm2-2.02.92.ebuild,
+  lvm2-2.02.93.ebuild, lvm2-2.02.93-r1.ebuild:
+  Respect the $CC value that autoconf setup.
 
 *lvm2-2.02.93-r1 (20 Mar 2012)
 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.88-respect-cc.patch b/sys-fs/lvm2/files/lvm2-2.02.88-respect-cc.patch
new file mode 100644
index 000000000000..13d99ade0771
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.88-respect-cc.patch
@@ -0,0 +1,17 @@
+GNU make always defaults CC to "cc", so using "?=" with the CC variable
+will never override the internal make value.  since @CC@ comes from the
+configure script, and that respects the $CC env var, don't bother trying
+to handle it in make too.  it's not like we do this with any other build
+variable after all.
+
+--- a/make.tmpl.in
++++ b/make.tmpl.in
+@@ -17,7 +17,7 @@
+ 
+ @SET_MAKE@
+ 
+-CC ?= @CC@
++CC = @CC@
+ RANLIB = @RANLIB@
+ INSTALL = @INSTALL@
+ MKDIR_P = @MKDIR_P@
diff --git a/sys-fs/lvm2/lvm2-2.02.88.ebuild b/sys-fs/lvm2/lvm2-2.02.88.ebuild
index 82bbfed18d1a..c481ff874b56 100644
--- a/sys-fs/lvm2/lvm2-2.02.88.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.88.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.88.ebuild,v 1.11 2012/02/25 15:17:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.88.ebuild,v 1.12 2012/03/26 21:22:50 vapier Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -90,6 +90,8 @@ src_prepare() {
 	# Merged upstream
 	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
 
+	epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
+
 	eautoreconf
 }
 
diff --git a/sys-fs/lvm2/lvm2-2.02.92.ebuild b/sys-fs/lvm2/lvm2-2.02.92.ebuild
index d22cb9bcaf22..a9c7e6c0a815 100644
--- a/sys-fs/lvm2/lvm2-2.02.92.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.92.ebuild,v 1.2 2012/03/03 07:39:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.92.ebuild,v 1.3 2012/03/26 21:22:50 vapier Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -91,6 +91,8 @@ src_prepare() {
 	# Merged upstream
 	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
 
+	epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
+
 	eautoreconf
 }
 
diff --git a/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild
index f5d784dea8e1..e4a422792963 100644
--- a/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild,v 1.1 2012/03/20 18:56:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild,v 1.2 2012/03/26 21:22:50 vapier Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -91,6 +91,8 @@ src_prepare() {
 	# Merged upstream
 	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
 
+	epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
+
 	eautoreconf
 }
 
diff --git a/sys-fs/lvm2/lvm2-2.02.93.ebuild b/sys-fs/lvm2/lvm2-2.02.93.ebuild
index be0c168d2418..d0c76a7ec112 100644
--- a/sys-fs/lvm2/lvm2-2.02.93.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.93.ebuild,v 1.3 2012/03/14 05:57:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.93.ebuild,v 1.4 2012/03/26 21:22:50 vapier Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -91,6 +91,8 @@ src_prepare() {
 	# Merged upstream
 	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
 
+	epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
+
 	eautoreconf
 }