diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-24 08:26:33 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-06-28 15:13:31 +0200 |
| commit | 5a82e48131faa056fd7c16122f414f44e12b5679 (patch) | |
| tree | 413632cf0431ee8e4fccf1677f17b55d91bbb262 | |
| parent | 65070087508f176a2a65a0cfbe628ab2994e824f (diff) | |
python3: update to 3.8.10
So we don't build 3.8.8rc1 anymore. I didn't look into 3.9.
Change-Id: Ife7d898c913b9b164168b0ef23a055deea55815f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117757
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit c22fc8e1f60bb98a87d22e7ff9bd3290dbb9fe02)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117854
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/python3/macos-11.patch.0 | 36 |
3 files changed, 3 insertions, 39 deletions
diff --git a/configure.ac b/configure.ac index 23a1040a6d76..a8e153ab5c6d 100644 --- a/configure.ac +++ b/configure.ac @@ -9680,7 +9680,7 @@ internal) SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=8 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.8 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.10 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 503c666b1ce6..05b5b8b8e8fc 100644 --- a/download.lst +++ b/download.lst @@ -220,8 +220,8 @@ export POPPLER_DATA_SHA256SUM := 6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69 export POPPLER_DATA_TARBALL := poppler-data-0.4.10.tar.gz export POSTGRESQL_SHA256SUM := 12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2 -export PYTHON_SHA256SUM := bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6 -export PYTHON_TARBALL := Python-3.8.8rc1.tar.xz +export PYTHON_SHA256SUM := 6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9 +export PYTHON_TARBALL := Python-3.8.10.tar.xz export QXP_SHA256SUM := e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c export QXP_TARBALL := libqxp-0.0.2.tar.xz export RAPTOR_SHA256SUM := ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed diff --git a/external/python3/macos-11.patch.0 b/external/python3/macos-11.patch.0 index 3c42d515f6bd..e2f13ac4c426 100644 --- a/external/python3/macos-11.patch.0 +++ b/external/python3/macos-11.patch.0 @@ -1,27 +1,3 @@ --*- Mode: diff -*- ---- configure -+++ configure -@@ -9372,6 +9275,9 @@ - esac - else - case `/usr/bin/arch` in -+ arm64) -+ MACOSX_DEFAULT_ARCH="arm64" -+ ;; - i386) - MACOSX_DEFAULT_ARCH="x86_64" - ;; ---- Mac/Tools/pythonw.c -+++ Mac/Tools/pythonw.c -@@ -121,6 +121,8 @@ - cpu_types[0] = CPU_TYPE_POWERPC; - #elif defined(__i386__) - cpu_types[0] = CPU_TYPE_X86; -+#elif defined(__arm64__) -+ cpu_types[0] = CPU_TYPE_ARM64; - #else - # error "Unknown CPU" - #endif --- setup.py +++ setup.py @@ -670,7 +670,10 @@ @@ -36,18 +12,6 @@ system_include_dirs = ['/usr/include'] # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can ---- Modules/_decimal/libmpdec/mpdecimal.h -+++ Modules/_decimal/libmpdec/mpdecimal.h -@@ -135,6 +135,9 @@ - #elif defined(__x86_64__) - #define CONFIG_64 - #define ASM -+ #elif defined(__arm64__) -+ #define CONFIG_64 -+ #define ANSI - #else - #error "unknown architecture for universal build." - #endif --- Modules/_posixsubprocess.c +++ Modules/_posixsubprocess.c @@ -31,6 +31,8 @@ |