zmap: support json_c-0.14

This commit is contained in:
Martin Milata 2020-06-18 16:37:56 +02:00
parent 9aadc464af
commit b39c3a1a17
2 changed files with 18 additions and 0 deletions

View file

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bd825f..694d9b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,8 @@ if(WITH_JSON)
endif()
add_definitions("-DJSON")
+ # JSON_CFLAGS is a list, i.e. semicolon-separated, convert it to space-separated
+ string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
endif()

View file

@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
sha256 = "0yaahaiawkjk020hvsb8pndbrk8k10wxkfba1irp12a4sj6rywcs";
};
patches = [
# fix build with json-c 0.14 https://github.com/zmap/zmap/pull/609
./cmake-json-0.14-fix.patch
];
cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ];
dontUseCmakeBuildDir = true;