35 lines
2.4 KiB
Diff
35 lines
2.4 KiB
Diff
Subject: fix openssl check in cmake
|
|
Bug: 111656
|
|
Tags: common
|
|
|
|
diff -rupN a/hadoop-common-project/hadoop-common/src/CMakeLists.txt b/hadoop-common-project/hadoop-common/src/CMakeLists.txt
|
|
--- a/hadoop-common-project/hadoop-common/src/CMakeLists.txt 2022-02-16 22:35:38.846982670 +0300
|
|
+++ b/hadoop-common-project/hadoop-common/src/CMakeLists.txt 2022-02-16 22:39:06.855986487 +0300
|
|
@@ -212,8 +212,11 @@ if(OPENSSL_LIBRARY AND OPENSSL_INCLUDE_D
|
|
include(CheckCSourceCompiles)
|
|
set(OLD_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
|
|
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
|
|
+ set(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
|
|
+ set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARY})
|
|
check_c_source_compiles("#include \"${OPENSSL_INCLUDE_DIR}/openssl/evp.h\"\nint main(int argc, char **argv) { return !EVP_aes_256_ctr; }" HAS_NEW_ENOUGH_OPENSSL)
|
|
set(CMAKE_REQUIRED_INCLUDES ${OLD_CMAKE_REQUIRED_INCLUDES})
|
|
+ set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
|
|
if(NOT HAS_NEW_ENOUGH_OPENSSL)
|
|
message("The OpenSSL library installed at ${OPENSSL_LIBRARY} is too old. You need a version at least new enough to have EVP_aes_256_ctr.")
|
|
else()
|
|
diff -rupN a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt
|
|
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt 2022-02-16 22:36:19.547004519 +0300
|
|
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt 2022-02-16 22:40:19.988057176 +0300
|
|
@@ -120,8 +120,11 @@ if(OPENSSL_LIBRARY AND OPENSSL_INCLUDE_D
|
|
include(CheckCSourceCompiles)
|
|
set(OLD_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
|
|
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
|
|
+ set(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
|
|
+ set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARY})
|
|
check_c_source_compiles("#include \"${OPENSSL_INCLUDE_DIR}/openssl/evp.h\"\nint main(int argc, char **argv) { return !EVP_aes_256_ctr; }" HAS_NEW_ENOUGH_OPENSSL)
|
|
set(CMAKE_REQUIRED_INCLUDES ${OLD_CMAKE_REQUIRED_INCLUDES})
|
|
+ set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
|
|
if(NOT HAS_NEW_ENOUGH_OPENSSL)
|
|
message("The OpenSSL library installed at ${OPENSSL_LIBRARY} is too old. You need a version at least new enough to have EVP_aes_256_ctr.")
|
|
else()
|