Add option -DPOLLY_BUNDLED_JSONCPP=ON

to use the system lib instead of the patch d/p/use-deb-json.diff

debian/changelog

@@ -1,9 +1,11 @@
-llvm-toolchain-snapshot (1:5.0~svn298899-2) UNRELEASED; urgency=medium
+llvm-toolchain-snapshot (1:5.0~svn302368-1~exp1) experimental; urgency=medium
 
   * Only enable libfuzzer for Linux kernel.
     Thanks to Pino Toscano for the patch
+  * Add option -DPOLLY_BUNDLED_JSONCPP=ON
+    to use the system lib instead of the patch d/p/use-deb-json.diff
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 06 May 2017 10:05:07 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 07 May 2017 12:13:43 +0200
 
 llvm-toolchain-snapshot (1:5.0~svn298899-1) unstable; urgency=medium
 

debian/patches/series

@@ -8,7 +8,6 @@ declare_clear_cache.diff
 clang-format-version.diff
 unwind-chain-inclusion.diff
 hurd-pathmax.diff
-use-deb-json.diff
 silent-gold-test.diff
 atomic_library_1.diff
 atomic_library_2.diff

debian/patches/use-deb-json.diff

@@ -1,76 +0,0 @@
----
- polly/CMakeLists.txt     |    5 ++++-
- polly/lib/CMakeLists.txt |   14 +++++++-------
- 2 files changed, 11 insertions(+), 8 deletions(-)
-
-Index: llvm-toolchain-snapshot_5.0~svn302180/polly/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_5.0~svn302180.orig/polly/CMakeLists.txt
-+++ llvm-toolchain-snapshot_5.0~svn302180/polly/CMakeLists.txt
-@@ -179,11 +179,13 @@ else()
-   set(ISL_TARGET PollyISL)
- endif()
- 
-+find_path(JSONCPP_INCLUDE_PATH json/json.h PATH_SUFFIXES jsoncpp)
-+
- include_directories(
-   BEFORE
-   ${CMAKE_CURRENT_SOURCE_DIR}/include
-   ${ISL_INCLUDE_DIRS}
--  ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/JSON/include
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/JSON/include
-   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/pet/include
-   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External
-   ${CMAKE_CURRENT_BINARY_DIR}/include
-Index: llvm-toolchain-snapshot_5.0~svn302180/polly/lib/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_5.0~svn302180.orig/polly/lib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_5.0~svn302180/polly/lib/CMakeLists.txt
-@@ -1,10 +1,10 @@
- set(LLVM_NO_RTTI 1)
- 
--set(POLLY_JSON_FILES
--    External/JSON/json_reader.cpp
--    External/JSON/json_value.cpp
--    External/JSON/json_writer.cpp
--)
-+#set(POLLY_JSON_FILES
-+#    External/JSON/json_reader.cpp
-+#    External/JSON/json_value.cpp
-+#    External/JSON/json_writer.cpp
-+#)
- 
- set(ISL_CODEGEN_FILES
-     CodeGen/IslAst.cpp
-@@ -57,7 +57,7 @@ add_library(PollyCore OBJECT
-   Support/ISLTools.cpp
-   Support/DumpModulePass.cpp
-   Support/VirtualInstruction.cpp
--  ${POLLY_JSON_FILES}
-+#  ${POLLY_JSON_FILES}
-   Transform/Canonicalization.cpp
-   Transform/CodePreparation.cpp
-   Transform/DeadCodeElimination.cpp
-@@ -77,6 +77,7 @@ set_target_properties(PollyCore PROPERTI
- add_polly_library(Polly $<TARGET_OBJECTS:PollyCore>)
- target_link_libraries(Polly
-   ${ISL_TARGET}
-+  jsoncpp
- )
- 
- # Additional dependencies for Polly-ACC.
-Index: llvm-toolchain-snapshot_5.0~svn302180/polly/lib/Exchange/JSONExporter.cpp
-===================================================================
---- llvm-toolchain-snapshot_5.0~svn302180.orig/polly/lib/Exchange/JSONExporter.cpp
-+++ llvm-toolchain-snapshot_5.0~svn302180/polly/lib/Exchange/JSONExporter.cpp
-@@ -29,8 +29,8 @@
- #include "isl/printer.h"
- #include "isl/set.h"
- #include "isl/union_map.h"
--#include "json/reader.h"
--#include "json/writer.h"
-+#include "jsoncpp/json/reader.h"
-+#include "jsoncpp/json/writer.h"
- #include <memory>
- #include <string>
- #include <system_error>

debian/rules

@@ -268,7 +268,8 @@ override_dh_auto_configure: preconfigure
 	-DLLVM_ENABLE_RTTI=ON \
 	-DLLVM_ENABLE_FFI=ON \
 	$(CMAKE_EXTRA) \
-	-DLIBCLANG_LIBRARY_VERSION=$(SONAME_EXT)
+	-DLIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \
+	-DPOLLY_BUNDLED_JSONCPP=ON
 
 override_dh_auto_build:
 	$(PRE_PROCESS) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS="$(CXXFLAGS_EXTRA)"  LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1