diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-10-24 22:31:07 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-10-24 22:31:07 +0000 |
| commit | 504fcb758dca4a8d7711501f65ea2720e8b8b90d (patch) | |
| tree | 24b93b87acf5e05ffe77afd9aabe2e054e4ac8be /Mk | |
| parent | 08d754ca828000c7ab7763fe8038d70eeb1182dc (diff) | |
| download | freebsd-ports-504fcb758dca4a8d7711501f65ea2720e8b8b90d.zip | |
Revert r371447, this breaks important ports like devel/py-gobject
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/python.mk | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 0ceff3927095..be9aaad44313 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -448,16 +448,6 @@ IGNORE= needs an unsupported version of Python 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 to '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} @@ -477,8 +467,8 @@ PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \ 2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1 -PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/python${_PYTHON_VERSION}${PYTHON_ABIVER} -PYTHON_LIBDIR= ${PYTHONBASE}/lib/python${_PYTHON_VERSION} +PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION}${PYTHON_ABIVER} +PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION} PYTHON_PLATFORM= ${OPSYS:tl}${OSREL:C/\.[0-9.]*//} PYTHON_SITELIBDIR= ${PYTHON_LIBDIR}/site-packages PYTHON_PKGNAMEPREFIX= py${PYTHON_SUFFIX}- @@ -636,7 +626,7 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \ 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 |