From: HustonMmmavr <huston.mavr@gmail.com>
To: tarantool-patches@dev.tarantool.org, yaroslav.dynnikov@gmail.com,
avtikhon@tarantool.org, alexander.turenko@tarantool.org
Subject: [Tarantool-patches] [PATCH] cmake: cleanup src/CMakeLists.txt
Date: Thu, 11 Jun 2020 03:25:10 +0300 [thread overview]
Message-ID: <20200611002510.35349-1-huston.mavr@gmail.com> (raw)
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
next reply other threads:[~2020-06-11 0:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 0:25 HustonMmmavr [this message]
2020-06-14 21:34 ` Alexander Turenko
2020-06-15 17:27 ` Mavr Huston
2020-06-15 21:20 ` Vladislav Shpilevoy
2020-06-17 15:29 ` Mavr Huston
2020-06-17 23:09 ` Vladislav Shpilevoy
2020-06-19 13:02 ` Yaroslav Dynnikov
2020-06-19 23:39 ` Vladislav Shpilevoy
2020-06-23 20:31 ` Yaroslav Dynnikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200611002510.35349-1-huston.mavr@gmail.com \
--to=huston.mavr@gmail.com \
--cc=alexander.turenko@tarantool.org \
--cc=avtikhon@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=yaroslav.dynnikov@gmail.com \
--subject='Re: [Tarantool-patches] [PATCH] cmake: cleanup src/CMakeLists.txt' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox