Thu May 24 11:34:16 2012 UTC ()
Use ?= for setting PKGSRC_SETENV to make it easy to override in mk.conf


(abs)
diff -r1.1980 -r1.1981 pkgsrc/mk/bsd.pkg.mk
cvs diff -r1.1980 -r1.1981 pkgsrc/mk/bsd.pkg.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.mk 2012/03/05 07:17:15 1.1980
+++ pkgsrc/mk/bsd.pkg.mk 2012/05/24 11:34:15 1.1981
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.mk,v 1.1980 2012/03/05 07:17:15 sbd Exp $ 1# $NetBSD: bsd.pkg.mk,v 1.1981 2012/05/24 11:34:15 abs Exp $
2# 2#
3# This file is in the public domain. 3# This file is in the public domain.
4# 4#
5# Please see the pkgsrc/doc/guide manual for details on the 5# Please see the pkgsrc/doc/guide manual for details on the
6# variables used in this make file template. 6# variables used in this make file template.
7# 7#
8# Default sequence for "all" is: 8# Default sequence for "all" is:
9# 9#
10# bootstrap-depends 10# bootstrap-depends
11# fetch 11# fetch
12# checksum 12# checksum
13# depends 13# depends
14# tools 14# tools
@@ -142,27 +142,27 @@ PKG_FAIL_REASON+='Please unset PKG_PATH  @@ -142,27 +142,27 @@ PKG_FAIL_REASON+='Please unset PKG_PATH
142# Allow variables to be set on a per-OS basis 142# Allow variables to be set on a per-OS basis
143OPSYSVARS+= CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS 143OPSYSVARS+= CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS
144.for _var_ in ${OPSYSVARS:O} 144.for _var_ in ${OPSYSVARS:O}
145. if defined(${_var_}.${OPSYS}) 145. if defined(${_var_}.${OPSYS})
146${_var_}+= ${${_var_}.${OPSYS}} 146${_var_}+= ${${_var_}.${OPSYS}}
147. elif defined(${_var_}.*) 147. elif defined(${_var_}.*)
148${_var_}+= ${${_var_}.*} 148${_var_}+= ${${_var_}.*}
149. endif 149. endif
150.endfor 150.endfor
151 151
152CPPFLAGS+= ${CPP_PRECOMP_FLAGS} 152CPPFLAGS+= ${CPP_PRECOMP_FLAGS}
153 153
154# To sanitise environment set PKGSRC_SETENV=${SETENV} -i 154# To sanitise environment set PKGSRC_SETENV=${SETENV} -i
155PKGSRC_SETENV= ${SETENV} 155PKGSRC_SETENV?= ${SETENV}
156 156
157ALL_ENV+= CC=${CC:Q} 157ALL_ENV+= CC=${CC:Q}
158ALL_ENV+= CFLAGS=${CFLAGS:M*:Q} 158ALL_ENV+= CFLAGS=${CFLAGS:M*:Q}
159ALL_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q} 159ALL_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q}
160ALL_ENV+= CXX=${CXX:Q} 160ALL_ENV+= CXX=${CXX:Q}
161ALL_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} 161ALL_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
162ALL_ENV+= COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG:Q} 162ALL_ENV+= COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG:Q}
163ALL_ENV+= F77=${FC:Q} 163ALL_ENV+= F77=${FC:Q}
164ALL_ENV+= FC=${FC:Q} 164ALL_ENV+= FC=${FC:Q}
165ALL_ENV+= FFLAGS=${FFLAGS:M*:Q} 165ALL_ENV+= FFLAGS=${FFLAGS:M*:Q}
166ALL_ENV+= LANG=C 166ALL_ENV+= LANG=C
167ALL_ENV+= LC_COLLATE=C 167ALL_ENV+= LC_COLLATE=C
168ALL_ENV+= LC_CTYPE=C 168ALL_ENV+= LC_CTYPE=C