From c6ef4747efc491fdc73072a288fddf40d9d2412c Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Fri, 25 Dec 2015 21:55:34 +0000 Subject: Do not cache PYTHON_PORTVERSION, it is not invariant between ports --- Mk/Scripts/functions.sh | 1 - Mk/Uses/python.mk | 1 - 2 files changed, 2 deletions(-) (limited to 'Mk') diff --git a/Mk/Scripts/functions.sh b/Mk/Scripts/functions.sh index c39370dca819..e07919e6e1a4 100644 --- a/Mk/Scripts/functions.sh +++ b/Mk/Scripts/functions.sh @@ -184,7 +184,6 @@ export_ports_env() { OPSYS \ OSREL \ OSVERSION \ - PYTHON_PORTVERSION \ PYTHONBASE \ UID \ _JAVA_OS_LIST_REGEXP \ diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 7dd2d39b8897..70e12360bf83 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -390,7 +390,6 @@ PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX} .if !defined(PYTHON_PORTVERSION) PYTHON_PORTVERSION!= ${MAKE} -V PORTVERSION -C ${PYTHON_PORTSDIR} .endif -_EXPORTED_VARS+= PYTHON_PORTVERSION .endif # Create a 4 integer version string, prefixing 0 to the last token if # it's a single character. Only use the the first 3 tokens of -- cgit v1.2.3