summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-01-09 15:06:07 +0100
committerMichael Stahl <michael.stahl@cib.de>2020-01-13 11:14:30 +0100
commit6b5ce621ff2a82d4fa77d7781d1dabd4b14a4c90 (patch)
tree2304b0813c598f2318a6183eaa89d705d75a30f0 /bin
parente17ed7b1e11174a7b3ed1219ce1df8b26372417a (diff)
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 <michael.stahl@cib.de> (cherry picked from commit 79084665f0e351a3f83fdee88071919f05ec9cc3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86500 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/check-elf-dynamic-objects3
1 files changed, 0 insertions, 3 deletions
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index d1b7ab5522f4..c619fc0cdfc5 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -111,9 +111,6 @@ local file="$1"
# skip the majority of files, no ELF binaries here
skip=1
;;
- */_ctypes.cpython-*.so)
- whitelist="${whitelist} libffi.so.6" # TODO dubious?
- ;;
*/_uuid.cpython-*.so)
whitelist="${whitelist} libuuid.so.1"
;;