diff options
| -rw-r--r-- | lang/php/phpversion.mk | 17 | ||||
| -rw-r--r-- | mk/pbulk/pbulk-index.mk | 4 |
2 files changed, 16 insertions, 5 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index bfd85f9b1f8..f11112be42a 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.151 2016/08/22 03:21:17 taca Exp $ +# $NetBSD: phpversion.mk,v 1.152 2016/09/08 09:40:11 joerg Exp $ # # This file selects a PHP version, based on the user's preferences and # the installed packages. It does not add a dependency on the PHP @@ -30,6 +30,12 @@ # Possible: 55 56 70 71 # Default: 55 56 # +# PHP_VERSIONS_INCOMPATIBLE +# The PHP versions that are not supported by the package. +# +# Possible: 55 56 70 71 +# Default: (empty) +# # PHP_CHECK_INSTALLED # Check installed version of PHP. Should be used by lang/php55, # lang/php56, lang/php70, or lang/php71 only. @@ -102,9 +108,14 @@ _SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ PHP_VERSION_DEFAULT?= 56 PHP_VERSIONS_ACCEPTED?= 55 56 70 71 +.for pv in ${PHP_VERSIONS_ACCEPTED} +. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv}) +_PHP_VERSIONS_ACCEPTED+= ${pv} +. endif +.endfor # transform the list into individual variables -.for pv in ${PHP_VERSIONS_ACCEPTED} +.for pv in ${_PHP_VERSIONS_ACCEPTED} _PHP_VERSION_${pv}_OK= yes .endfor @@ -137,7 +148,7 @@ _PHP_VERSION= ${PHP_VERSION_DEFAULT} .endif # prefer an already installed version, in order of "accepted" .if !defined(_PHP_VERSION) -.for pv in ${PHP_VERSIONS_ACCEPTED} +.for pv in ${_PHP_VERSIONS_ACCEPTED} .if defined(_PHP_VERSION_${pv}_INSTALLED) _PHP_VERSION?= ${pv} .else diff --git a/mk/pbulk/pbulk-index.mk b/mk/pbulk/pbulk-index.mk index 60d50e23198..a56126b106c 100644 --- a/mk/pbulk/pbulk-index.mk +++ b/mk/pbulk/pbulk-index.mk @@ -1,4 +1,4 @@ -# $NetBSD: pbulk-index.mk,v 1.20 2014/06/10 15:22:14 joerg Exp $ +# $NetBSD: pbulk-index.mk,v 1.21 2016/09/08 09:40:11 joerg Exp $ # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to the parallel bulk build @@ -30,7 +30,7 @@ _PBULK_MULTI_LIST.mysql= MYSQL_VERSIONS_ACCEPTED _PBULK_MULTI_VAR.mysql= MYSQL_VERSION_REQD _PBULK_MULTI_DEFAULT.mysql= MYSQL_VERSION_DEFAULT -_PBULK_MULTI_LIST.php= PHP_VERSIONS_ACCEPTED +_PBULK_MULTI_LIST.php= _PHP_VERSIONS_ACCEPTED _PBULK_MULTI_VAR.php= PHP_VERSION_REQD _PBULK_MULTI_DEFAULT.php= PHP_VERSION_DEFAULT |