diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /tools/macos-setup-patches/falco-include-dirs.patch | |
parent | Adding debian version 4.2.6-1. (diff) | |
download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tools/macos-setup-patches/falco-include-dirs.patch')
-rw-r--r-- | tools/macos-setup-patches/falco-include-dirs.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/macos-setup-patches/falco-include-dirs.patch b/tools/macos-setup-patches/falco-include-dirs.patch new file mode 100644 index 00000000..68f5f228 --- /dev/null +++ b/tools/macos-setup-patches/falco-include-dirs.patch @@ -0,0 +1,15 @@ +758865ee6 update(cmake): Don't add build directories to our pc files +diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt +index 6104603e8..1989ea3fb 100644 +--- a/userspace/libsinsp/CMakeLists.txt ++++ b/userspace/libsinsp/CMakeLists.txt +@@ -335,6 +335,9 @@ endforeach() + # Build our pkg-config "Cflags:" flags. + set(SINSP_PKG_CONFIG_INCLUDES "") + foreach(sinsp_include_directory ${LIBSINSP_INCLUDE_DIRS}) ++ if (${sinsp_include_directory} MATCHES "^${CMAKE_SOURCE_DIR}" OR ${sinsp_include_directory} MATCHES "^${CMAKE_BINARY_DIR}") ++ continue() ++ endif() + list(APPEND SINSP_PKG_CONFIG_INCLUDES -I${sinsp_include_directory}) + endforeach() + |