Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[dev-db/timescaledb] bump, removing direct openssl linking

Browse Source
This commit is contained in:
Robert Förster
2024-07-11 17:23:58 +02:00
parent f3e586d3b6
commit 58d7ed5be4
3 changed files with 132 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
dev-db/timescaledb/files/timescaledb-2.15.3-no-openssl.patch Normal file
View File

@@ -0,0 +1,75 @@
From 4861ca61a54dc39a9daa26c583d1598623219d37 Mon Sep 17 00:00:00 2001
From: Sven Klemm <sven@timescale.com>
Date: Wed, 26 Jun 2024 12:45:41 +0200
Subject: [PATCH] Don't link against openssl directly
This patch changes our build process to no longer link against
openssl directly but instead rely on postgres linking it.
Linking to openssl directly is causing problems when the openssl
version we link against does not match the version postgres links
against. While this is easy to prevent where we fully control the
build process it is repeatedly causing problems e.g. in ABI tests.
This patch changes only changes the behaviour for non-Windows as
we are running into linker problems on Windows with this change.
Until we can find a workaround for those problems Windows binaries
we still link OpenSSL directly.
---
CMakeLists.txt | 7 +++++--
src/CMakeLists.txt | 4 +++-
tsl/src/CMakeLists.txt | 3 ---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6888b1eb6ef..da217000d5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -596,7 +596,10 @@ if(USE_OPENSSL AND (NOT PG_USE_OPENSSL))
)
endif(USE_OPENSSL AND (NOT PG_USE_OPENSSL))
-if(USE_OPENSSL)
+# While we dont link directly against OpenSSL on non-Windows, doing this on
+# Windows causes linker errors. So on Windows we link directly against the
+# OpenSSL libraries.
+if(USE_OPENSSL AND MSVC)
# Try to find a local OpenSSL installation
find_package(OpenSSL)
@@ -635,7 +638,7 @@ if(USE_OPENSSL)
message(STATUS "OpenSSL libraries: ${_path}")
endforeach()
message(STATUS "Using OpenSSL version ${OPENSSL_VERSION}")
-endif(USE_OPENSSL)
+endif(USE_OPENSSL AND MSVC)
if(CODECOVERAGE)
message(STATUS "Code coverage is enabled.")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8c3d72e3e80..a945e5cbcaa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,7 +104,9 @@ if(USE_OPENSSL)
set(TS_USE_OPENSSL ${USE_OPENSSL})
target_include_directories(${PROJECT_NAME} SYSTEM
PUBLIC ${OPENSSL_INCLUDE_DIR})
- target_link_libraries(${PROJECT_NAME} ${OPENSSL_LIBRARIES})
+ if(MSVC)
+ target_link_libraries(${PROJECT_NAME} ${OPENSSL_LIBRARIES})
+ endif(MSVC)
endif(USE_OPENSSL)
configure_file(config.h.in config.h)
diff --git a/tsl/src/CMakeLists.txt b/tsl/src/CMakeLists.txt
index 4029c421599..e2524cc5a46 100644
--- a/tsl/src/CMakeLists.txt
+++ b/tsl/src/CMakeLists.txt
@@ -29,9 +29,6 @@ set_target_properties(
PROPERTIES OUTPUT_NAME ${TSL_LIBRARY_NAME}-${PROJECT_VERSION_MOD} PREFIX "")
target_include_directories(${TSL_LIBRARY_NAME} PRIVATE ${PG_INCLUDEDIR})
-if(USE_OPENSSL)
- target_include_directories(${TSL_LIBRARY_NAME} PRIVATE ${OPENSSL_INCLUDE_DIR})
-endif(USE_OPENSSL)
target_compile_definitions(${TSL_LIBRARY_NAME} PUBLIC TS_TSL)
target_compile_definitions(${TSL_LIBRARY_NAME} PUBLIC TS_SUBMODULE)