Various build fixes for OpenBSD

indilib · Dec 23, 2024 · 0b8453b · 0b8453b
1 parent c6483e5
commit 0b8453b
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/cmake_modules/CMakeCommon.cmake b/cmake_modules/CMakeCommon.cmake
@@ -46,7 +46,7 @@ IF (UNIX OR APPLE OR ANDROID)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SEC_COMP_FLAGS}")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SEC_COMP_FLAGS}")
     SET(SEC_LINK_FLAGS "")
-    IF (NOT APPLE AND NOT CYGWIN AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    IF (NOT APPLE AND NOT CYGWIN AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|OpenBSD")
         SET(SEC_LINK_FLAGS "${SEC_LINK_FLAGS} -Wl,-z,nodump -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
     ENDIF ()
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SEC_LINK_FLAGS}")

diff --git a/drivers/auxiliary/skysafari.cpp b/drivers/auxiliary/skysafari.cpp
@@ -39,7 +39,7 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <netinet/in.h>
 #endif
 

diff --git a/drivers/telescope/lx200driver.cpp b/drivers/telescope/lx200driver.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110 - 1301  USA
 #include <termios.h>
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <string.h>
 #endif
 

diff --git a/drivers/video/CMakeLists.txt b/drivers/video/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ########## INDI::CCD V4L Driver ###############
 
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD")
     SET(v4l2driverccd_SRC
         lx/Lx.cpp
         v4l2driver.cpp

diff --git a/libs/hid/hid_libusb.c b/libs/hid/hid_libusb.c
@@ -65,7 +65,7 @@ extern "C" {
     } while (0)
 #endif
 
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
 #define DETACH_KERNEL_DRIVER
 #endif
 

diff --git a/libs/indibase/CMakeLists.txt b/libs/indibase/CMakeLists.txt
@@ -27,8 +27,8 @@ list(APPEND ${PROJECT_NAME}_LIBS
     ${CURL}
 )
 
-# Add Iconv - FreeBSD needs to find the correct GNU iconv library.
-if(CYGWIN OR UNIX OR (CMAKE_SYSTEM_NAME MATCHES "FreeBSD"))
+# Add Iconv - FreeBSD/OpenBSD need to find the correct GNU iconv library.
+if(CYGWIN OR UNIX OR (CMAKE_SYSTEM_NAME MATCHES "FreeBSD|OpenBSD"))
     find_package(Iconv REQUIRED)
     list(APPEND ${PROJECT_NAME}_LIBS ${Iconv_LIBRARIES})
 endif()
@@ -105,7 +105,7 @@ if(UNIX)
         COMPONENT Devel
     )
 
-    if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
+    if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD")
         list(APPEND ${PROJECT_NAME}_SOURCES
             webcam/v4l2_colorspace.c
             webcam/v4l2_base.cpp

diff --git a/libs/indibase/connectionplugins/connectiontcp.cpp b/libs/indibase/connectionplugins/connectiontcp.cpp
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <regex>
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/socket.h>

diff --git a/libs/indibase/webcam/pwc-ioctl.h b/libs/indibase/webcam/pwc-ioctl.h
@@ -51,7 +51,7 @@
 
 #pragma once
 
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
 #include <linux/types.h>
 #else
 #include <stdint.h>

diff --git a/libs/indibase/webcam/v4l2_base.cpp b/libs/indibase/webcam/v4l2_base.cpp
@@ -50,7 +50,7 @@
 #include <asm/types.h> /* for videodev2.h */
 /* Kernel headers version */
 #include <linux/version.h>
-#elif __FreeBSD__
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
 #define LINUX_VERSION_CODE 1
 #define KERNEL_VERSION(...) 1
 #endif

diff --git a/libs/indicore/CMakeLists.txt b/libs/indicore/CMakeLists.txt
@@ -51,7 +51,7 @@ if(UNIX)
     list(APPEND ${PROJECT_NAME}_SOURCES        
         sharedblob_parse.cpp
         shm_open_anon.c)
-    if(UNIX AND NOT APPLE)
+    if(UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
         target_link_libraries(${PROJECT_NAME} rt)
     endif()
 endif()

diff --git a/libs/indicore/indicom.c b/libs/indicore/indicom.c
@@ -50,7 +50,7 @@
 #include <string.h>
 #include <time.h>
 
-#if defined(__linux__) || defined(__NetBSD__)
+#if defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/ioctl.h>
 #endif
 
@@ -793,7 +793,7 @@ int tty_connect(const char *device, int bit_rate, int word_size, int parity, int
     case 57600:  bps = B57600;  break;
     case 115200: bps = B115200; break;
     case 230400: bps = B230400; break;
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
     case 460800: bps = B460800; break;
     case 576000: bps = B576000; break;
     case 921600: bps = B921600; break;