-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GH-44950: [C++] Bump minimum CMake version to 3.25
Try installing CMake 3.25 manually on Ubuntu Install cmake in linux-apt-lint.dockerfile and update install_cmake.sh to not require platform argument Install CMake 3.25.0 on several Ubuntu jobs and Windows jobs that require the existing version to be bumped Several fixes to install_cmake Some more fixes and upgrade minimal examples to use Ubuntu 24.04 Some more fixes for R Update from CMAKE to CMAKE_VERSION Ensure that versions returned are strings, bump cmake download Try forcing MINGW package to pull a newer CMake Revert trying to pull newer CMake Try to completely remove mingw CMake from CRAN /c/cmake/bin/cmake.exe should be present and in path, try with .exe Try with full path for CMake Try removing manual installation of CMake and installing CMake via pacman before setting up RTools Remove manual Installation of CMake from pacman not present More tries Temporarily try using msys2 GH action to install cmake Remove CMake from PKGBUILD CMake should be in the path Debug new CMake location Try with C:\Program Files\CMake\bin\cmake.exe Just testing at this point Bundle AWSSDK under RTools (#90) Check for mingw Check Windows compiler Try modifying patch due to redefinition Try fixing patch AWS is bundled on Windows R now, do not use MSYS libraries Fix license header on patch + add CMake condition for AWS patch Update configure.win to remove specific AWS CPP libs Update r/configure.win Co-authored-by: Bryce Mecum <[email protected]> Update r/configure.win Test turning ccache back on Update ci/scripts/r_windows_build.sh Co-authored-by: Neal Richardson <[email protected]> Update r/configure.win Co-authored-by: Neal Richardson <[email protected]> Review comments Remove MSYS2_ARG_CONV_EXCL Testing with manually adding missing rtools40 Add correct slash for path Add comment on why MSYS2_ARG_CONV_EXCL is required Use MSYS2_ARG_CONV_EXCL on the same CMake command Update tutorial examples to use a newer Ubuntu Add CMAKE_VERSION to cuda jobs Upgrade minimal Ubuntu to use 24.04 instead of 22.04 Fix minimal build for Ubuntu 24.04 ubuntu-cuda-cpp requires cmake argument Add cmake to docker-compose.yml missing images Add missing cmake to some more images Some more fixing mainly for R binary jobs Set CMAKE to newly installed path Revert "Try modifying patch due to redefinition" This reverts commit b772b23. Reapply "Try modifying patch due to redefinition" This reverts commit 1d71375. Hardcode enum value I tried to find a proper way to include-guard this but everything I tried didn't work. Remove outdated refs to aws libs Since we are bundling these we don't have these to copy Move _WIN32_WINNT def into {c,cxx}flags Ignore warnings-as-errors in cmake
- Loading branch information
Showing
36 changed files
with
516 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake | ||
| index b717bca..5aa8ac9 100644 | ||
| --- a/cmake/AwsCFlags.cmake | ||
| +++ b/cmake/AwsCFlags.cmake | ||
| @@ -120,6 +120,10 @@ function(aws_set_common_properties target) | ||
| list(APPEND AWS_C_FLAGS -Wno-strict-aliasing) | ||
| endif() | ||
|
|
||
| + if(CMAKE_C_IMPLICIT_LINK_LIBRARIES MATCHES "mingw32") | ||
| + list(APPEND AWS_C_FLAGS -D__USE_MINGW_ANSI_STDIO=1 -Wno-unused-local-typedefs) | ||
| + endif() | ||
| + | ||
| # -moutline-atomics generates code for both older load/store exclusive atomics and also | ||
| # Arm's Large System Extensions (LSE) which scale substantially better on large core count systems. | ||
| # | ||
| diff --git a/include/aws/common/byte_order.inl b/include/aws/common/byte_order.inl | ||
| index 1204be0..0abd9cb 100644 | ||
| --- a/include/aws/common/byte_order.inl | ||
| +++ b/include/aws/common/byte_order.inl | ||
| @@ -13,7 +13,7 @@ | ||
| # include <stdlib.h> | ||
| #else | ||
| # include <netinet/in.h> | ||
| -#endif /* _MSC_VER */ | ||
| +#endif /* _WIN32 */ | ||
|
|
||
| AWS_EXTERN_C_BEGIN | ||
|
|
||
| @@ -39,7 +39,7 @@ AWS_STATIC_IMPL uint64_t aws_hton64(uint64_t x) { | ||
| uint64_t v; | ||
| __asm__("bswap %q0" : "=r"(v) : "0"(x)); | ||
| return v; | ||
| -#elif defined(_MSC_VER) | ||
| +#elif defined(_WIN32) | ||
| return _byteswap_uint64(x); | ||
| #else | ||
| uint32_t low = x & UINT32_MAX; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| diff --git a/source/windows/host_resolver.c b/source/windows/host_resolver.c | ||
| index 59fbb85..ad4a99e 100644 | ||
| --- a/source/windows/host_resolver.c | ||
| +++ b/source/windows/host_resolver.c | ||
| @@ -4,6 +4,7 @@ | ||
| */ | ||
|
|
||
| /* don't move this below the Windows.h include!!!!*/ | ||
| +#define _WIN32_WINNT 0x0601 | ||
| #include <winsock2.h> | ||
| #include <ws2tcpip.h> | ||
|
|
||
| diff --git a/source/windows/iocp/iocp_event_loop.c b/source/windows/iocp/iocp_event_loop.c | ||
| index 9ccce30..5cbbef7 100644 | ||
| --- a/source/windows/iocp/iocp_event_loop.c | ||
| +++ b/source/windows/iocp/iocp_event_loop.c | ||
| @@ -12,6 +12,7 @@ | ||
|
|
||
| #include <aws/io/logging.h> | ||
|
|
||
| +#define _WIN32_WINNT 0x0601 | ||
| #include <Windows.h> | ||
|
|
||
| /* The next set of struct definitions are taken directly from the | ||
| diff --git a/source/windows/secure_channel_tls_handler.c b/source/windows/secure_channel_tls_handler.c | ||
| index 50caf02..29fe850 100644 | ||
| --- a/source/windows/secure_channel_tls_handler.c | ||
| +++ b/source/windows/secure_channel_tls_handler.c | ||
| @@ -2,6 +2,7 @@ | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * SPDX-License-Identifier: Apache-2.0. | ||
| */ | ||
| +#define _WIN32_WINNT 0x0601 | ||
| #define SECURITY_WIN32 | ||
|
|
||
| #include <aws/io/tls_channel_handler.h> | ||
| @@ -35,6 +36,25 @@ | ||
| # pragma warning(disable : 4306) /* Identifier is type cast to a larger pointer. */ | ||
| #endif | ||
|
|
||
| +#ifndef SP_PROT_TLS1_0_SERVER | ||
| +#define SP_PROT_TLS1_0_SERVER SP_PROT_TLS1_SERVER | ||
| +#endif | ||
| +#ifndef SP_PROT_TLS1_0_CLIENT | ||
| +#define SP_PROT_TLS1_0_CLIENT SP_PROT_TLS1_CLIENT | ||
| +#endif | ||
| +#ifndef SP_PROT_TLS1_1_SERVER | ||
| +#define SP_PROT_TLS1_1_SERVER 0x00000100 | ||
| +#endif | ||
| +#ifndef SP_PROT_TLS1_1_CLIENT | ||
| +#define SP_PROT_TLS1_1_CLIENT 0x00000200 | ||
| +#endif | ||
| +#ifndef SCH_USE_STRONG_CRYPTO | ||
| +#define SCH_USE_STRONG_CRYPTO 0x00400000 | ||
| +#endif | ||
| +#ifndef SECBUFFER_ALERT | ||
| +#define SECBUFFER_ALERT 0x11 | ||
| +#endif | ||
| + | ||
| #define KB_1 1024 | ||
| #define READ_OUT_SIZE (16 * KB_1) | ||
| #define READ_IN_SIZE READ_OUT_SIZE | ||
| @@ -456,7 +476,7 @@ static int s_fillin_alpn_data( | ||
|
|
||
| *extension_length += sizeof(uint32_t) + sizeof(uint16_t); | ||
|
|
||
| - *extension_name = SecApplicationProtocolNegotiationExt_ALPN; | ||
| + *extension_name = 2; | ||
| /*now add the protocols*/ | ||
| for (size_t i = 0; i < protocols_count; ++i) { | ||
| struct aws_byte_cursor *protocol_ptr = NULL; |
Oops, something went wrong.