Thu Feb 25 08:20:25 2016 UTC ()
Expand the default list of OPSYSVARS to include those commonly used
already, plus those that are most used in OPSYS-specific sections.


(jperkin)
diff -r1.2015 -r1.2016 pkgsrc/mk/bsd.pkg.mk
cvs diff -r1.2015 -r1.2016 pkgsrc/mk/bsd.pkg.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.mk 2015/12/13 06:05:25 1.2015
+++ pkgsrc/mk/bsd.pkg.mk 2016/02/25 08:20:25 1.2016
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.mk,v 1.2015 2015/12/13 06:05:25 richard Exp $ 1# $NetBSD: bsd.pkg.mk,v 1.2016 2016/02/25 08:20:25 jperkin 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
@@ -129,26 +129,30 @@ PKG_FAIL_REASON+= "Out-dated buildlink3. @@ -129,26 +129,30 @@ PKG_FAIL_REASON+= "Out-dated buildlink3.
129PKG_FAIL_REASON+='CATEGORIES are mandatory.' 129PKG_FAIL_REASON+='CATEGORIES are mandatory.'
130.endif 130.endif
131 131
132.if !defined(PKGNAME) && !defined(DISTNAME) 132.if !defined(PKGNAME) && !defined(DISTNAME)
133PKG_FAIL_REASON+='PKGNAME and/or DISTNAME are mandatory.' 133PKG_FAIL_REASON+='PKGNAME and/or DISTNAME are mandatory.'
134.endif 134.endif
135 135
136.if defined(PKG_PATH) 136.if defined(PKG_PATH)
137PKG_FAIL_REASON+='Please unset PKG_PATH before doing pkgsrc work!' 137PKG_FAIL_REASON+='Please unset PKG_PATH before doing pkgsrc work!'
138.endif 138.endif
139 139
140# Allow variables to be set on a per-OS basis 140# Allow variables to be set on a per-OS basis
141OPSYSVARS+= CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS 141OPSYSVARS+= CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS
 142OPSYSVARS+= CMAKE_ARGS CONFIGURE_ARGS CONFIGURE_ENV
 143OPSYSVARS+= BUILDLINK_TRANSFORM SUBST_CLASSES
 144OPSYSVARS+= BUILD_TARGET MAKE_ENV USE_TOOLS
 145OPSYSVARS+= PKG_SUPPORTED_OPTIONS PKG_SUGGESTED_OPTIONS
142.for _var_ in ${OPSYSVARS:O} 146.for _var_ in ${OPSYSVARS:O}
143. if defined(${_var_}.${OPSYS}) 147. if defined(${_var_}.${OPSYS})
144${_var_}+= ${${_var_}.${OPSYS}} 148${_var_}+= ${${_var_}.${OPSYS}}
145. elif defined(${_var_}.*) 149. elif defined(${_var_}.*)
146${_var_}+= ${${_var_}.*} 150${_var_}+= ${${_var_}.*}
147. endif 151. endif
148.endfor 152.endfor
149 153
150CPPFLAGS+= ${CPP_PRECOMP_FLAGS} 154CPPFLAGS+= ${CPP_PRECOMP_FLAGS}
151 155
152# To sanitise environment set PKGSRC_SETENV=${SETENV} -i 156# To sanitise environment set PKGSRC_SETENV=${SETENV} -i
153# This will however cause build failures (e.g. "www/firefox"). Settings 157# This will however cause build failures (e.g. "www/firefox"). Settings
154# like "ALLOW_VULNERABLE_PACKAGES" will also not be correctly passed 158# like "ALLOW_VULNERABLE_PACKAGES" will also not be correctly passed