diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-09-21 16:08:45 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-11-08 13:23:25 +0100 |
| commit | 45aee4858c62fb4c8066bd0bb0aa4f468d110a5e (patch) | |
| tree | 1ab881572a4c807b96c0a03c4aa096cc5a97ee6f | |
| parent | 94b80f2c9ea2740dfa9658ea368478ff017773e7 (diff) | |
python3: find the bundled openssl headers
This failed because it finds /usr/include header first, which doesn't
contain a findable version number in 3.0.5 so fails with:
warning: openssl 0x00000000 is too old for _hashlib
Change-Id: Ie7d92f5940c0ea2d9b24aa6ea3051e8454c546f6
(cherry picked from commit 6afdf2c5a0a742cb405b27eea0e930f9cdc41b27)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142424
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | external/python3/python-3.5.4-ssl.patch.1 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/external/python3/python-3.5.4-ssl.patch.1 b/external/python3/python-3.5.4-ssl.patch.1 index beb6fe38882f..7dfe878ef80d 100644 --- a/external/python3/python-3.5.4-ssl.patch.1 +++ b/external/python3/python-3.5.4-ssl.patch.1 @@ -81,3 +81,14 @@ diff -ru python3.orig/setup.py python3/setup.py '/usr/contrib/ssl/lib/' ] ) +--- python3/setup.py.orig2 2022-09-21 16:04:12.855249707 +0200 ++++ python3/setup.py 2022-09-21 16:04:30.752236913 +0200 +@@ -848,7 +848,7 @@ + + # look for the openssl version header on the compiler search path. + opensslv_h = find_file('openssl/opensslv.h', [], +- inc_dirs + search_for_ssl_incs_in) ++ search_for_ssl_incs_in + inc_dirs) + if opensslv_h: + name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') + if host_platform == 'darwin' and is_macosx_sdk_path(name): |