From: "Alexander V. Tikhonov" <avtikhon@tarantool.org> To: Igor Munkin <imun@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v2] build: fix unit tests build with lrt Date: Fri, 29 Nov 2019 10:06:36 +0300 [thread overview] Message-ID: <720acf3e6dbd775132b35c73e12e124e0067a5ec.1575011179.git.avtikhon@tarantool.org> (raw) After the commit 77fa45bd05f8cdd4c0f9bad85185ef5b61528d49 ('lua: add fiber.top() listing fiber cpu consumption') the unit tests builds failed like: /opt/rh/devtoolset-6/root/usr/libexec/gcc/x86_64-redhat-linux/6.3.1/ld: ../../src/lib/core/libcore.a(fiber.c.o): undefined reference to symbol 'clock_gettime@@GLIBC_2.2.5' //lib64/librt.so.1: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status test/unit/CMakeFiles/cbus.test.dir/build.make:108: recipe for target 'test/unit/cbus.test' failed make[2]: *** [test/unit/cbus.test] Error 1 Found that fiber.cc is using now clock_gettime(), which requires -lrt with glibc. To fix it added librt dependency for core library for glibc. Due to glibc requires for -lrt for clock_gettime() only for some versions, check 'man clock_gettime.2': 'Link with -lrt (only for glibc versions before 2.17).' the check whether is able to use clock_gettime() w/o librt library is added. Close #4639 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4639-lrt-suggested-full-ci Issue: https://github.com/tarantool/tarantool/issues/4639 CMakeLists.txt | 6 ++++++ src/lib/core/CMakeLists.txt | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d6c0846e..ca968eb8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,6 +116,12 @@ else () set(HAVE_CLOCK_GETTIME ${HAVE_CLOCK_GETTIME_DECL}) endif () set(CMAKE_REQUIRED_LIBRARIES "") +# According to `man 2 clockgettime` the glibc wrapper requires +# -lrt on glibc versions before 2.17. We need to check whether +# the function is available without -lrt to set this linker option +# conditionally. +check_function_exists(clock_gettime HAVE_CLOCK_GETTIME_WITHOUT_RT) + check_symbol_exists(__get_cpuid cpuid.h HAVE_CPUID) # Checks for libev diff --git a/src/lib/core/CMakeLists.txt b/src/lib/core/CMakeLists.txt index e60b5199e..8623aa0de 100644 --- a/src/lib/core/CMakeLists.txt +++ b/src/lib/core/CMakeLists.txt @@ -46,3 +46,11 @@ target_link_libraries(core salad small uri decNumber ${LIBEV_LIBRARIES} if (ENABLE_BACKTRACE AND NOT TARGET_OS_DARWIN) target_link_libraries(core gcc_s ${UNWIND_LIBRARIES}) endif() + +# Since fiber.top() introduction, fiber.cc, which is part of core +# library, depends on clock_gettime() syscall, so we should set +# -lrt when it is appropriate. See a comment for +# HAVE_CLOCK_GETTIME_WITHOUT_RT in ${REPO}/CMakeLists.txt. +if ("${HAVE_CLOCK_GETTIME}" AND NOT "${HAVE_CLOCK_GETTIME_WITHOUT_RT}") + target_link_libraries(core rt) +endif() -- 2.17.1
next reply other threads:[~2019-11-29 7:06 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-29 7:06 Alexander V. Tikhonov [this message] 2019-12-05 1:49 ` Alexander Turenko 2019-12-06 4:50 ` Alexander Tikhonov 2019-12-06 11:00 ` Serge Petrenko 2019-12-06 11:23 ` Kirill Yukhin
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=720acf3e6dbd775132b35c73e12e124e0067a5ec.1575011179.git.avtikhon@tarantool.org \ --to=avtikhon@tarantool.org \ --cc=imun@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2] build: fix unit tests build with lrt' \ /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