port to freebsd

openziti · Mar 29, 2024 · 56189f8 · 56189f8
1 parent d336721
commit 56189f8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -167,6 +167,21 @@
         "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/toolchains/Linux-arm.cmake"
       }
     },
+    {
+      "name": "ci-freebsd-x64",
+      "inherits": [
+        "ci-build",
+        "ci-unix",
+        "dev-mode",
+        "vcpkg"
+      ],
+      "cacheVariables": {
+        "CMAKE_MAKE_PROGRAM": "ninja",
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_CXX_COMPILER": "clang++",
+        "VCPKG_TARGET_TRIPLET": "x64-freebsd"
+      }
+    },
     {
       "name": "ci-windows-x64",
       "inherits": [

diff --git a/inc_internal/metrics.h b/inc_internal/metrics.h
@@ -25,7 +25,7 @@
 #include <atomic>
 using namespace std;
 #else
-#if defined(__linux)
+#if defined(__linux) || defined(__FreeBSD__)
 
 /* 20230621:NFRAGALE@NETFOUNDRY:Build assurance against a missing macro in features.h. */
 #  if defined __GNUC__ && defined __GNUC_MINOR__ && ! __clang__

diff --git a/library/endian_internal.h b/library/endian_internal.h
@@ -20,7 +20,7 @@
 #endif
 
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__FreeBSD__)
 #  include <endian.h>
 #elif defined (__APPLE__)
 #  include <libkern/OSByteOrder.h>

diff --git a/library/utils.c b/library/utils.c
@@ -45,6 +45,8 @@
 #define ZITI_OS Android
 #elif defined(__linux__)
 #define ZITI_OS Linux
+#elif defined(__FreeBSD__)
+#define ZITI_OS FreeBSD
 #elif defined(__APPLE__)
 #define ZITI_OS MacOS
 #else

diff --git a/tests/zitilib-tests.cpp b/tests/zitilib-tests.cpp
@@ -23,6 +23,7 @@
 #if _WIN32
 #else
 #include <unistd.h>
+#include <sys/socket.h>
 #endif
 
 class testRunListener : public Catch::EventListenerBase {