-
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.
Browse files
Browse the repository at this point in the history
### Rationale for this change We want to upgrade our CMake version to 3.25 as discussed on the ML: https://lists.apache.org/thread/h8jp16ktrj11fmjmjhlg6xvkvv9wzvjk ### What changes are included in this PR? - Bump minimal CMake version to 3.25 - Manually install CMake on distributions where CMake < 3.25 was installed via package repositories - Minor fixes to CI in order to have passing builds everywhere ### Are these changes tested? Yes, via CI. ### Are there any user-facing changes? Yes, the minimum CMake version to be used to build Arrow is bumped to 3.25. **This PR includes breaking changes to build systems.** * GitHub Issue: #44950 Lead-authored-by: Raúl Cumplido <raulcumplido@gmail.com> Co-authored-by: Bryce Mecum <petridish@gmail.com> Co-authored-by: Sutou Kouhei <kou@clear-code.com> Co-authored-by: Sutou Kouhei <kou@cozmixng.org> Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
- Loading branch information
1 parent
f8ba543
commit fdd3e15
Showing
39 changed files
with
493 additions
and
65 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,35 @@ | ||
<!--- | ||
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. | ||
--> | ||
|
||
# rtools40 patches for AWS SDK and related libs | ||
|
||
The patches in this directory are solely for the purpose of building Arrow C++ | ||
under [Rtools40](https://cran.r-project.org/bin/windows/Rtools/rtools40.html) | ||
and not used elsewhere. Once we've dropped support for Rtools40, we can consider | ||
removing these patches. | ||
|
||
The larger reason these patches are needed is that Rtools provides their own | ||
packages and their versions of the AWS libraries weren't compatible with CMake | ||
3.25. Our solution was to bundle the AWS libs instead and these patches were | ||
required to get them building under the Rtools40 environment. | ||
|
||
The patches were added while upgrading the minimum required CMake version to | ||
3.25 in [GH-44950](https://github.com/apache/arrow/issues/44950). Please see the | ||
associated PR, [GH-44989](https://github.com/apache/arrow/pull/44989), for more | ||
context. |
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,39 @@ | ||
# 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/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,56 @@ | ||
# 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/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 | ||
@@ -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.