]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#771] Do not run dlclose/musl part
authorFrancis Dupont <fdupont@isc.org>
Sat, 11 Apr 2020 15:40:26 +0000 (17:40 +0200)
committerFrancis Dupont <fdupont@isc.org>
Thu, 9 Jul 2020 08:02:03 +0000 (10:02 +0200)
configure.ac
src/lib/hooks/tests/library_manager_unittest.cc

index 3a4f574cb5f65bf58592689fd1fdb7ffaeebcb9b..87ea3b13ad0d3fc66204e9636d9ff586c027d937 100755 (executable)
@@ -281,6 +281,13 @@ case "$host" in
 esac
 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.
 # The usage of this flag is:
 #
index 8f12f350d585181464cbfdd2188c8940cfd4712c..c0174a41bf5f41100428e841346ca18627e93920 100644 (file)
@@ -731,8 +731,11 @@ TEST_F(LibraryManagerTest, libraryLoggerSetup) {
 
     // After unloading the library, the messages should be unregistered.
     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_END").empty());
+#endif
 }
 
 } // Anonymous namespace