Merge pull request #1825 from ligurio/ligurio/gh-xxxx-openbsd-port

Fixes for OpenBSD port

Author: TheJJ

buildsystem/cpp.cmake

@@ -23,15 +23,14 @@ function(declare_binary target_name output_name type)
 			endif()
 
 			if(NOT "${CMAKE_CXX_FLAGS}" MATCHES "-fsanitize" AND NOT MSVC)
-				if(APPLE)
-					set(link_flag "-undefined,error")
-				else()
-					set(link_flag "--no-undefined")
-				endif()
 				set_target_properties("${target_name}" PROPERTIES
 					COMPILE_FLAGS "${EXTRA_FLAGS}"
-					LINK_FLAGS "-Wl,${link_flag}"
 				)
+				if(APPLE)
+					set_target_properties("${target_name}" PROPERTIES LINK_FLAGS "-Wl,-undefined,error")
+				elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+					set_target_properties("${target_name}" PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
+				endif()
 			endif()
 		else()
 			message(FATAL_ERROR "declare_binary encountered unknown flag: ${flag}")

copying.md

@@ -173,6 +173,7 @@ _the openage authors_ are:
 | Luca Pizzagalli             | lucapizzagalli              | web à lucapizzagalli dawt com                     |
 | Erwan Billard               | iacker                      | 82095453+iacker à users dawt noreply dawt github dawt com |
 | Deniz Kökden                | denizkoekden                | koekdendeniz à gmail dawt com                     |
+| Sergey Bronnikov            | ligurio                     | estetus à gmail dawt com                          |
 
 If you're a first-time committer, add yourself to the above list. This is not
 just for legal reasons, but also to keep an overview of all those nicknames.

libopenage/error/handlers.cpp

@@ -44,7 +44,7 @@ namespace {
 bool exit_ok;
 
 std::terminate_handler old_terminate_handler;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 typedef sig_t sighandler_t;
 #endif
 sighandler_t old_sigsegv_handler;

libopenage/util/os.cpp

@@ -14,7 +14,7 @@
 	#include <mach-o/dyld.h>
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 	#include <sys/sysctl.h>
 	#include <sys/types.h>
 #endif
@@ -89,6 +89,24 @@ std::string self_exec_filename() {
 		return std::string{buf.get()};
 	}
 
+#elif defined(__OpenBSD__)
+	// OpenBSD provides neither /proc/self/exe nor KERN_PROC_PATHNAME;
+	// fall back to the argv[0] used to start this process.
+	int mib[4] = {CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_ARGV};
+	size_t bufsize = 0;
+
+	if (sysctl(mib, 4, nullptr, &bufsize, nullptr, 0) < 0) {
+		return std::string{};
+	}
+
+	std::unique_ptr<char[]> buf{new char[bufsize]};
+
+	if (sysctl(mib, 4, buf.get(), &bufsize, nullptr, 0) < 0) {
+		return std::string{};
+	}
+
+	return std::string{buf.get()};
+
 #elif _WIN32
 	// TODO not yet implemented
 	return std::string("openage.exe"); // FIXME: wild guess though

libopenage/util/pty.h

@@ -4,6 +4,11 @@
 
 #ifdef __APPLE__
 	#include <util.h>
+#elif defined(__OpenBSD__)
+	#include <sys/ioctl.h>
+	#include <sys/types.h>
+	#include <termios.h>
+	#include <util.h>
 #elif defined(__FreeBSD__)
 	#include <libutil.h>
 	#include <sys/ioctl.h>