From 0fee46de060ac5e1cbb66c2bc1ec92d89a03ae79 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Wed, 12 Jun 2019 17:07:40 -0700
Subject: [PATCH] Revert "Revert "Remove libbsd dependency for Linux""

This reverts commit 4b87733f3e5e62a1c7a243d7e06cd35ae4b665b3.
---
 CMakeLists.txt       |  9 ---------
 src/CMakeLists.txt   |  8 --------
 src/internal.h       |  4 +++-
 src/shims.h          |  2 +-
 tests/CMakeLists.txt | 29 ++---------------------------
 5 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74b784981..9f3f221e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,15 +200,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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cefde62a5..1bd58676a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -205,11 +205,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
@@ -231,9 +226,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()
diff --git a/src/internal.h b/src/internal.h
index f80eefb08..47973e5e4 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -274,8 +274,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>
diff --git a/src/shims.h b/src/shims.h
index 22aa48645..e14697a9f 100644
--- a/src/shims.h
+++ b/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
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4ebadd9a3..c6aa30449 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -31,11 +31,6 @@ target_include_directories(bsdtests
                            PUBLIC
                              # bsdtests.h needs config_ac.h
                              ${PROJECT_BINARY_DIR})
-if(BSD_OVERLAY_FOUND)
-  target_compile_options(bsdtests
-                         PRIVATE
-                           ${BSD_OVERLAY_CFLAGS})
-endif()
 if (WIN32)
   target_sources(bsdtests
                  PRIVATE
@@ -58,23 +53,13 @@ target_include_directories(bsdtestharness
                              ${CMAKE_CURRENT_BINARY_DIR}
                              ${CMAKE_CURRENT_SOURCE_DIR}
                              ${PROJECT_SOURCE_DIR})
-if(BSD_OVERLAY_FOUND)
-  target_compile_options(bsdtestharness
-                         PRIVATE
-                           ${BSD_OVERLAY_CFLAGS})
-endif()
 target_link_libraries(bsdtestharness
                       PRIVATE
                         bsdtests
                         dispatch)
-if(BSD_OVERLAY_FOUND)
-  target_link_libraries(bsdtestharness
-                        PRIVATE
-                          ${BSD_OVERLAY_LDFLAGS})
-endif()
 
 function(add_unit_test name)
-  set(options DISABLED_TEST;NO_BSD_OVERLAY)
+  set(options DISABLED_TEST)
   set(single_value_args)
   set(multiple_value_args SOURCES)
   cmake_parse_arguments(AUT "${options}" "${single_value_args}" "${multiple_value_args}" ${ARGN})
@@ -97,11 +82,6 @@ function(add_unit_test name)
   target_include_directories(${name}
                              SYSTEM BEFORE PRIVATE
                                "${BlocksRuntime_INCLUDE_DIR}")
-  if(BSD_OVERLAY_FOUND AND NOT AUT_NO_BSD_OVERLAY)
-    target_compile_options(${name}
-                           PRIVATE
-                             ${BSD_OVERLAY_CFLAGS})
-  endif()
   if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
     target_compile_options(${name} PRIVATE -Xclang -fblocks)
     target_compile_options(${name} PRIVATE /W3 -Wno-deprecated-declarations)
@@ -115,11 +95,6 @@ function(add_unit_test name)
                           dispatch
                           Threads::Threads
                           BlocksRuntime::BlocksRuntime)
-  if(BSD_OVERLAY_FOUND AND NOT AUT_NO_BSD_OVERLAY)
-    target_link_libraries(${name}
-                          PRIVATE
-                            ${BSD_OVERLAY_LDFLAGS})
-  endif()
   target_link_libraries(${name} PRIVATE bsdtests)
   add_test(NAME ${name}
            COMMAND bsdtestharness $<TARGET_FILE:${name}>)
@@ -199,7 +174,7 @@ endforeach()
 set_tests_properties(dispatch_io_pipe_close PROPERTIES TIMEOUT 5)
 
 # test dispatch API for various C/CXX language variants
-add_unit_test(dispatch_c99 NO_BSD_OVERLAY SOURCES dispatch_c99.c)
+add_unit_test(dispatch_c99 SOURCES dispatch_c99.c)
 add_unit_test(dispatch_plusplus SOURCES dispatch_plusplus.cpp)
 
 # test-specific link options