Changes for libmusl compilation. (#4294)

CMakeLists.txt

@@ -50,6 +50,10 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
 option(SKIP_PACKAGING "" OFF)
+option(STATIC_EXECUTABLES "" OFF)
+if (STATIC_EXECUTABLES)
+  set(CMAKE_EXE_LINKER_FLAGS "-static -no-pie")
+endif()
 
 # be verbose about flags used
 option(VERBOSE "be verbose about flags used" OFF)

arangod/CMakeLists.txt

@@ -521,6 +521,7 @@ if (USE_ENTERPRISE)
     target_link_libraries(arangoserver
       ldap
       lber
+      ssl
     )
   endif()
 endif()

lib/Basics/Mutex.cpp

@@ -45,14 +45,6 @@ Mutex::Mutex() : _mutex() {
 #endif
   pthread_mutexattr_init(&_attributes);
 
-#ifdef __linux__
-#ifdef ARANGO_ENABLE_DEADLOCK_DETECTION
-  // use an error checking mutex if available (only for LinuxThread) and only
-  // in maintainer mode
-  pthread_mutexattr_settype(&_attributes, PTHREAD_MUTEX_ERRORCHECK_NP);
-#endif
-#endif
-  
   pthread_mutex_init(&_mutex, &_attributes);
 }
 

lib/Logger/LogAppenderSyslog.cpp

@@ -29,8 +29,6 @@ using namespace arangodb;
 
 // we need to define SYSLOG_NAMES for linux to get a list of names
 #define SYSLOG_NAMES
-#define prioritynames TRI_prioritynames
-#define facilitynames TRI_facilitynames
 #include <syslog.h>
 
 #ifdef ARANGODB_ENABLE_SYSLOG_STRINGS
@@ -64,7 +62,7 @@ LogAppenderSyslog::LogAppenderSyslog(std::string const& facility,
   if ('0' <= facility[0] && facility[0] <= '9') {
     value = StringUtils::int32(facility);
   } else {
-    CODE* ptr = reinterpret_cast<CODE*>(TRI_facilitynames);
+    CODE* ptr = reinterpret_cast<CODE*>(facilitynames);
 
     while (ptr->c_name != 0) {
       if (strcmp(ptr->c_name, facility.c_str()) == 0) {