configure.ac | 18 +++++++++---------
download.lst | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 7220412c789e755b51747a1dfed6e72846e7cf8c
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Sat Sep 7 14:17:53 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sat Sep 7 16:33:18 2024 +0200
python: upgrade to 3.10.15
Downloaded from
https://www.python.org/ftp/python/3.10.15/Python-3.10.15.tar.xz
Change-Id: I269ff9fa4565b5fdda6ba29bf6ac93bcf8daaa03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172995
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/configure.ac b/configure.ac
index 89787b5327b0..1ab001abbbca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7239,9 +7239,9 @@ if test "$build_os" = "cygwin" -o "$build_os" = "wsl" -o
-n "$WSL_ONLY_AS_HELPER
else
AC_MSG_RESULT([$CSC_PATH/csc.exe])
fi
-
+
CSC_PATH=`win_short_path_for_make "$CSC_PATH"`
-
+
dnl Check al.exe
AC_MSG_CHECKING([for al.exe])
if test -n "$winsdkbinsubdir" \
@@ -7253,7 +7253,7 @@ if test "$build_os" = "cygwin" -o "$build_os" = "wsl" -o
-n "$WSL_ONLY_AS_HELPER
elif test -f "$winsdktest_unix/Bin/al.exe"; then
AL_PATH="$winsdktest/Bin"
fi
-
+
if test -z "$AL_PATH"; then
find_al
PathFormat "$altest"
@@ -7270,9 +7270,9 @@ if test "$build_os" = "cygwin" -o "$build_os" = "wsl" -o
-n "$WSL_ONLY_AS_HELPER
else
AC_MSG_RESULT([$AL_PATH/al.exe])
fi
-
+
AL_PATH=`win_short_path_for_make "$AL_PATH"`
-
+
dnl Check mscoree.lib / .NET Framework dir
AC_MSG_CHECKING(.NET Framework)
find_dotnetsdk
@@ -7290,13 +7290,13 @@ if test "$build_os" = "cygwin" -o "$build_os" = "wsl"
-o -n "$WSL_ONLY_AS_HELPER
AC_MSG_ERROR([mscoree.lib not found])
fi
AC_MSG_RESULT([found: $DOTNET_FRAMEWORK_HOME])
-
+
PathFormat "$AL_PATH"
AL_PATH="$formatted_path"
-
+
PathFormat "$DOTNET_FRAMEWORK_HOME"
DOTNET_FRAMEWORK_HOME="$formatted_path"
-
+
PathFormat "$CSC_PATH"
CSC_PATH="$formatted_path"
@@ -10377,7 +10377,7 @@ if test \( "$cross_compiling" = yes -a -z
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=10
- PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.14
+ PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
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
diff --git a/download.lst b/download.lst
index 471cbf02b32d..ccbdc9eb5b2d 100644
--- a/download.lst
+++ b/download.lst
@@ -590,8 +590,8 @@ POSTGRESQL_TARBALL := postgresql-14.13.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-PYTHON_SHA256SUM :=
9c50481faa8c2832329ba0fc8868d0a606a680fc4f60ec48d26ce8e076751fda
-PYTHON_TARBALL := Python-3.10.14.tar.xz
+PYTHON_SHA256SUM :=
aab0950817735172601879872d937c1e4928a57c409ae02369ec3d91dccebe79
+PYTHON_TARBALL := Python-3.10.15.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
