Page MenuHomeFreeBSD
Files F177491487

D963.1794553796.diff
No OneTemporary
Actions

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D963.1794553796.diff
View Options

Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -448,6 +448,16 @@
PYTHON_VERSION?= python${_PYTHON_VERSION}
DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION}
+# NOTE:
+#
+# PYTHON_VERSION will hold whatever is passed down the dependency chain.
+# If a user runs `make PYTHON_VERSION=python3.3, PYTHON_VERSION will be
+# set tp 'python3.3'. A port however may require a different version,
+# which is stored (above) in _PYTHON_VERSION.
+# Every python bit below hence should use python${_PYTHON_VERSION}, since
+# this is the value, the _port_ requires
+#
+
# Got the correct python version, set some publicly accessible variables
PYTHON_VER= ${_PYTHON_VERSION}
PYTHON_SUFFIX= ${_PYTHON_VERSION:S/.//g}
@@ -467,8 +477,8 @@
PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \
2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1
-PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION}${PYTHON_ABIVER}
-PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION}
+PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/python${_PYTHON_VERSION}${PYTHON_ABIVER}
+PYTHON_LIBDIR= ${PYTHONBASE}/lib/python${_PYTHON_VERSION}
PYTHON_PLATFORM= ${OPSYS:tl}${OSREL:C/\.[0-9.]*//}
PYTHON_SITELIBDIR= ${PYTHON_LIBDIR}/site-packages
PYTHON_PKGNAMEPREFIX= py${PYTHON_SUFFIX}-
@@ -626,7 +636,7 @@
PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \
PYTHON_PLATFORM=${PYTHON_PLATFORM} \
PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
- PYTHON_VERSION=${PYTHON_VERSION} \
+ PYTHON_VERSION=${_PYTHON_VERSION} \
PYTHON_VER=${PYTHON_VER}
_USES_POST+= python

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 13, 7:09 AM (6 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41693817
Default Alt Text
D963.1794553796.diff (1 KB)

Event Timeline