Skip to content

Commit

Permalink
drop openssl in favor of libressl
Browse files Browse the repository at this point in the history
  • Loading branch information
benoit-pierre committed Dec 16, 2024
1 parent 7490f3b commit 1789c81
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 210 deletions.
13 changes: 5 additions & 8 deletions cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ set(crengine_BINARY_DIR ${crengine_CMAKE_BINARY_DIR}/build)
declare_project(thirdparty/cpu_features EXCLUDE_FROM_ALL)

# curl
declare_project(thirdparty/curl DEPENDS openssl zlib EXCLUDE_FROM_ALL)
declare_project(thirdparty/curl DEPENDS libressl zlib EXCLUDE_FROM_ALL)

# czmq
if(NOT WIN32)
Expand Down Expand Up @@ -317,7 +317,7 @@ declare_project(thirdparty/luajson)
declare_project(thirdparty/luarocks DEPENDS luajit EXCLUDE_FROM_ALL)

# luasec
declare_project(thirdparty/luasec DEPENDS luajit luasocket openssl)
declare_project(thirdparty/luasec DEPENDS luajit luasocket libressl)

# luasocket
declare_project(thirdparty/luasocket DEPENDS luajit)
Expand Down Expand Up @@ -351,10 +351,7 @@ if(CERVANTES OR KINDLE OR KOBO OR POCKETBOOK)
else()
set(EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL)
endif()
declare_project(thirdparty/openssh ${EXCLUDE_FROM_ALL} DEPENDS openssl zlib)

# openssl
declare_project(thirdparty/openssl)
declare_project(thirdparty/openssh ${EXCLUDE_FROM_ALL} DEPENDS libressl zlib)

# pcre2
declare_project(thirdparty/pcre2 EXCLUDE_FROM_ALL)
Expand Down Expand Up @@ -395,7 +392,7 @@ endif()
declare_project(thirdparty/tesseract DEPENDS ${DEPENDS})

# turbo
declare_project(thirdparty/turbo DEPENDS openssl)
declare_project(thirdparty/turbo DEPENDS libressl)

# utf8proc
declare_project(thirdparty/utf8proc)
Expand All @@ -412,7 +409,7 @@ if(CERVANTES OR KINDLE OR KOBO OR POCKETBOOK OR REMARKABLE OR SONY_PRSTUX)
else()
set(EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL)
endif()
declare_project(thirdparty/zsync2 DEPENDS curl openssl zlib ${EXCLUDE_FROM_ALL})
declare_project(thirdparty/zsync2 DEPENDS curl libressl zlib ${EXCLUDE_FROM_ALL})

# }}}

Expand Down
4 changes: 2 additions & 2 deletions thirdparty/cmake_modules/koreader_targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ if(MONOLIBTIC)
leptonica::leptonica
libjpeg-turbo::turbojpeg
libk2pdfopt::k2pdfopt
libressl::crypto
libressl::ssl
libzmq::zmq
lodepng::lodepng
lpeg::lpeg
Expand All @@ -305,8 +307,6 @@ if(MONOLIBTIC)
luasocket::luasocket
luasocket::mcore
luasocket::score
openssl::crypto
openssl::ssl
pthread
sqlite::sqlite3
turbo::tffi_wrap
Expand Down
10 changes: 0 additions & 10 deletions thirdparty/cmake_modules/koreader_thirdparty_libs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -183,16 +183,6 @@ if(MONOLIBTIC)
declare_dependency(openlipclua::libopenlipclua SHARED lipc STATIC openlipclua)
endif()

# openssl
set(CRYPTO_LIBS)
set(SSL_LIBS)
if(MONOLIBTIC)
list(APPEND CRYPTO_LIBS dl pthread)
list(APPEND SSL_LIBS pthread)
endif()
declare_dependency(openssl::crypto MONOLIBTIC crypto LIBRARIES ${CRYPTO_LIBS})
declare_dependency(openssl::ssl MONOLIBTIC ssl LIBRARIES ${SSL_LIBS})

# nanosvg
declare_dependency(nanosvg::nanosvg LIBRARIES m)

Expand Down
123 changes: 0 additions & 123 deletions thirdparty/openssl/CMakeLists.txt

This file was deleted.

13 changes: 0 additions & 13 deletions thirdparty/openssl/fix_libcrypto_pkg-config_entry.patch

This file was deleted.

11 changes: 0 additions & 11 deletions thirdparty/openssl/macos_rpath.patch

This file was deleted.

21 changes: 0 additions & 21 deletions thirdparty/openssl/openssl-1.1.0j-parallel_install_fix.patch

This file was deleted.

22 changes: 0 additions & 22 deletions thirdparty/openssl/reduce_build_verbosity.patch

This file was deleted.

0 comments on commit 1789c81

Please sign in to comment.