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

GH-45195: [C++] Update bundled AWS SDK for C++ to 1.11.489 #45306

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
+367 −441
Open

GH-45195: [C++] Update bundled AWS SDK for C++ to 1.11.489 #45306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1640eb2
GH-45195: [C++] Update bundled AWS SDK for C++ to 1.11.488
kou Jan 20, 2025
42d38c0
Add missing diff
kou Jan 20, 2025
28f9ffe
Fix variable name
kou Jan 20, 2025
e446b26
Update versions
kou Jan 22, 2025
1ced4d1
Use aws-lc to intern symbols in s2n-tls
kou Jan 22, 2025
a339236
Disable needless components
kou Jan 22, 2025
d30b604
Add workaround for s2n-tls
kou Jan 22, 2025
4547d9a
Use remove for old CMake
kou Jan 22, 2025
932c770
Link s2n_libcrypto.a
kou Jan 23, 2025
246d077
Fix s2n-tls
kou Jan 26, 2025
8c9d1a9
Don't use OpenSSL
kou Jan 27, 2025
044bc26
Add a missing license header
kou Jan 27, 2025
0df44ae
Don't use aws-lc
kou Jan 27, 2025
8709795
Fix
kou Jan 27, 2025
9be4e71
Disable LTO
kou Jan 27, 2025
bc6f731
Add support for -h
kou Jan 28, 2025
d3ae6af
Fix path
kou Jan 28, 2025
c3fbb56
Use SYSTEM
kou Jan 30, 2025
d53304c
Use OVERRIDE_FIND_PACKAGE
kou Jan 31, 2025
7fda881
Remove s2n-tls.diff
kou Feb 3, 2025
da28238
Use archive
kou Feb 6, 2025
a20c818
Remove duplicated entry
kou Feb 7, 2025
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
6 changes: 1 addition & 5 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,10 @@ endif()

# where to put generated archives (.a files)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}")
set(ARCHIVE_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}")

# where to put generated libraries (.so files)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}")
set(LIBRARY_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}")

# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}")

if(CMAKE_GENERATOR STREQUAL Xcode)
# Xcode projects support multi-configuration builds. This forces a single output directory
Expand Down
12 changes: 7 additions & 5 deletions cpp/cmake_modules/BuildUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ function(ADD_BENCHMARK REL_BENCHMARK_NAME)

if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${REL_BENCHMARK_NAME}.cc)
# This benchmark has a corresponding .cc file, set it up as an executable.
set(BENCHMARK_PATH "${EXECUTABLE_OUTPUT_PATH}/${BENCHMARK_NAME}")
set(BENCHMARK_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${BENCHMARK_NAME}")
add_executable(${BENCHMARK_NAME} ${SOURCES})

if(ARG_STATIC_LINK_LIBS)
Expand Down Expand Up @@ -605,7 +605,8 @@ function(ADD_BENCHMARK REL_BENCHMARK_NAME)
PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH
"$ENV{CONDA_PREFIX}/lib;${EXECUTABLE_OUTPUT_PATH}")
"$ENV{CONDA_PREFIX}/lib;${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
)
endif()

# Add test as dependency of relevant label targets
Expand Down Expand Up @@ -708,7 +709,7 @@ function(ADD_TEST_CASE REL_TEST_NAME)
# Make sure the executable name contains only hyphens, not underscores
string(REPLACE "_" "-" TEST_NAME ${TEST_NAME})

set(TEST_PATH "${EXECUTABLE_OUTPUT_PATH}/${TEST_NAME}")
set(TEST_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_NAME}")
add_executable(${TEST_NAME} ${SOURCES})

# With OSX and conda, we need to set the correct RPATH so that dependencies
Expand All @@ -721,7 +722,8 @@ function(ADD_TEST_CASE REL_TEST_NAME)
PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH
"${EXECUTABLE_OUTPUT_PATH};$ENV{CONDA_PREFIX}/lib")
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY};$ENV{CONDA_PREFIX}/lib"
)
endif()

# Ensure using bundled GoogleTest when we use bundled GoogleTest.
Expand Down Expand Up @@ -865,7 +867,7 @@ function(ADD_ARROW_EXAMPLE REL_EXAMPLE_NAME)

if(EXISTS ${CMAKE_SOURCE_DIR}/examples/arrow/${REL_EXAMPLE_NAME}.cc)
# This example has a corresponding .cc file, set it up as an executable.
set(EXAMPLE_PATH "${EXECUTABLE_OUTPUT_PATH}/${EXAMPLE_NAME}")
set(EXAMPLE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXAMPLE_NAME}")
add_executable(${EXAMPLE_NAME} "${REL_EXAMPLE_NAME}.cc" ${ARG_EXTRA_SOURCES})
target_link_libraries(${EXAMPLE_NAME} ${ARROW_EXAMPLE_LINK_LIBS})
add_dependencies(runexample ${EXAMPLE_NAME})
Expand Down
Loading
Loading