ports/153625: Pass CPPFLAGS to MAKE_ENV and CONFIGURE_ENV

[Gerald Pfeifer]

>Number:         153625
>Category:       ports
>Synopsis:       Pass CPPFLAGS to MAKE_ENV and CONFIGURE_ENV
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 02 16:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Gerald Pfeifer
>Release:        
>Organization:
>Environment:
>Description:
	Now that we are properly passing CPP (PR 151047) we also
	need to do the same for CPPFLAGS.

	In fact, lack of doings so has causing real bugs, cf.
	PR 151792 (and PR 151848) which I had to work around in
	the individual port.
>How-To-Repeat:
	Try building lang/gcc44 on amd64 without the workaround that
	I will commit later today.
>Fix:

	Note: the patch around MAKE_ENV appears larger than it is,
	we really only add CPPFLAGS and reformat things.


Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.666
diff -u -r1.666 bsd.port.mk
--- bsd.port.mk	29 Dec 2010 07:14:56 -0000	1.666
+++ bsd.port.mk	2 Jan 2011 16:03:24 -0000
@@ -2277,8 +2277,9 @@
 MAKE_ENV+=		PREFIX=${PREFIX} \
 			LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
 			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \
-			CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-			CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+			CC="${CC}" CFLAGS="${CFLAGS}" \
+			CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
+			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 			MANPREFIX="${MANPREFIX}"
 
 # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.
@@ -3778,7 +3779,7 @@
 	@(cd ${CONFIGURE_WRKSRC} && \
 	    ${SET_LATE_CONFIGURE_ARGS} \
 		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+	    CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
 	    INSTALL_DATA="${INSTALL_DATA}" \
 	    INSTALL_LIB="${INSTALL_LIB}" \
>Release-Note:
>Audit-Trail:
>Unformatted: