proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-14 17:07:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase of the patches

Browse Source
This commit is contained in:
Sylvestre Ledru 2017-02-27 22:04:01 +00:00
parent 3e46437443
commit 90e7236253
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
debian/patches/use-deb-json.diff vendored
View File

@ -3,28 +3,29 @@
polly/lib/CMakeLists.txt | 14 +++++++------- polly/lib/CMakeLists.txt | 14 +++++++-------
2 files changed, 11 insertions(+), 8 deletions(-) 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~svn296391.orig/polly/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn294199/polly/CMakeLists.txt +++ llvm-toolchain-snapshot_5.0~svn296391/polly/CMakeLists.txt
@@ -158,10 +158,12 @@ if (CUDALIB_FOUND) @@ -171,11 +171,13 @@ else()
INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} ) set(ISL_TARGET PollyISL)
endif(CUDALIB_FOUND) endif()
+find_path(JSONCPP_INCLUDE_PATH json/json.h PATH_SUFFIXES jsoncpp) +find_path(JSONCPP_INCLUDE_PATH json/json.h PATH_SUFFIXES jsoncpp)
+ +
include_directories( include_directories(
BEFORE BEFORE
${CMAKE_CURRENT_SOURCE_DIR}/include ${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/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 ${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~svn296391.orig/polly/lib/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn294199/polly/lib/CMakeLists.txt +++ llvm-toolchain-snapshot_5.0~svn296391/polly/lib/CMakeLists.txt
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
set(LLVM_NO_RTTI 1) 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) target_link_libraries(Polly PollyPPCG)
endif (GPU_CODEGEN) endif (GPU_CODEGEN)
-target_link_libraries(Polly PollyISL) -target_link_libraries(Polly ${ISL_TARGET})
+target_link_libraries(Polly PollyISL jsoncpp) +target_link_libraries(Polly ${ISL_TARGET} jsoncpp)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
target_link_libraries(Polly 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~svn296391.orig/polly/lib/Exchange/JSONExporter.cpp
+++ llvm-toolchain-snapshot_5.0~svn294199/polly/lib/Exchange/JSONExporter.cpp +++ llvm-toolchain-snapshot_5.0~svn296391/polly/lib/Exchange/JSONExporter.cpp
@@ -29,8 +29,8 @@ @@ -29,8 +29,8 @@
#include "isl/printer.h" #include "isl/printer.h"
#include "isl/set.h" #include "isl/set.h"