[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - external/python3

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Sun Nov 15 23:12:16 UTC 2020


 external/python3/macos-11.patch.0 |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 8d46a8dbbdee54ea8082c372e8a07cd705d028dc
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Sun Nov 15 21:22:49 2020 +0000
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 16 00:11:45 2020 +0100

    Make one more thing in Python compile for macOS on arm64
    
    Change-Id: I6716048f0b58eb502b9d1ade8a13b8e33e4aaf2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105907
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/external/python3/macos-11.patch.0 b/external/python3/macos-11.patch.0
index 11daf84d2710..d3dbbf605639 100644
--- a/external/python3/macos-11.patch.0
+++ b/external/python3/macos-11.patch.0
@@ -45,3 +45,15 @@
          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


More information about the Libreoffice-commits mailing list