configure: try to keep PYTHON_VERSION from going stale

Desktop / LibreOffice - Michael Stahl [redhat.com] - 23 August 2017 04:25 EDT

Since it was set to 3.5.0, the bundled python was upgraded twice, but the directory is still named python-core-3.5.0 :(

Change-Id: I15eec4148c2436e1f289d9851ce5bd212d4a368a Reviewed-on: https://gerrit.libreoffice.org/41433

###

diff --git a/configure.ac b/configure.ac
index fa06356..1cb18b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8128,7 +8128,10 @@ internal)
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=5
- PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
+ PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
+ if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
+ AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst])
+ fi
AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"])
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set

ac3a4fe configure: try to keep PYTHON_VERSION from going stale
configure.ac | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

Upstream: cgit.freedesktop.org


  • Share