diff options
author | Michael Stahl <mstahl@redhat.com> | 2017-08-22 22:26:43 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-05-10 16:17:39 +0200 |
commit | 3fdd4c39e09acb7b31db9ffdf509eb1a5dd9affe (patch) | |
tree | 5e52f9adca52078583f3ff3d14d9534b4e5ba4cf | |
parent | 42570061a1c344dfb4b4a87ffa6d786172aa71e0 (diff) |
configure: try to keep PYTHON_VERSION from going stale
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
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit ac3a4fe35e873de17eefb46c3f5e792aded6b0a5)
-rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 99253014d044..9b078fcb9d3f 100644 --- a/configure.ac +++ b/configure.ac @@ -8274,7 +8274,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 |