Upstream the rest of our local FreeBSD patching

FreeBSD/DragonflyBSD are also UNIX platforms, as far as trio is concerned, and
we don't need to be setting the CMAKE_INSTALL_RPATH on FreeBSD.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2947af..d4f45d2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -944,7 +944,9 @@ if (APPLE)
        set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
 else (APPLE)
        set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-       set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..")
+       if (NOT FREEBSD)
+               set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..")
+       endif()
 endif(APPLE)
 
 if (BUILD_SHARED_LIBS)

diff --git a/winpr/libwinpr/utils/trio/triodef.h b/winpr/libwinpr/utils/trio/triodef.h
index 9d5bf10..723e391 100644 (file)
--- a/winpr/libwinpr/utils/trio/triodef.h
+++ b/winpr/libwinpr/utils/trio/triodef.h
@@ -88,7 +88,7 @@
 # endif
 #endif
 
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
 # define TRIO_PLATFORM_UNIX
 #endif