From 79084665f0e351a3f83fdee88071919f05ec9cc3 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 9 Jan 2020 15:06:07 +0100 Subject: python3: bundle libffi for GNU/Linux builds CPython commit f40d4ddff3c800b3c956a5e8820aabe3aa87cddd "Closes #27979: Remove bundled copy of libffi" causes a bit of a problem because it turns out that libffi isn't all that stable; there's libffi.so.5 on CentOS 6, libffi.so.6 on CentOS 7 and libffi.so.7 on lo_daily_update_gandalf tinderbox. So we have to bundle it in LO; it's only used on GNU/Linux currently. CPython commit 32119e10b792ad7ee4e5f951a2d89ddbaf111cc5 "bpo-35947: Update Windows to the current version of libffi (GH-11797)" also removes the libffi for MSVC, so in a future python upgrade we will have to build libffi for MSVC too. The libffi fork for MacOSX is still in CPython git master. (regression from b10be5d48433076f0b7238d818020f708553e114) Change-Id: Ibc20cf8cd3614cf9941b6970662bd930496776b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86493 Tested-by: Jenkins Reviewed-by: Michael Stahl --- RepositoryExternal.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'RepositoryExternal.mk') diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6cf31f5c17ab..952e915aa7a7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3192,6 +3192,12 @@ endif endef +# this is only used by python currently +define gb_ExternalProject__use_libffi +$(call gb_ExternalProject_use_external_project,$(1),libffi) + +endef + endif # SYSTEM_PYTHON # ORCUS -- cgit v1.2.3