summaryrefslogtreecommitdiff
path: root/readlicense_oo
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-09 17:56:19 +0100
commit79084665f0e351a3f83fdee88071919f05ec9cc3 (patch)
treead47bc4e364424b7cfbb4dc6ae72fc7f25af31fa /readlicense_oo
parent25916a651ca4eaa535022aeddfcb57b7f7a9f2f0 (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>
Diffstat (limited to 'readlicense_oo')
-rw-r--r--readlicense_oo/license/license.xml23
1 files changed, 23 insertions, 0 deletions
diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 265dd98d2f3a..3bf0c1252484 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1686,6 +1686,29 @@
ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
UPDATES, ENHANCEMENTS, OR MODIFICATIONS.</p>
</div>
+ <div class ="LIBFFI">
+ <h2>libffi</h2>
+ <p>The following software may be included in this product: libffi</p>
+ <p>The libffi project code is covered by the MIT license:</p>
+ <p>libffi - Copyright (c) 1996-2019 Anthony Green, Red Hat, Inc and others.</p>
+ <p>See source files for details.</p>
+ <p>Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ ``Software''), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:</p>
+ <p>The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.</p>
+ <p>THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+ </div>
<div class="PYTHON">
<h2>Python</h2>
<p>The following software may be included in this product: Python. Use of any of this software is governed by