[Libreoffice-commits] core.git: external/python3

[Julien Nabet (via logerrit)]

 external/python3/ExternalPackage_python3.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 8aae3b37a6553d645bfc94855adbbd1859e07692
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Jan 2 16:40:01 2021 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Jan 2 22:09:52 2021 +0100

    Fix build error in Python3 for Raspberry pi4b
    
    /home/pi/lo/libreoffice/external/python3/ExternalPackage_python3.mk:48:
    *** file /home/pi/lo/libreoffice/workdir/UnpackedTarball/python3/LO_lib/_sysconfigdata__linux_armv7l-unknown-linux-gnueabihf.py
    does not exist in the tarball. Arrêt.
    
    Change-Id: If348c9f55883c1afcc37ff38e84361786bef1845
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108595
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk
index 5f1fd5ae70ea..8448d24db3b0 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -140,10 +140,17 @@ endif
 # note: python configure overrides config.guess with something that doesn't
 # put -pc in its linux platform triplets, so filter that...
 ifneq ($(OS),WNT)
+ifeq ($(CPUNAME),ARM)
+$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+	LO_lib/_sysconfigdata_$(if $(ENABLE_DBGUTIL),d)_$(python3_MACHDEP)_$(subst i686,i386,$(subst v7l-unknown,,$(HOST_PLATFORM))).py \
+))
+else
 $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
 	LO_lib/_sysconfigdata_$(if $(ENABLE_DBGUTIL),d)_$(python3_MACHDEP)_$(subst i686,i386,$(subst -pc,,$(HOST_PLATFORM))).py \
 ))
 endif
+endif
+
 
 # packages not shipped:
 # dbm, sqlite3 - need some database stuff