[CP #1890 > support/v5.13] [core] Fixup build for Alpine (#1895)

* Fixup build for Alpine (#1890) --------- Co-authored-by: DownerCase <[email protected]> Co-authored-by: Peguen <[email protected]>
eclipse-ecal · Jan 17, 2025 · 01f94b8 · 01f94b8
1 parent 5484c2b
commit 01f94b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/ecal/core/src/ecal_process_stub.cpp b/ecal/core/src/ecal_process_stub.cpp
@@ -1,6 +1,6 @@
 /* ========================= eCAL LICENSE =================================
  *
- * Copyright (C) 2016 - 2019 Continental Corporation
+ * Copyright (C) 2016 - 2025 Continental Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include <cstdlib>
-#include <cerrno>
+#include <errno.h>
 #include <fcntl.h>
 #include <string>
 #include <sys/file.h>
@@ -39,7 +38,7 @@ int main(int argc, char** argv)
   }
   else if ((argc == 2) && (std::string(argv[1]) == "--version"))
   {
-    // POSIX wants us to provide some output when launching with --version. We also use this to determine the correctnis of this application from other applications.
+    // POSIX wants us to provide some output when launching with --version. We also use this to determine the correctness of this application from other applications.
     std::cout << ECAL_PROCESS_STUB_VERSION_STRING << std::endl;
     return EXIT_SUCCESS;
   }

diff --git a/lib/ecal_utils/CMakeLists.txt b/lib/ecal_utils/CMakeLists.txt
@@ -1,6 +1,6 @@
 # ========================= eCAL LICENSE =================================
 #
-# Copyright (C) 2016 - 2019 Continental Corporation
+# Copyright (C) 2016 - 2025 Continental Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,6 +53,15 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_14)
 
+# filesystem.cpp uses fts on Linux, some distibutions (i.e: Alpine) have fts as a
+# separate library
+if(LINUX)
+  find_library(libfts NAMES fts)
+  if(NOT "${libfts}" STREQUAL "libfts-NOTFOUND")
+    target_link_libraries(${PROJECT_NAME} PRIVATE "${libfts}")
+  endif()
+endif()
+
 # Create a source tree that mirrors the filesystem
 source_group(TREE "${CMAKE_CURRENT_LIST_DIR}"
     FILES