Skip to content

Commit 838b47b

Browse files
committed
add openssl 3 patch
1 parent db935bc commit 838b47b

File tree

3 files changed

+28
-99
lines changed

3 files changed

+28
-99
lines changed

recipe/meta.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ source:
8484
- patches/0023-unvendor-xz.patch
8585
- patches/0024-unvendor-zlib.patch
8686
- patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
87+
{% if (openssl | string).startswith('3.0') %}
88+
- patches/0026-Use-OpenSSL-3-instead-of-1_1.patch
89+
{% endif %}
8790

8891
build:
8992
number: {{ build_number }}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From c12df60ecaa0be147bb57f03fd031ca0776eb24c Mon Sep 17 00:00:00 2001
2+
From: Charles Bousseau <[email protected]>
3+
Date: Fri, 16 Jun 2023 13:14:12 -0400
4+
Subject: [PATCH] [PATCH] Use OpenSSL 3 instead of 1_1
5+
6+
---
7+
PCbuild/openssl.props | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
11+
index 7071bb57c0..b336a193ef 100644
12+
--- a/PCbuild/openssl.props
13+
+++ b/PCbuild/openssl.props
14+
@@ -10,7 +10,7 @@
15+
</Link>
16+
</ItemDefinitionGroup>
17+
<PropertyGroup>
18+
- <_DLLSuffix>-1_1</_DLLSuffix>
19+
+ <_DLLSuffix>-3</_DLLSuffix>
20+
<_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
21+
<_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
22+
<OpenSSLDLLSuffix>$(_DLLSuffix)</OpenSSLDLLSuffix>
23+
--
24+
2.32.1 (Apple Git-133)
25+

recipe/patches/0026-revert-windows-build-changes.patch

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)