Skip to content

Commit

Permalink
reduce changes
Browse files Browse the repository at this point in the history
  • Loading branch information
andreylzmw committed Apr 3, 2024
1 parent 2f6a2a4 commit a9d35d5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/Dockerfile.buster
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ RUN apt-get update && \
tar -xvzf openssl-3.0.2.tar.gz && \
cd openssl-3.0.2 && \
chmod +x ./config && \
./Configure && \
make -j$(nproc) && make -j$(nproc) install && \
ldconfig /usr/local/lib64/
./config --prefix="/usr/local/" && \
make -j$(nproc) && make install

RUN useradd -ms /bin/bash kitten
5 changes: 3 additions & 2 deletions cmake/init-compilation-flags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ else()
add_link_options(-fno-lto)
endif()

if(LINUX)
set(OPENSSL_ROOT_DIR "/usr/local")
if(NOT APPLE)
set(OPENSSL_ROOT_DIR "/usr/local/" CACHE INTERNAL "")
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
# set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=64)
endif()
set(OPENSSL_USE_STATIC_LIBS TRUE)
find_package(OpenSSL REQUIRED)
Expand Down

0 comments on commit a9d35d5

Please sign in to comment.