Skip to content

Commit 7069021

Browse files
Update openssl 1.1 to 3 (actions#316)
* Update openssl to 3 * openssl update 3
1 parent d8ae6ee commit 7069021

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

builders/macos-python-builder.psm1

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ class macOSPythonBuilder : NixPythonBuilder {
6868
### and then add the appropriate paths for the header and library files to configure command.
6969
### Link to documentation (https://cpython-devguide.readthedocs.io/setup/#build-dependencies)
7070
if ($this.Version -lt "3.7.0") {
71-
$env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib -L/usr/local/opt/zlib/lib"
72-
$env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/zlib/include"
71+
$env:LDFLAGS = "-L/usr/local/opt/openssl@3/lib -L/usr/local/opt/zlib/lib"
72+
$env:CFLAGS = "-I/usr/local/opt/openssl@3/include -I/usr/local/opt/zlib/include"
7373
} else {
74-
$configureString += " --with-openssl=/usr/local/opt/openssl@1.1"
74+
$configureString += " --with-openssl=/usr/local/opt/openssl@3"
7575

7676
# For Python 3.7.2 and 3.7.3 we need to provide PATH for zlib to pack it properly. Otherwise the build will fail
7777
# with the error: zipimport.ZipImportError: can't decompress data; zlib not available

tests/sources/python-config-test.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454
if os_type == 'Darwin':
5555
### Validate openssl links
5656
if version_major == 3 and version_minor < 7:
57-
expected_ldflags = '-L/usr/local/opt/openssl@1.1/lib'
57+
expected_ldflags = '-L/usr/local/opt/openssl@3/lib'
5858
ldflags = sysconfig.get_config_var('LDFLAGS')
5959

6060
if not expected_ldflags in ldflags:
6161
print('Invalid ldflags: %s; Expected: %s' % (ldflags, expected_ldflags))
6262
exit(1)
6363
else:
64-
expected_openssl_includes = '-I/usr/local/opt/openssl@1.1/include'
65-
expected_openssl_ldflags ='-L/usr/local/opt/openssl@1.1/lib'
64+
expected_openssl_includes = '-I/usr/local/opt/openssl@3/include'
65+
expected_openssl_ldflags ='-L/usr/local/opt/openssl@3/lib'
6666

6767
openssl_includes = sysconfig.get_config_var('OPENSSL_INCLUDES')
6868
openssl_ldflags = sysconfig.get_config_var('OPENSSL_LDFLAGS')

0 commit comments

Comments
 (0)