thisisnic commented on code in PR #48297:
URL: https://github.com/apache/arrow/pull/48297#discussion_r2627190098
##########
r/tools/nixlibs.R:
##########
@@ -340,39 +328,27 @@ get_macos_openssl_dir <- function() {
}
# (built with newer devtoolset but older glibc (2.17) for broader
compatibility, like manylinux2014)
-determine_binary_from_stderr <- function(errs) {
- if (is.null(attr(errs, "status"))) {
- # There was no error in compiling: so we found libcurl and OpenSSL >= 1.1,
- # openssl is < 3.0
- lg("Found libcurl and OpenSSL >= 1.1")
- return("openssl-1.1")
- # Else, check for dealbreakers:
- } else if (!on_macos && any(grepl("Using libc++", errs, fixed = TRUE))) {
+has_curl_and_openssl <- function(errs) {
+ # Check for dealbreakers:
+ if (!on_macos && any(grepl("Using libc++", errs, fixed = TRUE))) {
# Our linux binaries are all built with GNU stdlib so they fail with libc++
lg("Linux binaries incompatible with libc++")
- return(NULL)
+ return(FALSE)
} else if (header_not_found("curl/curl", errs)) {
lg("libcurl not found")
- return(NULL)
+ return(FALSE)
} else if (header_not_found("openssl/opensslv", errs)) {
lg("OpenSSL not found")
- return(NULL)
- } else if (any(grepl("OpenSSL version too old", errs))) {
- lg("OpenSSL found but version >= 1.0.2 is required for some features")
- return(NULL)
- # Else, determine which other binary will work
- } else if (any(grepl("Using OpenSSL version 1.0", errs))) {
- if (on_macos) {
- lg("OpenSSL 1.0 is not supported on macOS")
- return(NULL)
- }
- lg("Found libcurl and OpenSSL < 1.1")
- return("openssl-1.0")
- } else if (any(grepl("Using OpenSSL version 3", errs))) {
+ return(FALSE)
+ } else if (any(grepl("OpenSSL version must be 3.0 or greater", errs))) {
+ lg("OpenSSL found but version >= 3.0.0 is required")
Review Comment:
We do not, will update
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
