Skip to content

Commit 7fda881

Browse files
committed
Remove s2n-tls.diff
1 parent d53304c commit 7fda881

File tree

2 files changed

+13
-51
lines changed

2 files changed

+13
-51
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

+13-9
Original file line numberDiff line numberDiff line change
@@ -5085,18 +5085,22 @@ function(build_awssdk)
50855085
# AWS-C-CAL ->
50865086
# AWS_C_CAL
50875087
string(REGEX REPLACE "-" "_" BASE_VARIABLE_NAME "${BASE_VARIABLE_NAME}")
5088-
set(${BASE_VARIABLE_NAME}_DIFF_FILE
5089-
"${CMAKE_CURRENT_LIST_DIR}/${AWSSDK_PRODUCT}.diff")
5090-
if(EXISTS "${${BASE_VARIABLE_NAME}_DIFF_FILE}")
5091-
if(NOT PATCH)
5092-
find_program(PATCH patch REQUIRED)
5088+
if(AWSSDK_PRODUCT STREQUAL "s2n-tls")
5089+
# S2N_LIBCRYPTO_SUPPORTS_ENGINE.c doesn't refer
5090+
# S2N_INTERN_LIBCRYPTO. We need to use aws-lc with
5091+
# S2N_INTERN_LIBCRYPTO but S2N_LIBCRYPTO_SUPPORTS_ENGINE.c may
5092+
# refer system OpenSSL. So s2n-tls may mix aws-lc and OpenSSL
5093+
# configurations.
5094+
if(CMAKE_VERSION VERSION_LESS 3.17)
5095+
set(${BASE_VARIABLE_NAME}_PATCH_COMMAND
5096+
${CMAKE_COMMAND} -E remove tests/features/S2N_LIBCRYPTO_SUPPORTS_ENGINE.c)
5097+
else()
5098+
set(${BASE_VARIABLE_NAME}_PATCH_COMMAND
5099+
${CMAKE_COMMAND} -E rm tests/features/S2N_LIBCRYPTO_SUPPORTS_ENGINE.c)
50935100
endif()
5094-
set(${BASE_VARIABLE_NAME}_PATCH_COMMAND ${PATCH} -p1 -i
5095-
"${${BASE_VARIABLE_NAME}_DIFF_FILE}")
50965101
endif()
50975102
fetchcontent_declare(${AWSSDK_PRODUCT}
5098-
${FC_DECLARE_COMMON_OPTIONS}
5099-
OVERRIDE_FIND_PACKAGE
5103+
${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
51005104
PATCH_COMMAND ${${BASE_VARIABLE_NAME}_PATCH_COMMAND}
51015105
URL ${${BASE_VARIABLE_NAME}_SOURCE_URL}
51025106
URL_HASH "SHA256=${ARROW_${BASE_VARIABLE_NAME}_BUILD_SHA256_CHECKSUM}"

cpp/cmake_modules/s2n-tls.diff

-42
This file was deleted.

0 commit comments

Comments
 (0)