summaryrefslogtreecommitdiff
path: root/devel/libddwaf/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libddwaf/files')
-rw-r--r--devel/libddwaf/files/patch-CMakeLists.txt10
-rw-r--r--devel/libddwaf/files/patch-cmake-objects.cmake11
-rw-r--r--devel/libddwaf/files/patch-tests-CMakeLists.txt11
-rw-r--r--devel/libddwaf/files/patch-third_party-CMakeLists.txt142
4 files changed, 170 insertions, 4 deletions
diff --git a/devel/libddwaf/files/patch-CMakeLists.txt b/devel/libddwaf/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..ff962da9d1c7
--- /dev/null
+++ b/devel/libddwaf/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2025-05-28 14:15:10 UTC
++++ CMakeLists.txt
+@@ -99,7 +99,6 @@ add_subdirectory(third_party EXCLUDE_FROM_ALL)
+
+ add_subdirectory(third_party EXCLUDE_FROM_ALL)
+
+-set(LIBDDWAF_PRIVATE_LIBRARIES lib_rapidjson)
+ if(NOT MSVC AND LIBDDWAF_TESTING AND LIBDDWAF_TEST_COVERAGE)
+ list(APPEND LIBDDWAF_PRIVATE_LIBRARIES gcov)
+ endif()
diff --git a/devel/libddwaf/files/patch-cmake-objects.cmake b/devel/libddwaf/files/patch-cmake-objects.cmake
index 3451a9cd84e5..e2551d434e6d 100644
--- a/devel/libddwaf/files/patch-cmake-objects.cmake
+++ b/devel/libddwaf/files/patch-cmake-objects.cmake
@@ -1,6 +1,6 @@
---- cmake/objects.cmake.orig 2024-05-08 08:20:47 UTC
+--- cmake/objects.cmake.orig 2025-07-02 10:21:03 UTC
+++ cmake/objects.cmake
-@@ -68,31 +68,6 @@ set(LIBDDWAF_SOURCE
+@@ -90,30 +90,6 @@ set(LIBDDWAF_SOURCE
${libddwaf_SOURCE_DIR}/src/libcxx-compat/monotonic_buffer_resource.cpp
${libddwaf_SOURCE_DIR}/src/vendor/fmt/format.cc
${libddwaf_SOURCE_DIR}/src/vendor/radixlib/radixlib.c
@@ -23,7 +23,6 @@
- ${libddwaf_SOURCE_DIR}/src/vendor/re2/re2.cc
- ${libddwaf_SOURCE_DIR}/src/vendor/re2/regexp.cc
- ${libddwaf_SOURCE_DIR}/src/vendor/re2/simplify.cc
-- ${libddwaf_SOURCE_DIR}/src/vendor/re2/stringpiece.cc
- ${libddwaf_SOURCE_DIR}/src/vendor/re2/tostring.cc
- ${libddwaf_SOURCE_DIR}/src/vendor/re2/unicode_casefold.cc
- ${libddwaf_SOURCE_DIR}/src/vendor/re2/unicode_groups.cc
@@ -32,7 +31,7 @@
)
set(LIBDDWAF_PUBLIC_INCLUDES ${libddwaf_SOURCE_DIR}/include)
-@@ -100,12 +75,25 @@ set(LIBDDWAF_PRIVATE_INCLUDES
+@@ -121,12 +97,29 @@ set(LIBDDWAF_PRIVATE_INCLUDES
set(LIBDDWAF_PRIVATE_INCLUDES
${libddwaf_SOURCE_DIR}/src
${libddwaf_SOURCE_DIR}/src/vendor
@@ -47,6 +46,10 @@
+if (LIBAC)
+ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES ac)
+endif()
++find_library(LIBFMT fmt)
++if (LIBFMT)
++ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES fmt)
++endif()
+find_library(LIBINJECTION injection)
+if (LIBINJECTION)
+ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES injection)
diff --git a/devel/libddwaf/files/patch-tests-CMakeLists.txt b/devel/libddwaf/files/patch-tests-CMakeLists.txt
new file mode 100644
index 000000000000..712eb969a2cd
--- /dev/null
+++ b/devel/libddwaf/files/patch-tests-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- tests/CMakeLists.txt.orig 2025-05-28 14:15:10 UTC
++++ tests/CMakeLists.txt
+@@ -14,7 +14,7 @@ endif()
+ target_compile_definitions(waf_test PRIVATE LIBDDWAF_VECTORIZED_TRANSFORMERS)
+ endif()
+
+-set(LIBDDWAF_TEST_LIBRARIES lib_gtest lib_gmock libddwaf_objects lib_yamlcpp lib_rapidjson)
++set(LIBDDWAF_TEST_LIBRARIES lib_gtest lib_gmock libddwaf_objects lib_yamlcpp)
+ if(NOT MSVC AND LIBDDWAF_TEST_COVERAGE)
+ target_compile_options(waf_test PRIVATE -ggdb --coverage)
+ list(APPEND LIBDDWAF_TEST_LIBRARIES gcov)
diff --git a/devel/libddwaf/files/patch-third_party-CMakeLists.txt b/devel/libddwaf/files/patch-third_party-CMakeLists.txt
new file mode 100644
index 000000000000..02713054e2e9
--- /dev/null
+++ b/devel/libddwaf/files/patch-third_party-CMakeLists.txt
@@ -0,0 +1,142 @@
+--- third_party/CMakeLists.txt.orig 2025-05-28 14:15:10 UTC
++++ third_party/CMakeLists.txt
+@@ -1,5 +1,4 @@ project(third_party)
+ project(third_party)
+-include(ExternalProject)
+
+ set(DOWNLOAD_SUBDIR downloads)
+ set(INSTALL_DIR ${CMAKE_BINARY_DIR}/third_party)
+@@ -15,27 +14,7 @@ endif()
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-unused-parameter -Wno-shadow")
+ endif()
+
+-set(RAPIDJSON_COMMIT 24b5e7a8b27f42fa16b96fc70aade9106cf7102f)
+-ExternalProject_Add(proj_rapidjson
+- URL https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_COMMIT}.tar.gz
+- INSTALL_DIR ${INSTALL_DIR}
+- CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
+- -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+- BUILD_COMMAND ""
+- INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory "<SOURCE_DIR>/include/" "<INSTALL_DIR>/include/"
+-)
+-add_library(lib_rapidjson INTERFACE IMPORTED GLOBAL)
+-target_include_directories(lib_rapidjson INTERFACE ${INSTALL_DIR}/include)
+-add_dependencies(lib_rapidjson proj_rapidjson)
+-target_compile_definitions(lib_rapidjson INTERFACE RAPIDJSON_HAS_STDSTRING=1)
+-set_target_properties(proj_rapidjson PROPERTIES EXCLUDE_FROM_ALL TRUE)
++find_package(RapidJSON)
+
+ if(NOT MSVC)
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
+@@ -43,95 +22,20 @@ endif()
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fPIC")
+ endif()
+
+-if(CMAKE_BUILD_TYPE MATCHES Debug)
+- set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtestd${CMAKE_STATIC_LIBRARY_SUFFIX})
+- set(LIBGMOCK_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gmockd${CMAKE_STATIC_LIBRARY_SUFFIX})
+-else()
+- set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX})
+- set(LIBGMOCK_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX})
++find_library(lib_gmock gmock)
++if(lib_gmock)
++ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES lib_gmock)
+ endif()
+-
+-set(GOOGLETEST_COMMIT 955c7f837efad184ec63e771c42542d37545eaef)
+-ExternalProject_Add(proj_gtest
+- URL https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz
+- INSTALL_DIR ${INSTALL_DIR}
+- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+- -DCMAKE_INSTALL_LIBDIR=lib
+- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
+- -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+- -DBUILD_SHARED_LIBS=0
+- -DBUILD_GMOCK=ON
+- BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBGTEST_FILENAME} ${INSTALL_DIR}/lib/${LIBGMOCK_FILENAME}
+-)
+-
+-add_library(lib_gtest STATIC IMPORTED GLOBAL)
+-add_library(lib_gmock STATIC IMPORTED GLOBAL)
+-set_property(TARGET lib_gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBGTEST_FILENAME})
+-set_property(TARGET lib_gmock PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBGMOCK_FILENAME})
+-target_include_directories(lib_gtest INTERFACE ${INSTALL_DIR}/include)
+-target_include_directories(lib_gmock INTERFACE ${INSTALL_DIR}/include)
+-if(NOT MSVC)
+- target_link_libraries(lib_gtest INTERFACE -lpthread)
+- target_link_libraries(lib_gmock INTERFACE -lpthread)
++find_library(lib_gtest gtest)
++if(lib_gtest)
++ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES lib_gtest)
+ endif()
+
+-add_dependencies(lib_gtest proj_gtest)
+-add_dependencies(lib_gmock proj_gtest)
+-set_target_properties(lib_gtest lib_gmock proj_gtest PROPERTIES EXCLUDE_FROM_ALL TRUE)
+-
+ # yaml-cpp
+-if (NOT MSVC)
+- if(CMAKE_BUILD_TYPE MATCHES Debug)
+- set(LIBYAML_FILENAME libyaml-cppd${CMAKE_STATIC_LIBRARY_SUFFIX})
+- else()
+- set(LIBYAML_FILENAME libyaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX})
+- endif()
+-else()
+- set(LIBYAML_FILENAME yaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX})
++find_library(lib_yamlcpp yamlcpp)
++if(lib_yamlcpp)
++ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES lib_yamlcpp)
+ endif()
+
+-ExternalProject_Add(proj_yamlcpp
+- URL https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.7.0.zip
+- INSTALL_DIR ${INSTALL_DIR}
+- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+- -DCMAKE_INSTALL_LIBDIR=lib
+- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
+- -DYAML_CPP_BUILD_TESTS=OFF
+- -DYAML_CPP_BUILD_CONTRIB=OFF
+- -DYAML_CPP_BUILD_TOOLS=OFF
+- -DYAML_CPP_INSTALL=ON
+- -DYAML_BUILD_SHARED_LIBS=OFF
+- -DYAML_MSVC_SHARED_RT=OFF
+- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+- -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+- BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBYAML_FILENAME}
+-)
+-add_library(lib_yamlcpp STATIC IMPORTED GLOBAL)
+-set_target_properties(lib_yamlcpp PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBYAML_FILENAME})
+-target_include_directories(lib_yamlcpp INTERFACE ${INSTALL_DIR}/include)
+-add_dependencies(lib_yamlcpp proj_yamlcpp)
+-set_target_properties(lib_yamlcpp proj_yamlcpp PROPERTIES EXCLUDE_FROM_ALL TRUE)
+-
+ # Appsec event rules
+-ExternalProject_Add(proj_event_rules
+- GIT_REPOSITORY git@github.com:DataDog/appsec-event-rules.git
+- GIT_TAG 1.9.0
+- GIT_SHALLOW ON
+- CONFIGURE_COMMAND ""
+- BUILD_COMMAND ""
+- INSTALL_COMMAND "")
+-
+-set_target_properties(proj_event_rules PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ # vim: et
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 11:58:52 +0000