Merge remote-tracking branch 'github-pull/32/head' into 20250627-02x-mergedup

Author: luke-jr

.github/workflows/build.yaml

@@ -25,6 +25,7 @@ jobs:
           - clearlinux:latest
           - gentoo/stage3:musl-hardened
           - gentoo/stage3:hardened
+          - freebsd
         config:
           - cmake_args: "-DENABLE_API=ON -DCMAKE_C_COMPILER=gcc"
           - cmake_args: "-DENABLE_API=ON -DCMAKE_C_COMPILER=clang"
@@ -52,6 +53,7 @@ jobs:
             ${{ matrix.os }}/pkg-cache/
 
       - name: Build inside Docker
+        if: "!startsWith(matrix.os, 'freebsd')"
         id: docker-build
         run: |
           PKG_CACHE_DIR=/pkg-cache
@@ -167,3 +169,22 @@ jobs:
         with:
           path: pkg-cache
           key: ${{ matrix.os }}/pkg-cache/${{ matrix.config.cmake_args }}/${{ github.sha }}
+
+      - name: Build inside FreeBSD VM
+        if: startsWith(matrix.os, 'freebsd')
+        uses: vmactions/freebsd-vm@v1
+        with:
+          prepare: |
+            PACKAGES="git cmake pkgconf curl jansson libsodium libmicrohttpd argp-standalone libepoll-shim" 
+            if echo "${{ matrix.config.cmake_args }}" | grep -q "CMAKE_C_COMPILER=gcc"; then
+              PACKAGES="$PACKAGES gcc"
+            fi
+            pkg install -y $PACKAGES
+
+          run: |
+            git config --global --add safe.directory ${{ github.workspace }}
+            mkdir -p build
+            cd build
+            cmake ${{ github.workspace }} -DCMAKE_C_FLAGS='-Wall -Werror' ${{ matrix.config.cmake_args }}
+            make
+            ./datum_gateway --help

CMakeLists.txt

@@ -76,11 +76,24 @@ set(ARGP_LIBS "")
 check_function_exists(argp_parse HAVE_ARGP_PARSE)
 if(NOT HAVE_ARGP_PARSE)
 	check_library_exists(argp argp_parse "" ARGP)
+	if(NOT ARGP AND CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+		# Workaround bug where CMake doesn't check the standard install location on FreeBSD
+		unset(ARGP CACHE)
+		check_library_exists(argp argp_parse "/usr/local/lib" ARGP)
+	endif()
 	if(ARGP)
 		list(APPEND ARGP_LIBS "argp")
 	endif()
 endif()
 
+check_function_exists(epoll_wait HAVE_EPOLL_WAIT)
+if(HAVE_EPOLL_WAIT)
+	set(EPOLL_SHIM_INCLUDE_DIRS "")
+	set(EPOLL_SHIM_LIBRARIES "")
+else()
+	pkg_check_modules(EPOLL_SHIM REQUIRED epoll-shim)
+endif()
+
 cmake_pop_check_state()
 
 add_custom_target(generate_git_version
@@ -102,6 +115,7 @@ add_custom_command(
 target_include_directories(datum_gateway
 	PRIVATE
 	$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
+	${EPOLL_SHIM_INCLUDE_DIRS}
 	${CURL_INCLUDE_DIRS}
 	${JANSSON_INCLUDE_DIRS}
 	${SODIUM_INCLUDE_DIRS}
@@ -117,6 +131,7 @@ target_link_libraries(datum_gateway
 	${POW_LIBS}
 	Threads::Threads
 	${ARGP_LIBS}
+	${EPOLL_SHIM_LIBRARIES}
 	${CURL_LIBRARIES} ${CURL_LDFLAGS} ${CURL_LDFLAGS_OTHER}
 	${JANSSON_LIBRARIES} ${JANSSON_LDFLAGS} ${JANSSON_LDFLAGS_OTHER}
 	${SODIUM_LIBRARIES} ${SODIUM_LDFLAGS} ${SODIUM_LDFLAGS_OTHER}

README.md

@@ -122,6 +122,10 @@ For Clear Linux:
 
     sudo swupd bundle-add c-basic cmake pkgconf devpkg-curl devpkg-jansson devpkg-libsodium devpkg-libmicrohttpd psmisc
 
+For FreeBSD:
+
+    sudo pkg install cmake pkgconf curl jansson libsodium libmicrohttpd argp-standalone libepoll-shim
+
 Compile DATUM by running:
 
     cmake . && make

src/datum_protocol.c

@@ -63,6 +63,7 @@
 #include <sys/time.h>
 #include <pthread.h>
 #include <netinet/tcp.h>
+#include <netinet/in.h>
 #include <inttypes.h>
 
 #include "datum_utils.h"