Merge remote-tracking branch 'origin/topic/awelzel/no-global-libkqueu…

…e-includes' * origin/topic/awelzel/no-global-libkqueue-includes: Bump cmake submodule iosource: Specify libkqueue dependency for subdir lib
ckreibich · Dec 6, 2023 · e7b8d06 · e7b8d06
2 parents 8d52dbe + a8792a1
commit e7b8d06
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,21 @@
+6.2.0-dev.245 | 2023-12-06 18:42:25 +0100
+
+  * Bump cmake submodule (Arne Welzel, Corelight)
+
+  * iosource: Specify libkqueue dependency for subdir lib (Arne Welzel, Corelight)
+
+    Since a while my build has been spilling the following warnings:
+
+        [18/1687] Building C object auxil/c-ares/src/lib/CMakeFiles/c-ares.dir/ares__addrinfo2hostent.c.o
+        cc1: warning: zeek/prod-build/libkqueue-build/include: No such file or directory [-Wmissing-include-dirs]
+
+    My take is that FindKqueue extends the include directories globally and
+    tickles this warning because c-ares is built first. Grepping around,
+    <sys/event.h> is only included in iosource/Manager.cc, so we should
+    be able to reduce the exposure just to the iosource subdir.
+
+  * Update zeek-aux submodule (Arne Welzel, Corelight)
+
 6.2.0-dev.241 | 2023-12-06 11:41:29 +0100
 
   * spicy/runtime-support: Use Vector::unsafeBegin() for args iteration (Arne Welzel, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.2.0-dev.241
+6.2.0-dev.245
diff --git a/cmake b/cmake
diff --git a/src/iosource/CMakeLists.txt b/src/iosource/CMakeLists.txt
@@ -1,5 +1,9 @@
 zeek_add_subdir_library(
     iosource
+    INCLUDE_DIRS
+    ${LIBKQUEUE_INCLUDE_DIRS}
+    DEPENDENCIES
+    ${LIBKQUEUE_LIBRARIES}
     SOURCES
     BPF_Program.cc
     Component.cc