[.dockerignore] Init ; [*] Fix Linux build (tested on Alpine & Debian with Docker) ; [acquire/tests/test_string_extras.h] Remove hack that tried to fix debian ; [acquire/tests/test_extract.h] Fix malformed macro that gcc on debian picked up ; [cmake/FindLibBSD.cmake] Add more hints so that it's found on debian ; [debian.Dockerfile] Add libbsd-dev dependency

Author: SamuelMarks

acquire/CMakeLists.txt

@@ -281,6 +281,9 @@ else ()
             target_compile_definitions(
                     "${LIBRARY_NAME}_impl" PUBLIC HAVE_LIBBSD=1 HAVE_STRNSTR=1
             )
+            message(STATUS "libbsd found")
+        else ()
+            message(STATUS "No libbsd found")
         endif (LibBSD_FOUND)
     endif (NOT BSD)
 
@@ -307,6 +310,7 @@ else ()
     target_link_libraries("${LIBRARY_NAME}" PUBLIC "${LIBRARY_NAME}_impl")
     set(lib_vis "PUBLIC")
 
+    list(REMOVE_ITEM LIBACQUIRE_LIBRARIES "${CHECKSUM_LIBRARIES}" "${EXTRACT_LIB}" "lib${EXTRACT_LIB}")
     foreach (_lib ${LIBACQUIRE_LIBRARIES})
         target_link_libraries_once("${LIBRARY_NAME}" "${lib_vis}" "${_lib}")
     endforeach (_lib ${LIBACQUIRE_LIBRARIES})

acquire/tests/test_extract.h

@@ -24,8 +24,8 @@
 #include <acquire_libarchive.h>
 #else
 #error                                                                         \
-    "ARCHIVE_LIB must be defined to the backend name (e.g. miniz or libarchive)
-or USE_MINIZ or USE_LIBARCHIVE must be defined"
+    "ARCHIVE_LIB must be defined to the backend name (e.g. miniz or libarchive)" \
+    "or USE_MINIZ or USE_LIBARCHIVE must be defined";
 #endif /* ARCHIVE_LIB */
 
 #include <acquire_common_defs.h>

acquire/tests/test_string_extras.h

@@ -5,13 +5,6 @@
 
 #include "config_for_tests.h"
 
-#ifdef HAVE_STRNSTR
-#undef HAVE_STRNSTR
-#endif /* HAVE_STRNSTR */
-#ifndef STRNSTR_IMPL
-#define STRNSTR_IMPL
-#endif /* !STRNSTR_IMPL */
-
 #include <acquire_string_extras.h>
 
 static const char *buffer = "hello world";

cmake/FindLibBSD.cmake

@@ -26,6 +26,7 @@ set(_LIBBSD_HINTS
         "/opt"
         "/usr"
         "/usr/local/include"  # Homebrew macOS common prefix
+        "/usr/include"
 )
 
 # Remove empty and duplicate entries
@@ -73,17 +74,35 @@ function(_libbsd_resolve_libraries input_libs output_var)
 
         # If still not found, try to sanitize common library extensions manually
         if (NOT _found_path)
+            if (NOT DEFINED TARGET_ARCH)
+                include("${CMAKE_SOURCE_DIR}/cmake/get_arch.cmake")
+                get_arch()
+            endif (NOT DEFINED TARGET_ARCH)
+            string(TOLOWER TARGET_ARCH arch)
+
             # try known install path hardcoded — add your known lib path:
             foreach (p
                     "/usr/local/lib/lib${_libname}.dylib"
                     "/usr/local/lib/lib${_libname}.a"
+                    "/usr/lib/${arch}-linux-gnu/libbsd.so"
+                    "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/libbsd.so"
+                    "/usr/lib/x86_64-linux-gnu/libbsd.so"
+                    "/usr/lib/aarch64-linux-gnu/libbsd.so"
+                    "/usr/lib/arm-linux-gnueabihf/libbsd.so"
+                    "/usr/lib/i386-linux-gnu/libbsd.so"
                     "/usr/lib/libbsd.so")
                 if (EXISTS "${p}" AND NOT IS_DIRECTORY "${p}")
                     set(_found_path "${p}")
                 endif (EXISTS "${p}" AND NOT IS_DIRECTORY "${p}")
             endforeach (p
                     "/usr/local/lib/lib${_libname}.dylib"
                     "/usr/local/lib/lib${_libname}.a"
+                    "/usr/lib/${arch}-linux-gnu/libbsd.so"
+                    "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/libbsd.so"
+                    "/usr/lib/x86_64-linux-gnu/libbsd.so"
+                    "/usr/lib/aarch64-linux-gnu/libbsd.so"
+                    "/usr/lib/arm-linux-gnueabihf/libbsd.so"
+                    "/usr/lib/i386-linux-gnu/libbsd.so"
                     "/usr/lib/libbsd.so")
         endif ()
 

debian.Dockerfile

@@ -5,6 +5,7 @@ RUN apt-get update -qq && \
       cmake \
       gcc \
       libarchive-dev \
+      libbsd-dev \
       libc-dev \
       libcurl4-openssl-dev \
       librhash-dev \