[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-0' - external/python3

Michael Stahl (via logerrit) logerrit at kemper.freedesktop.org
Thu Jan 16 14:19:25 UTC 2020


 external/python3/ExternalPackage_python3.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c885123b9817370c1c898e75e58221ab84785e59
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Jan 9 11:01:15 2020 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jan 16 15:18:56 2020 +0100

    python3: fix 32-bit x86 build
    
    The reinvented wheel needs another subst.
    
    Change-Id: I5bc01b0213f00d383cf971d34f0dc2a9e6817ab9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86480
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit db75ec187051090e2eb1b13745fe11a2a5bb1dd0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86485
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 87932b78d7e0d46c7e921a8b3149d67fbefeea0a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86669
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk
index 60eeb022160c..49c798cebe20 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -138,7 +138,7 @@ endif
 # put -pc in its linux platform triplets, so filter that...
 ifneq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
-	LO_lib/_sysconfigdata_m_$(python3_MACHDEP)_$(subst -pc,,$(HOST_PLATFORM)).py \
+	LO_lib/_sysconfigdata_m_$(python3_MACHDEP)_$(subst i686,i386,$(subst -pc,,$(HOST_PLATFORM))).py \
 ))
 endif
 


More information about the Libreoffice-commits mailing list