diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-02-07 15:15:58 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-02-07 20:04:22 +0100 |
| commit | 9c7a9060adbbcd0fbf593a811b5a02fe9bae898a (patch) | |
| tree | 32867cd262398b94c7d20a8c45125c4a9dc7b151 | |
| parent | 2462947feb8d56e8eb576c2071e3642e730d360e (diff) | |
tdf#140236 WIN install libffi with Python
Regression from commit b4dfba947768834ffecc09056992019878711c8b
("python3: update to 3.8.4"). Previous Python versions included
the source for libffi on all platforms, but now just for MacOS.
So now LO must build that DLL on Windows, which was done in
commit 883068462fe5bcbb01a8e14736fc06d0c3695c62 ("libffi: build
DLL on Windows").
Since OpenSSL is installed in the program directory and the LO
Python directory, this currently works "accidentially". Not sure
the Python OpenSSL DLLs should be handled via some extra gbuild
package to separate both, but that can be done in an additional
change.
Change-Id: I4a42e39cc2f4434a9944aad32836f66ec2819931
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110537
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit fad7e203a25963128b9ce786d3fc465a32c238ce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110553
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | RepositoryExternal.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 78cc07bdd7a1..ad3febbae41b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3169,6 +3169,7 @@ else # !SYSTEM_PYTHON $(eval $(call gb_Helper_register_packages_for_install,python,\ python3 \ + $(if $(filter WNT,$(OS)),libffi) \ )) define gb_LinkTarget__use_python_headers |