Revert "Revert "Remove libbsd dependency for Linux""

This reverts commit 4b87733.

Signed-off-by: Kim Topley <[email protected]>

Author: compnerd

CMakeLists.txt

@@ -197,15 +197,6 @@ check_function_exists(strlcpy HAVE_STRLCPY)
 check_function_exists(sysconf HAVE_SYSCONF)
 check_function_exists(arc4random HAVE_ARC4RANDOM)
 
-if(NOT HAVE_STRLCPY AND NOT HAVE_GETPROGNAME)
-  include(FindPkgConfig)
-  pkg_check_modules(BSD_OVERLAY libbsd-overlay)
-  if(BSD_OVERLAY_FOUND)
-    set(HAVE_STRLCPY 1 CACHE INTERNAL "Have function strlcpy" FORCE)
-    set(HAVE_GETPROGNAME 1 CACHE INTERNAL "Have function getprogname" FORCE)
-  endif()
-endif()
-
 find_package(Threads REQUIRED)
 
 check_include_files("TargetConditionals.h" HAVE_TARGETCONDITIONALS_H)

src/CMakeLists.txt

@@ -204,11 +204,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Android)
                          PRIVATE
                            -U_GNU_SOURCE)
 endif()
-if(BSD_OVERLAY_FOUND)
-  target_compile_options(dispatch
-                         PRIVATE
-                           ${BSD_OVERLAY_CFLAGS})
-endif()
 if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
   target_compile_options(dispatch
                          PRIVATE
@@ -230,9 +225,6 @@ else()
                            -fblocks
                            -momit-leaf-frame-pointer)
 endif()
-if(BSD_OVERLAY_FOUND)
-  target_link_libraries(dispatch PRIVATE ${BSD_OVERLAY_LDFLAGS})
-endif()
 if(LibRT_FOUND)
   target_link_libraries(dispatch PRIVATE RT::rt)
 endif()

src/internal.h

@@ -282,8 +282,10 @@ upcast(dispatch_object_t dou)
 #include <linux/sysctl.h>
 #else
 #include <sys/sysctl.h>
-#include <sys/queue.h>
 #endif /* __ANDROID__ */
+#if !defined(__linux__)
+#include <sys/queue.h>
+#endif
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/mman.h>

src/shims.h

@@ -33,7 +33,7 @@
 #include "shims/generic_win_stubs.h"
 #endif // defined(_WIN32)
 
-#if defined(_WIN32) || defined(__ANDROID__)
+#if defined(_WIN32) || defined(__linux__)
 #include "shims/generic_sys_queue.h"
 #endif