mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 14:35:29 +00:00
Code Issues Releases Wiki Activity

[#771] Do not run dlclose/musl part

Browse Source
This commit is contained in:
Francis Dupont
2020-04-11 17:40:26 +02:00
parent ebb15b2930
commit 4e3640f046
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -281,6 +281,13 @@ case "$host" in
esac esac
KEA_CXXFLAGS="$KEA_CXXFLAGS $MULTITHREADING_FLAG" KEA_CXXFLAGS="$KEA_CXXFLAGS $MULTITHREADING_FLAG"
dumpmachine=`$CXX -dumpmachine`
case "$dumpmachine" in
*-musl)
AC_DEFINE([LIBC_MUSL], [1], [Define to 1 if libc is musl])
;;
esac
# Disable -Werror by default. Only use it if specifically enabled. # Disable -Werror by default. Only use it if specifically enabled.
# The usage of this flag is: # The usage of this flag is:
# #

3
src/lib/hooks/tests/library_manager_unittest.cc
View File

@@ -731,8 +731,11 @@ TEST_F(LibraryManagerTest, libraryLoggerSetup) {
// After unloading the library, the messages should be unregistered. // After unloading the library, the messages should be unregistered.
EXPECT_TRUE(lib_manager.unloadLibrary()); EXPECT_TRUE(lib_manager.unloadLibrary());
// The musl libc does not implement dlclose
#ifndef LIBC_MUSL
EXPECT_TRUE(dict->getText("BCL_LOAD_START").empty()); EXPECT_TRUE(dict->getText("BCL_LOAD_START").empty());
EXPECT_TRUE(dict->getText("BCL_LOAD_END").empty()); EXPECT_TRUE(dict->getText("BCL_LOAD_END").empty());
#endif
} }
} // Anonymous namespace } // Anonymous namespace