diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-01-02 16:40:01 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2021-01-02 22:09:52 +0100 |
| commit | 8aae3b37a6553d645bfc94855adbbd1859e07692 (patch) | |
| tree | ecd205f6d43a3fbb7508c433f7f121d97f6508cb /external | |
| parent | ac624ef10a4620c2a12ea688e313a8d5173052cf (diff) | |
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@yahoo.fr>
Diffstat (limited to 'external')
| -rw-r--r-- | external/python3/ExternalPackage_python3.mk | 7 |
1 files changed, 7 insertions, 0 deletions
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 |