Solo5 doesn't build on MacOS

[AnnikaH]

To install latest dev:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc715aa..ebfecb1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ set(OS_OBJECTS
   kernel/fiber.cpp kernel/tls.cpp
   kernel/profile.cpp
   kernel/timers.cpp kernel/rtc.cpp kernel/rng.cpp kernel/rdrand.cpp
-  kernel/solo5_manager.cpp
+  #kernel/solo5_manager.cpp
   util/memstream.c util/async.cpp util/statman.cpp util/logger.cpp util/sha1.cpp
   util/syslog_facility.cpp util/syslogd.cpp util/uri.cpp util/percent_encoding.cpp
   util/tar.cpp util/path_to_regex.cpp
@@ -76,7 +76,7 @@ add_dependencies(os PrecompiledLibraries botan)
 add_subdirectory(arch/${ARCH})
 add_subdirectory(platform/x86_pc)
 add_subdirectory(platform/x86_nano)
-add_subdirectory(platform/x86_solo5)
+#add_subdirectory(platform/x86_solo5)
 add_subdirectory(drivers)
 add_subdirectory(plugins)
 
diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt
index 85f4417..604e07e 100644
--- a/src/drivers/CMakeLists.txt
+++ b/src/drivers/CMakeLists.txt
@@ -22,15 +22,15 @@ add_dependencies(silent_start PrecompiledLibraries)
 add_library(vga_output STATIC vgaout.cpp)
 add_dependencies(vga_output PrecompiledLibraries)
 
-add_library(solo5blk STATIC solo5blk.cpp)
-add_dependencies(solo5blk PrecompiledLibraries)
+#add_library(solo5blk STATIC solo5blk.cpp)
+#add_dependencies(solo5blk PrecompiledLibraries)
 
-add_library(solo5net STATIC solo5net.cpp)
-add_dependencies(solo5net PrecompiledLibraries)
+#add_library(solo5net STATIC solo5net.cpp)
+#add_dependencies(solo5net PrecompiledLibraries)
 
 install(TARGETS
     virtionet virtioblk
-    solo5net solo5blk
+    #solo5net solo5blk
     vmxnet3
     heap_debugging
     silent_start vga_output

diff --git a/cmake/cross_compiled_libraries.txt b/cmake/cross_compiled_libraries.txt
index bf124ec..6abd5e0 100644
--- a/cmake/cross_compiled_libraries.txt
+++ b/cmake/cross_compiled_libraries.txt
@@ -28,34 +28,34 @@ else(BUNDLE_LOC)
 
 endif (BUNDLE_LOC)
 
-ExternalProject_Add(solo5_repo
-   PREFIX precompiled
-   BUILD_IN_SOURCE 1
-   GIT_REPOSITORY https://github.com/ricarkol/solo5.git
-   GIT_TAG includeos64
-   CONFIGURE_COMMAND ./configure.sh
-   UPDATE_COMMAND ""
-   BUILD_COMMAND make build
-   INSTALL_COMMAND ""
-)
-
-set(SOLO5_REPO_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/solo5_repo)
-set(SOLO5_INCLUDE_DIR ${SOLO5_REPO_DIR}/build/include/)
-set(SOLO5_LIB_DIR ${SOLO5_REPO_DIR}/build/${ARCH})
+#ExternalProject_Add(solo5_repo
+#    PREFIX precompiled
+#    BUILD_IN_SOURCE 1
+#    GIT_REPOSITORY https://github.com/ricarkol/solo5.git
+#    GIT_TAG includeos64
+#    CONFIGURE_COMMAND ./configure.sh
+#    UPDATE_COMMAND ""
+#    BUILD_COMMAND make build
+#    INSTALL_COMMAND ""
+#)
+
+#set(SOLO5_REPO_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/solo5_repo)
+#set(SOLO5_INCLUDE_DIR ${SOLO5_REPO_DIR}/build/include/)
+#set(SOLO5_LIB_DIR ${SOLO5_REPO_DIR}/build/${ARCH})
 
 # solo5 in ukvm mode (let's call it "solo5")
-add_library(solo5 STATIC IMPORTED)
-set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_LIB_DIR}/ukvm/solo5.o)
+#add_library(solo5 STATIC IMPORTED)
+#set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_LIB_DIR}/ukvm/solo5.o)
 
 # ukvm-bin
