[Tarantool-patches] [PATCH] cmake: cleanup src/CMakeLists.txt

HustonMmmavr huston.mavr at gmail.com
Thu Jun 11 03:25:10 MSK 2020


Removed definition and initialization of EXPORT_LIST variable at file
src/CMakeLists.txt. After patch 03790ac551 this variable is unused
(no reference to this variable after its initialization can be found
in whole project) and it is only misleading.

Closes #5066
---
I've builded tarantool before applying this changes and after.
Then I've checked difference in tarantool binary file symbols with 
nm and diff commands and there was no difference.

Issue: https://github.com/tarantool/tarantool/issues/5066
Branch: https://github.com/tarantool/tarantool/tree/HustonMmmavr/gh-5066-delete-unusued-export-list

@ChangeLog
- Cleanup src/CMakeLists.txt (gh-5066)

 src/CMakeLists.txt | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7099e9bef..d86e6bfb1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -213,33 +213,7 @@ add_subdirectory(box)
 set(TARANTOOL_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE)
 set(TARANTOOL_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE)
 
-set(EXPORT_LIST)
 if(BUILD_STATIC)
-    # for each static library we should find a corresponding shared library to
-    # parse and reexport library api functions
-    foreach(libstatic
-            ${READLINE_LIBRARIES}
-            ${CURL_LIBRARIES}
-            ${OPENSSL_LIBRARIES}
-            ${ICU_LIBRARIES})
-        if (${libstatic} MATCHES "lib[^/]+.a")
-            string(REGEX MATCH "lib[^/]+.a" libname ${libstatic})
-            string(REGEX REPLACE "\\.a$" "" libname ${libname})
-            string(REGEX REPLACE "^lib" "" libname ${libname})
-            find_library(SYMBOLS_LIB NAMES ${libname})
-            # add found library to export list
-            list(APPEND EXPORT_LIST ${SYMBOLS_LIB})
-            # set variable to allow rescan (CMake depended)
-            set(SYMBOLS_LIB "SYMBOLS_LIB-NOTFOUND")
-        elseif (${libstatic} STREQUAL bundled-libcurl OR
-                ${libstatic} STREQUAL bundled-ares)
-            message("We don't need to export symbols from statically linked ${libstatic}, skipped")
-        else()
-            message(WARNING "${libstatic} should be a static")
-        endif()
-    endforeach(libstatic)
-    string(REPLACE ";" " " EXPORT_LIST "${EXPORT_LIST}")
-
     if (HAVE_OPENMP)
         # Link libgomp explicitly to make it static. Avoid linking
         # against DSO version of libgomp, which implied by -fopenmp
-- 
2.26.2



More information about the Tarantool-patches mailing list