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 7ebbc3bfe5c7c2be20eb98069c084b6f04556606 Author: Brian Neradt <[email protected]> AuthorDate: Tue Apr 23 16:21:49 2024 -0500 Remove reduntant link of ts:: libraries in plugins (#11283) This fixes the building of plugins that redundantly link with ATS core libraries. If plugins link with ts::tsutil while ATS core also links with ts::tsutil, for example, then not only is this unnecessary, but it also results in ODR issues because those symbols will exist via both the ATS and the plugin invocations. (cherry picked from commit dd62becd9d8fc63dd6aa6d926a6e431798097ec4) --- cmake/ExperimentalPlugins.cmake | 2 ++ plugins/experimental/access_control/CMakeLists.txt | 2 +- plugins/experimental/maxmind_acl/CMakeLists.txt | 2 +- plugins/experimental/sslheaders/CMakeLists.txt | 2 +- plugins/s3_auth/CMakeLists.txt | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/ExperimentalPlugins.cmake b/cmake/ExperimentalPlugins.cmake index 563d268035..c96c69fb22 100644 --- a/cmake/ExperimentalPlugins.cmake +++ b/cmake/ExperimentalPlugins.cmake @@ -27,6 +27,8 @@ else() set(_DEFAULT OFF) endif() +include(add_atsplugin) + auto_option( MAXMIND_ACL FEATURE_VAR diff --git a/plugins/experimental/access_control/CMakeLists.txt b/plugins/experimental/access_control/CMakeLists.txt index 515139c7b4..f93e39ea9e 100644 --- a/plugins/experimental/access_control/CMakeLists.txt +++ b/plugins/experimental/access_control/CMakeLists.txt @@ -28,7 +28,7 @@ add_atsplugin( utils.cc ) -target_link_libraries(access_control PRIVATE PCRE::PCRE OpenSSL::SSL OpenSSL::Crypto ts::tscore) +target_link_libraries(access_control PRIVATE PCRE::PCRE OpenSSL::SSL OpenSSL::Crypto) if(BUILD_TESTING) add_subdirectory(unit_tests) diff --git a/plugins/experimental/maxmind_acl/CMakeLists.txt b/plugins/experimental/maxmind_acl/CMakeLists.txt index 0b736718ed..4969cc1b19 100644 --- a/plugins/experimental/maxmind_acl/CMakeLists.txt +++ b/plugins/experimental/maxmind_acl/CMakeLists.txt @@ -20,7 +20,7 @@ if(maxminddb_FOUND) add_atsplugin(maxmind_acl maxmind_acl.cc mmdb.cc) target_link_libraries( - maxmind_acl PRIVATE libswoc::libswoc ts::tsapi ts::tsutil yaml-cpp::yaml-cpp maxminddb::maxminddb PCRE::PCRE + maxmind_acl PRIVATE libswoc::libswoc ts::tsapi yaml-cpp::yaml-cpp maxminddb::maxminddb PCRE::PCRE ) else() diff --git a/plugins/experimental/sslheaders/CMakeLists.txt b/plugins/experimental/sslheaders/CMakeLists.txt index 5108f6ec19..f95336448c 100644 --- a/plugins/experimental/sslheaders/CMakeLists.txt +++ b/plugins/experimental/sslheaders/CMakeLists.txt @@ -22,7 +22,7 @@ set_target_properties(sslhdr PROPERTIES POSITION_INDEPENDENT_CODE TRUE) if(BUILD_TESTING) add_executable(test_sslhdr unit_tests/unit_test_main.cc unit_tests/test_sslheaders.cc) - target_link_libraries(test_sslhdr PRIVATE sslhdr catch2::catch2 OpenSSL::SSL ts::tsutil) + target_link_libraries(test_sslhdr PRIVATE sslhdr catch2::catch2 OpenSSL::SSL libswoc::libswoc) endif() add_atsplugin(sslheaders sslheaders.cc) diff --git a/plugins/s3_auth/CMakeLists.txt b/plugins/s3_auth/CMakeLists.txt index 1871c4c364..51ea454d2b 100644 --- a/plugins/s3_auth/CMakeLists.txt +++ b/plugins/s3_auth/CMakeLists.txt @@ -19,7 +19,7 @@ project(s3_auth) add_atsplugin(s3_auth s3_auth.cc aws_auth_v4.cc) -target_link_libraries(s3_auth PRIVATE ts::tscore OpenSSL::Crypto) +target_link_libraries(s3_auth PRIVATE OpenSSL::Crypto) if(BUILD_TESTING) add_subdirectory(unit_tests)
