Set option to use static libraries from OpenSSL

This commit is contained in:
Anthony Louis committed 2021-04-09 19:34:24 -03:00
1 parent 6c4eadf3ad
commit 245404f870
4 files changed
+16 -4

No files matched your search

+11 -1
View File
@@ -15,7 +15,17 @@
# specific language governing permissions and limitations
# under the License.
find_package(OpenSSL)
if(ARROW_OPENSSL_USE_SHARED)
# Find shared OpenSSL libraries.
set(OpenSSL_USE_STATIC_LIBS OFF)
set(OPENSSL_USE_STATIC_LIBS OFF)
find_package(OpenSSL)
else()
# Find static OpenSSL headers and libs
set(OpenSSL_USE_STATIC_LIBS ON)
set(OPENSSL_USE_STATIC_LIBS ON)
find_package(OpenSSL)
endif()
if (OPENSSL_FOUND)
if (OPENSSL_VERSION LESS "1.1.0")
@@ -43,6 +43,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \
-DARROW_BUILD_SHARED=ON \
-DARROW_BOOST_USE_SHARED=OFF \
-DARROW_PROTOBUF_USE_SHARED=OFF \
-DARROW_ARROW_OPENSSL_USE_SHARED=OFF \
-DARROW_GANDIVA_PC_CXX_FLAGS="-isystem;/opt/rh/devtoolset-2/root/usr/include/c++/4.8.2;-isystem;/opt/rh/devtoolset-2/root/usr/include/c++/4.8.2/x86_64-CentOS-linux/" \
-DARROW_JEMALLOC=ON \
-DARROW_RPATH_ORIGIN=ON \
+2 -1
View File
@@ -37,7 +37,8 @@ pushd cpp
-DARROW_DATASET=OFF \
-DARROW_BOOST_USE_SHARED=OFF \
-DARROW_PROTOBUF_USE_SHARED=OFF \
-DARROW_GFLAGS_USE_SHARED=OFF"
-DARROW_GFLAGS_USE_SHARED=OFF \
-DARROW_OPENSSL_USE_SHARED=OFF"
cmake $CMAKE_FLAGS ..
make -j4
+2 -2
View File
@@ -25,11 +25,11 @@ pushd java
if [[ $OS_NAME == "linux" ]]; then
SO_DEP=ldd
GANDIVA_LIB="$CPP_BUILD_DIR"libgandiva_jni.so
WHITELIST=(linux-vdso libz librt libdl libpthread libstdc++ libm libgcc_s libc ld-linux-x86-64 libssl libcrypto)
WHITELIST=(linux-vdso libz librt libdl libpthread libstdc++ libm libgcc_s libc ld-linux-x86-64)
else
SO_DEP="otool -L"
GANDIVA_LIB="$CPP_BUILD_DIR"libgandiva_jni.dylib
WHITELIST=(libgandiva_jni libz libncurses libSystem libc++ libssl libcrypto)
WHITELIST=(libgandiva_jni libz libncurses libSystem libc++)
fi
# print the shared library dependencies