View | Details | Raw Unified | Return to bug 209204 | Differences between
and this patch

Collapse All | Expand All

(-)b/Mk/Uses/python.mk (-9 / +5 lines)
Lines 33-46 Link Here
33
# RUN_DEPENDS and TEST_DEPENDS. PYTHON_NO_DEPENDS can be set to not add any
33
# RUN_DEPENDS and TEST_DEPENDS. PYTHON_NO_DEPENDS can be set to not add any
34
# dependencies.
34
# dependencies.
35
#
35
#
36
# Variables, which can be set by a user:
37
#
38
# PYTHON_VERSION	- The chosen Python interpreter including the version,
39
#			  e.g. python2.7, python3.3, etc. This allows the user
40
#			  to override the currently chosen default version and
41
#			  to install the port for a specific Python version.
42
#			  It must not be set by a port.
43
#
44
# Variables, which can be set by the port:
36
# Variables, which can be set by the port:
45
#
37
#
46
# USE_PYTHON		- A list of additional features and functionality to
38
# USE_PYTHON		- A list of additional features and functionality to
Lines 201-206 Link Here
201
# Deprecated variables, which exist for compatibility and will be removed
193
# Deprecated variables, which exist for compatibility and will be removed
202
# soon:
194
# soon:
203
#
195
#
196
# PYTHON_VERSION
204
# PYTHON_DEFAULT_VERSION
197
# PYTHON_DEFAULT_VERSION
205
# PYTHON2_DEFAULT_VERSION
198
# PYTHON2_DEFAULT_VERSION
206
# PYTHON3_DEFAULT_VERSION
199
# PYTHON3_DEFAULT_VERSION
Lines 272-277 WARNING+= "PYTHON2_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=p Link Here
272
.if defined(PYTHON3_DEFAULT_VERSION)
265
.if defined(PYTHON3_DEFAULT_VERSION)
273
WARNING+=	"PYTHON3_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//} instead"
266
WARNING+=	"PYTHON3_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//} instead"
274
.endif
267
.endif
268
.if defined(PYTHON_VERSION)
269
WARNING+=	"PYTHON_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_VERSION:S/^python//} instead"
270
.endif
275
271
276
.if exists(${LOCALBASE}/bin/python)
272
.if exists(${LOCALBASE}/bin/python)
277
.if !defined(_PYTHON_DEFAULT_VERSION)
273
.if !defined(_PYTHON_DEFAULT_VERSION)
Lines 281-287 _PYTHON_DEFAULT_VERSION!= (${LOCALBASE}/bin/python -c \ Link Here
281
.endif
277
.endif
282
_EXPORTED_VARS+=	_PYTHON_DEFAULT_VERSION
278
_EXPORTED_VARS+=	_PYTHON_DEFAULT_VERSION
283
.if defined(PYTHON_DEFAULT) && (${PYTHON_DEFAULT} != ${_PYTHON_DEFAULT_VERSION})
279
.if defined(PYTHON_DEFAULT) && (${PYTHON_DEFAULT} != ${_PYTHON_DEFAULT_VERSION})
284
WARNING+=	"Your requested default python version ${PYTHON_DEFAULT} is different from the installed default python interpreter version ${_PYTHON_DEFAULT_VERSION}"
280
PYTHON_VERSION=		python${PYTHON_DEFAULT}
285
.endif
281
.endif
286
PYTHON_DEFAULT_VERSION=		python${_PYTHON_DEFAULT_VERSION}
282
PYTHON_DEFAULT_VERSION=		python${_PYTHON_DEFAULT_VERSION}
287
.else
283
.else

Return to bug 209204