diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2014-08-10 08:48:41 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2014-08-10 08:48:41 +0000 |
| commit | 54df1957a421ea7c8241d0299e2deb666f031d26 (patch) | |
| tree | 9d2edec0ec84b7ac79ebcc9366b08b999fc85435 | |
| parent | Fix stage violation (diff) | |
- Only print the python version mismatch warning, if a dependency or user set
PYTHON_VERSION explicitly. Otherwise, ports using a non-default version
would always print the warning.
With hat: python@
| -rw-r--r-- | Mk/Uses/python.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 8e15bdc99aef..2c1a77038475 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -397,7 +397,10 @@ _PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most # If we have an unsupported version of Python, try another. .if defined(_PYTHON_VERSION_NONSUPPORTED) -WARNING+= "needs Python ${_PYTHON_VERSION_NONSUPPORTED}. But a port depending on this one specified ${_PYTHON_VERSION}" +.if defined(PYTHON_VERSION) || defined(PYTHON_CMD) +_PV:= ${_PYTHON_VERSION} # preserve the specified python version +WARNING+= "needs Python ${_PYTHON_VERSION_NONSUPPORTED}. But a port depending on this one specified ${_PV}" +.endif # defined(PYTHON_VERSION) || defined(PYTHON_CMD) .undef _PYTHON_VERSION .for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS} __VER= ${ver} |