Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aws - force them to use vcpkg openssl #43559

Merged
merged 1 commit into from
Feb 1, 2025
+35 −6
Merged

aws - force them to use vcpkg openssl #43559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/aws-c-cal/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ vcpkg_cmake_configure(
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
-DBUILD_TESTING=FALSE
-DUSE_OPENSSL=ON
)

vcpkg_cmake_install()
Expand Down
6 changes: 2 additions & 4 deletions ports/aws-c-cal/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"name": "aws-c-cal",
"version": "0.8.1",
"port-version": 1,
"description": "C99 wrapper for cryptography primitives.",
"homepage": "https://github.com/awslabs/aws-c-cal",
"license": "Apache-2.0",
"dependencies": [
"aws-c-common",
{
"name": "openssl",
"platform": "!windows & !osx"
},
"openssl",
{
"name": "vcpkg-cmake",
"host": true
Expand Down
18 changes: 18 additions & 0 deletions ports/s2n/openssl.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d16e5f5f0..133934580 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,9 +266,10 @@ if (TARGET crypto)
message(STATUS "S2N found target: crypto")
set(LINK_LIB "crypto")
else()
- find_package(crypto REQUIRED)
- message(STATUS "Using libcrypto from the cmake path")
- set(LINK_LIB "AWS::crypto")
+ find_package(OpenSSL REQUIRED)
+ find_package(Threads REQUIRED)
+ set(LINK_LIB OpenSSL::Crypto Threads::Threads)
+ message(STATUS "Using libcrypto from system: ${OPENSSL_CRYPTO_LIBRARY}")
endif()

if (S2N_INTERN_LIBCRYPTO)
1 change: 1 addition & 0 deletions ports/s2n/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ vcpkg_from_github(
SHA512 17f49a114a3e3934cea2ebff47198417927d405194f901540380844f9481d11ccff2219b3512bd20a1f3d1945515b637b609aceaaa3b55701574df1d859125ec
PATCHES
fix-cmake-target-path.patch
openssl.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
1 change: 1 addition & 0 deletions ports/s2n/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "s2n",
"version": "1.5.9",
"port-version": 1,
"description": "C99 implementation of the TLS/SSL protocols.",
"homepage": "https://github.com/aws/s2n-tls",
"license": "Apache-2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/aws-c-cal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ae1e76b2294cf592859b288d712026c46a69b57e",
"version": "0.8.1",
"port-version": 1
},
{
"git-tree": "2cdde2097cab22f8b121239ab9e0484efd564dd7",
"version": "0.8.1",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@
},
"aws-c-cal": {
"baseline": "0.8.1",
"port-version": 0
"port-version": 1
},
"aws-c-common": {
"baseline": "0.10.6",
Expand Down Expand Up @@ -8138,7 +8138,7 @@
},
"s2n": {
"baseline": "1.5.9",
"port-version": 0
"port-version": 1
},
"safeint": {
"baseline": "3.0.28",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/s2n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "95874bf291a388a7594609bd1a2d6a1d06d18f9d",
"version": "1.5.9",
"port-version": 1
},
{
"git-tree": "c97aa61e43c57233ca6d62a3e364d85651f9c0ac",
"version": "1.5.9",
Expand Down