From 2559a521fd5ef99702eca674a3d1cad453949c5b Mon Sep 17 00:00:00 2001
From: Feodor Alexandrov <feodor.alex.alexandrov@gmail.com>
Date: Mon, 5 Jun 2023 15:34:51 +0300
Subject: [PATCH] rename: crypto to tcrypto
Picodata is built statically, and name crypto clashes between
`src/lib/crypto` and libcrypto from `openssl`. To resolve the
ambiguity this patch renames tarantool library to `tcrypto`.
NO_DOC=picodata internal patch
NO_CHANGELOG=picodata internal patch
NO_TEST=picodata internal patch
---
src/CMakeLists.txt | 2 +-
src/lib/crypto/CMakeLists.txt | 6 +++---
src/lib/swim/CMakeLists.txt | 2 +-
test/unit/CMakeLists.txt | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c16b53a796..9402905a94 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -300,7 +300,7 @@ set_source_files_compile_flags(${server_sources})
add_library(server STATIC ${server_sources})
add_dependencies(server build_bundled_libs)
target_link_libraries(server core coll http_parser bit uri swim swim_udp
- swim_ev crypto mpstream crc32 tzcode)
+ swim_ev tcrypto mpstream crc32 tzcode)
if(EMBED_LUAZLIB)
target_link_libraries(server ${ZLIB_LIBRARIES})
diff --git a/src/lib/crypto/CMakeLists.txt b/src/lib/crypto/CMakeLists.txt
index afdac0891e..0c2d31125a 100644
--- a/src/lib/crypto/CMakeLists.txt
+++ b/src/lib/crypto/CMakeLists.txt
@@ -1,9 +1,9 @@
set(lib_sources crypto.c)
set_source_files_compile_flags(${lib_sources})
-add_library(crypto STATIC ${lib_sources})
-target_link_libraries(crypto ${OPENSSL_LIBRARIES} core)
+add_library(tcrypto STATIC ${lib_sources})
+target_link_libraries(tcrypto ${OPENSSL_LIBRARIES} core)
if (ENABLE_BUNDLED_OPENSSL)
- add_dependencies(crypto bundled-openssl)
+ add_dependencies(tcrypto bundled-openssl)
endif()
diff --git a/src/lib/swim/CMakeLists.txt b/src/lib/swim/CMakeLists.txt
index 873cf6e5ba..814ac3b831 100644
--- a/src/lib/swim/CMakeLists.txt
+++ b/src/lib/swim/CMakeLists.txt
@@ -5,7 +5,7 @@ set(lib_swim_ev_sources swim_ev.c)
set_source_files_compile_flags(${lib_swim_sources} ${lib_swim_udp_sources}
${lib_swim_ev_sources})
add_library(swim STATIC ${lib_swim_sources})
-target_link_libraries(swim core misc crypto)
+target_link_libraries(swim core misc tcrypto)
add_library(swim_udp STATIC ${lib_swim_udp_sources})
target_link_libraries(swim_udp core)
add_library(swim_ev STATIC ${lib_swim_ev_sources})
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 1e171eacaf..7fa1039710 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -466,7 +466,7 @@ create_unit_test(PREFIX sio
create_unit_test(PREFIX crypto
SOURCES crypto.c core_test_utils.c
- LIBRARIES crypto unit
+ LIBRARIES tcrypto unit
)
create_unit_test(PREFIX swim
--
GitLab