-add_library(ukvm-bin STATIC IMPORTED)
-set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_LIB_DIR}/ukvm/ukvm-bin)
+#add_library(ukvm-bin STATIC IMPORTED)
+#set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_LIB_DIR}/ukvm/ukvm-bin)
 
-add_dependencies(solo5 solo5_repo)
-add_dependencies(ukvm-bin solo5_repo)
+#add_dependencies(solo5 solo5_repo)
+#add_dependencies(ukvm-bin solo5_repo)
 
 # Some OS components depend on solo5 (for solo5.h for example)
-add_dependencies(PrecompiledLibraries solo5)
+#add_dependencies(PrecompiledLibraries solo5)
 
 set(PRECOMPILED_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/PrecompiledLibraries/${ARCH})
 
@@ -91,13 +91,13 @@ install(DIRECTORY ${LIBCXX_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/li
 
 install(DIRECTORY ${NEWLIB_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/newlib)
 
-install(DIRECTORY ${SOLO5_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/solo5)
+#install(DIRECTORY ${SOLO5_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/solo5)
 
 install(FILES ${CRTEND} ${CRTBEGIN} DESTINATION includeos/${ARCH}/lib)
 
 # Only x86_64 supported at the moment
-if ("${ARCH}" STREQUAL "x86_64")
-  install(FILES ${SOLO5_LIB_DIR}/ukvm/solo5.o ${SOLO5_LIB_DIR}/ukvm/ukvm-bin DESTINATION includeos/${ARCH}/lib)
-endif()
+#if ("${ARCH}" STREQUAL "x86_64")
+#  install(FILES ${SOLO5_LIB_DIR}/ukvm/solo5.o ${SOLO5_LIB_DIR}/ukvm/ukvm-bin DESTINATION includeos/${ARCH}/lib)
+#endif()
 
 install(FILES ${NEWLIB_LIB_DIR}/libc.a ${NEWLIB_LIB_DIR}/libg.a ${NEWLIB_LIB_DIR}/libm.a ${LIBGCC_LIB_DIR}/libgcc.a ${LIBCXX_LIB_DIR}/libc++.a ${LIBCXX_LIB_DIR}/libc++abi.a DESTINATION includeos/${ARCH}/lib)

diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt
index 85f4417..604e07e 100644
--- a/src/drivers/CMakeLists.txt
+++ b/src/drivers/CMakeLists.txt
@@ -22,15 +22,15 @@ add_dependencies(silent_start PrecompiledLibraries)
 add_library(vga_output STATIC vgaout.cpp)
 add_dependencies(vga_output PrecompiledLibraries)
 
-add_library(solo5blk STATIC solo5blk.cpp)
-add_dependencies(solo5blk PrecompiledLibraries)
+#add_library(solo5blk STATIC solo5blk.cpp)
+#add_dependencies(solo5blk PrecompiledLibraries)
 
-add_library(solo5net STATIC solo5net.cpp)
-add_dependencies(solo5net PrecompiledLibraries)
+#add_library(solo5net STATIC solo5net.cpp)
+#add_dependencies(solo5net PrecompiledLibraries)
 
 install(TARGETS
     virtionet virtioblk
-    solo5net solo5blk
+    #solo5net solo5blk
     vmxnet3
     heap_debugging
     silent_start vga_output

[AndreasAakesson]

Solo5 in IncludeOS is now turned of on Mac. Do not really solves this issue, but it's due to the solo5 project not being buildable on Mac.

[ricarkol]

Yes, as Andreas says, solo5 doesn't support MacOS yet. There is a pending PR to do so, but it might take a while.