This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit fd036f9537e2f293a0e9f141ad3291dc7967ddb2
Author: Chris McFarlen <ch...@mcfarlen.us>
AuthorDate: Wed Apr 10 13:58:03 2024 -0500
cleanup asan odr violations (#11237)
* cleanup asan odr violations
* link libswoc to experimental/sslheaders
* slice uses pcre directly
* tls_bridge uses PCRE::PCRE
* transitive
(cherry picked from commit 69860ddfaa6869884eea4849bba8cc989bb5f7eb)
---
plugins/background_fetch/CMakeLists.txt | 2 +-
plugins/compress/compress.cc | 3 ++-
plugins/experimental/sslheaders/CMakeLists.txt | 3 ++-
plugins/experimental/tls_bridge/CMakeLists.txt | 3 ++-
plugins/remap_stats/CMakeLists.txt | 1 -
plugins/slice/CMakeLists.txt | 3 +--
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/plugins/background_fetch/CMakeLists.txt
b/plugins/background_fetch/CMakeLists.txt
index 698af17344..abfb728bf6 100644
--- a/plugins/background_fetch/CMakeLists.txt
+++ b/plugins/background_fetch/CMakeLists.txt
@@ -16,5 +16,5 @@
#######################
add_atsplugin(background_fetch background_fetch.cc configs.cc headers.cc
rules.cc)
-target_link_libraries(background_fetch PRIVATE libswoc::libswoc ts::tsutil)
+target_link_libraries(background_fetch PRIVATE libswoc::libswoc)
verify_global_plugin(background_fetch)
diff --git a/plugins/compress/compress.cc b/plugins/compress/compress.cc
index b0e0c7a474..abe1976e90 100644
--- a/plugins/compress/compress.cc
+++ b/plugins/compress/compress.cc
@@ -70,7 +70,7 @@ const int BROTLI_LGW = 16;
static const char *global_hidden_header_name = nullptr;
-static TSMutex compress_config_mutex = TSMutexCreate();
+static TSMutex compress_config_mutex = nullptr;
// Current global configuration, and the previous one (for cleanup)
Configuration *cur_config = nullptr;
@@ -1017,6 +1017,7 @@ void
TSPluginInit(int argc, const char *argv[])
{
const char *config_path = nullptr;
+ compress_config_mutex = TSMutexCreate();
if (argc > 2) {
fatal("the compress plugin does not accept more than 1 plugin argument");
diff --git a/plugins/experimental/sslheaders/CMakeLists.txt
b/plugins/experimental/sslheaders/CMakeLists.txt
index 4b9d0c4cbd..5108f6ec19 100644
--- a/plugins/experimental/sslheaders/CMakeLists.txt
+++ b/plugins/experimental/sslheaders/CMakeLists.txt
@@ -16,7 +16,8 @@
#######################
add_library(sslhdr STATIC expand.cc util.cc)
-target_link_libraries(sslhdr PRIVATE OpenSSL::SSL ts::tsutil)
+target_link_libraries(sslhdr PRIVATE OpenSSL::SSL libswoc::libswoc # transitive
+)
set_target_properties(sslhdr PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
if(BUILD_TESTING)
diff --git a/plugins/experimental/tls_bridge/CMakeLists.txt
b/plugins/experimental/tls_bridge/CMakeLists.txt
index 5430505431..bb13df997e 100644
--- a/plugins/experimental/tls_bridge/CMakeLists.txt
+++ b/plugins/experimental/tls_bridge/CMakeLists.txt
@@ -17,5 +17,6 @@
add_atsplugin(tls_bridge tls_bridge.cc)
-target_link_libraries(tls_bridge PRIVATE ts::tsutil libswoc::libswoc)
+target_link_libraries(tls_bridge PRIVATE libswoc::libswoc PCRE::PCRE #
transitive
+)
verify_global_plugin(tls_bridge)
diff --git a/plugins/remap_stats/CMakeLists.txt
b/plugins/remap_stats/CMakeLists.txt
index 4efc6c831f..7cfa5545bd 100644
--- a/plugins/remap_stats/CMakeLists.txt
+++ b/plugins/remap_stats/CMakeLists.txt
@@ -17,5 +17,4 @@
add_atsplugin(remap_stats remap_stats.cc)
-target_link_libraries(remap_stats PRIVATE ts::tscore)
verify_global_plugin(remap_stats)
diff --git a/plugins/slice/CMakeLists.txt b/plugins/slice/CMakeLists.txt
index 5c15c5a8d2..efca6315d8 100644
--- a/plugins/slice/CMakeLists.txt
+++ b/plugins/slice/CMakeLists.txt
@@ -33,8 +33,7 @@ add_atsplugin(
util.cc
)
-target_link_libraries(slice PRIVATE ts::tscore)
-
+target_link_libraries(slice PRIVATE PCRE::PCRE)
if(BUILD_TESTING)
add_subdirectory(unit-tests)
endif()
