mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-20 03:25:13 +00:00
Meta: Link with OpenSSL explicitly
Explicitly link final targets with OpenSSL to ensure that the vcpkg version is loaded instead of the system one. Before this change we would inherit `libcrypto.so` and `libssl.so` from other dependencies, like Qt, that do not have their RPATH rewritten. This would cause the loader to prefer the system libraries over the vcpkg ones causing all sorts of version mismatch issues. The effectiveness of this change can be verified with `readelf -d ./bin/Ladybird` showing `libcrypto.so` and `libssl.so` as direct dependencies, before they would not appear. Additionally, `ldd` will show `libcrypto.so` and `libssl.so` pointing to the vcpkg builds.
This commit is contained in:
parent
41c6f93aa8
commit
62cd358fab
Notes:
github-actions[bot]
2025-02-17 11:37:34 +00:00
Author: https://github.com/ADKaster Commit: https://github.com/LadybirdBrowser/ladybird/commit/62cd358fab3 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3581 Reviewed-by: https://github.com/gmta ✅
6 changed files with 8 additions and 0 deletions
|
@ -82,6 +82,9 @@ if (ENABLE_QT AND ENABLE_GUI_TARGETS)
|
|||
find_package(Qt6 REQUIRED COMPONENTS Core Widgets Network)
|
||||
endif()
|
||||
|
||||
# We need to find OpenSSL in order to link it explicitly with all targets.
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
include(CTest) # for BUILD_TESTING option, default ON
|
||||
|
||||
if (ENABLE_GUI_TARGETS)
|
||||
|
|
|
@ -26,6 +26,7 @@ target_include_directories(requestserverservice PRIVATE ${LADYBIRD_SOURCE_DIR}/S
|
|||
|
||||
target_link_libraries(RequestServer PRIVATE requestserverservice)
|
||||
target_link_libraries(requestserverservice PUBLIC LibCore LibDNS LibMain LibCrypto LibFileSystem LibIPC LibMain LibTLS LibWebView LibWebSocket LibURL LibTextCodec LibThreading CURL::libcurl)
|
||||
target_link_libraries(requestserverservice PRIVATE OpenSSL::Crypto OpenSSL::SSL)
|
||||
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
|
||||
# Solaris has socket and networking related functions in two extra libraries
|
||||
|
|
|
@ -29,6 +29,7 @@ target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${LADYBIRD
|
|||
target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${LADYBIRD_SOURCE_DIR}/Services/>)
|
||||
|
||||
target_link_libraries(webcontentservice PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibMedia LibWeb LibWebSocket LibRequests LibWebView LibImageDecoderClient LibGC)
|
||||
target_link_libraries(webcontentservice PRIVATE OpenSSL::Crypto OpenSSL::SSL)
|
||||
|
||||
if (ENABLE_QT)
|
||||
qt_add_executable(WebContent main.cpp)
|
||||
|
|
|
@ -13,3 +13,4 @@ target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR})
|
|||
target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR}/Services)
|
||||
|
||||
target_link_libraries(WebDriver PRIVATE LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibWeb LibWebSocket LibWebView)
|
||||
target_link_libraries(WebDriver PRIVATE OpenSSL::Crypto OpenSSL::SSL)
|
||||
|
|
|
@ -14,6 +14,7 @@ target_include_directories(webworkerservice PRIVATE ${LADYBIRD_SOURCE_DIR})
|
|||
target_include_directories(webworkerservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/)
|
||||
|
||||
target_link_libraries(webworkerservice PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibRequests LibWeb LibWebView LibUnicode LibImageDecoderClient LibMain LibURL LibGC)
|
||||
target_link_libraries(webworkerservice PRIVATE OpenSSL::Crypto OpenSSL::SSL)
|
||||
|
||||
if (ENABLE_QT)
|
||||
qt_add_executable(WebWorker main.cpp)
|
||||
|
|
|
@ -70,6 +70,7 @@ endif()
|
|||
|
||||
set(LADYBIRD_LIBS AK LibCore LibFileSystem LibGfx LibImageDecoderClient LibIPC LibJS LibMain LibWeb LibWebView LibRequests LibURL)
|
||||
target_link_libraries(${LADYBIRD_TARGET} PRIVATE ${LADYBIRD_LIBS})
|
||||
target_link_libraries(${LADYBIRD_TARGET} PRIVATE OpenSSL::Crypto OpenSSL::SSL)
|
||||
|
||||
target_include_directories(${LADYBIRD_TARGET} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
target_include_directories(${LADYBIRD_TARGET} ${LADYBIRD_SOURCE_DIR})
|
||||
|
|
Loading…
Add table
Reference in a new issue