[gentoo-commits] gentoo-x86 commit in eclass: qmail.eclass

[Mike Frysinger (vapier)]

vapier      12/01/08 03:38:03

  Modified:             qmail.eclass
  Log:
  respect CPPFLAGS, and mark cc/ld as local

Revision  Changes    Path
1.6                  eclass/qmail.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmail.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmail.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmail.eclass?r1=1.5&r2=1.6

Index: qmail.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmail.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qmail.eclass	24 Nov 2011 00:04:13 -0000	1.5
+++ qmail.eclass	8 Jan 2012 03:38:03 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmail.eclass,v 1.5 2011/11/24 00:04:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmail.eclass,v 1.6 2012/01/08 03:38:03 vapier Exp $
 
 # @ECLASS: qmail.eclass
 # @MAINTAINER:
@@ -99,10 +99,10 @@
 # because a user supplied patch might apply changes to these files, too.
 # See bug #165981.
 qmail_set_cc() {
-	cc=$(head -n 1 ./conf-cc | sed -e "s#^g\?cc\s\+\(-O2\)\?#$(tc-getCC) #")
-	ld=$(head -n 1 ./conf-ld | sed -e "s#^g\?cc\s\+\(-s\)\?#$(tc-getCC) #")
+	local cc=$(head -n 1 ./conf-cc | sed -e "s#^g\?cc\s\+\(-O2\)\?#$(tc-getCC) #")
+	local ld=$(head -n 1 ./conf-ld | sed -e "s#^g\?cc\s\+\(-s\)\?#$(tc-getCC) #")
 
-	echo "${cc} ${CFLAGS}"  > ./conf-cc || die 'Patching conf-cc failed.'
+	echo "${cc} ${CFLAGS} ${CPPFLAGS}"  > ./conf-cc || die 'Patching conf-cc failed.'
 	echo "${ld} ${LDFLAGS}" > ./conf-ld || die 'Patching conf-ld failed.'
 }