Add support for Solaris

Tested on illumos distribution OmniOS Community Edition.
drogonframework · Jun 9, 2020 · 72fbd81 · 72fbd81
1 parent be6f096
commit 72fbd81
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,7 +69,7 @@ add_subdirectory(trantor)
 target_link_libraries(${PROJECT_NAME} PUBLIC trantor)
 
 if(NOT WIN32)
-  target_link_libraries(${PROJECT_NAME} PRIVATE dl)
+  target_link_libraries(${PROJECT_NAME} PRIVATE dl $<$<PLATFORM_ID:SunOS>:socket>)
 else(NOT WIN32)
   target_link_libraries(${PROJECT_NAME} PRIVATE shlwapi)
 endif(NOT WIN32)

diff --git a/build.sh b/build.sh
@@ -81,7 +81,7 @@ if [ -f /bin/ninja ]; then
     make_program=ninja
     cmake_gen='-G Ninja'
 else
-    make_flags="$make_flags -j$parallel"
+    make_flags="$make_flags -j $parallel"
 fi
 
 if [ "$1" = "-t" ]; then

diff --git a/drogon_ctl/version.cc b/drogon_ctl/version.cc
@@ -18,7 +18,6 @@
 #include <trantor/net/Resolver.h>
 #include <iostream>
 
-using namespace drogon_ctl;
 static const char banner[] =
     "     _                             \n"
     "  __| |_ __ ___   __ _  ___  _ __  \n"
@@ -27,7 +26,7 @@ static const char banner[] =
     " \\__,_|_|  \\___/ \\__, |\\___/|_| |_|\n"
     "                 |___/             \n";
 
-void version::handleCommand(std::vector<std::string> &parameters)
+void drogon_ctl::version::handleCommand(std::vector<std::string> &parameters)
 {
     std::cout << banner << std::endl;
     std::cout << "A utility for drogon" << std::endl;

diff --git a/lib/src/SharedLibManager.cc b/lib/src/SharedLibManager.cc
@@ -104,7 +104,7 @@ void SharedLibManager::managerLibs()
                         void *oldHandle = nullptr;
                         if (dlMap_.find(filename) != dlMap_.end())
                         {
-#ifdef __linux__
+#if defined __linux__ || defined __sun
                             if (st.st_mtim.tv_sec >
                                 dlMap_[filename].mTime.tv_sec)
 #elif defined _WIN32
@@ -166,7 +166,7 @@ void SharedLibManager::managerLibs()
                             dlStat.handle =
                                 compileAndLoadLib(srcFile, oldHandle);
                         }
-#ifdef __linux__
+#if defined __linux__ || defined __sun
                         dlStat.mTime = st.st_mtim;
 #elif defined _WIN32
                             dlStat.mTime.tv_sec = st.st_mtime;
@@ -234,7 +234,7 @@ void *SharedLibManager::compileAndLoadLib(const std::string &sourceFile,
 bool SharedLibManager::shouldCompileLib(const std::string &soFile,
                                         const struct stat &sourceStat)
 {
-#ifdef __linux__
+#if defined __linux__ || defined __sun
     auto sourceModifiedTime = sourceStat.st_mtim.tv_sec;
 #elif defined _WIN32
     auto sourceModifiedTime = sourceStat.st_mtime;
@@ -249,7 +249,7 @@ bool SharedLibManager::shouldCompileLib(const std::string &soFile,
         return true;
     }
 
-#ifdef __linux__
+#if defined __linux__ || defined __sun
     auto soModifiedTime = soStat.st_mtim.tv_sec;
 #elif defined _WIN32
     auto soModifiedTime = soStat.st_mtime;