From 90e7236253f7d0e7f229150870a830e743600920 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 27 Feb 2017 22:04:01 +0000
Subject: [PATCH] rebase of the patches

---
 debian/patches/use-deb-json.diff | 33 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/patches/use-deb-json.diff b/debian/patches/use-deb-json.diff
index 25abbcd2..13772a92 100644
--- a/debian/patches/use-deb-json.diff
+++ b/debian/patches/use-deb-json.diff
@@ -3,28 +3,29 @@
  polly/lib/CMakeLists.txt |   14 +++++++-------
  2 files changed, 11 insertions(+), 8 deletions(-)
 
-Index: llvm-toolchain-snapshot_5.0~svn294199/polly/CMakeLists.txt
+Index: llvm-toolchain-snapshot_5.0~svn296391/polly/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn294199.orig/polly/CMakeLists.txt
-+++ llvm-toolchain-snapshot_5.0~svn294199/polly/CMakeLists.txt
-@@ -158,10 +158,12 @@ if (CUDALIB_FOUND)
-   INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} )
- endif(CUDALIB_FOUND)
+--- llvm-toolchain-snapshot_5.0~svn296391.orig/polly/CMakeLists.txt
++++ llvm-toolchain-snapshot_5.0~svn296391/polly/CMakeLists.txt
+@@ -171,11 +171,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_BINARY_DIR}/lib/External/isl/include
-   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
    ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/pet/include
-Index: llvm-toolchain-snapshot_5.0~svn294199/polly/lib/CMakeLists.txt
+   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External
+   ${CMAKE_CURRENT_BINARY_DIR}/include
+Index: llvm-toolchain-snapshot_5.0~svn296391/polly/lib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn294199.orig/polly/lib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_5.0~svn294199/polly/lib/CMakeLists.txt
+--- llvm-toolchain-snapshot_5.0~svn296391.orig/polly/lib/CMakeLists.txt
++++ llvm-toolchain-snapshot_5.0~svn296391/polly/lib/CMakeLists.txt
 @@ -1,10 +1,10 @@
  set(LLVM_NO_RTTI 1)
  
@@ -54,15 +55,15 @@ Index: llvm-toolchain-snapshot_5.0~svn294199/polly/lib/CMakeLists.txt
    target_link_libraries(Polly PollyPPCG)
  endif (GPU_CODEGEN)
  
--target_link_libraries(Polly PollyISL)
-+target_link_libraries(Polly PollyISL jsoncpp)
+-target_link_libraries(Polly ${ISL_TARGET})
++target_link_libraries(Polly ${ISL_TARGET} jsoncpp)
  
  if (BUILD_SHARED_LIBS)
    target_link_libraries(Polly
-Index: llvm-toolchain-snapshot_5.0~svn294199/polly/lib/Exchange/JSONExporter.cpp
+Index: llvm-toolchain-snapshot_5.0~svn296391/polly/lib/Exchange/JSONExporter.cpp
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn294199.orig/polly/lib/Exchange/JSONExporter.cpp
-+++ llvm-toolchain-snapshot_5.0~svn294199/polly/lib/Exchange/JSONExporter.cpp
+--- llvm-toolchain-snapshot_5.0~svn296391.orig/polly/lib/Exchange/JSONExporter.cpp
++++ llvm-toolchain-snapshot_5.0~svn296391/polly/lib/Exchange/JSONExporter.cpp
 @@ -29,8 +29,8 @@
  #include "isl/printer.h"
  #include "isl/set.h"