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

rebase of the patch

Browse Source
This commit is contained in:
Sylvestre Ledru 2017-02-06 10:18:27 +00:00
parent 0f13ced57e
commit aa91fc2505
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,11 +3,11 @@
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~svn293390/polly/CMakeLists.txt Index: llvm-toolchain-snapshot_5.0~svn294178/polly/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn293390.orig/polly/CMakeLists.txt --- llvm-toolchain-snapshot_5.0~svn294178.orig/polly/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn293390/polly/CMakeLists.txt +++ llvm-toolchain-snapshot_5.0~svn294178/polly/CMakeLists.txt
@@ -158,10 +158,13 @@ if (CUDALIB_FOUND) @@ -158,10 +158,12 @@ if (CUDALIB_FOUND)
INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} )
endif(CUDALIB_FOUND) endif(CUDALIB_FOUND)
@ -16,28 +16,27 @@ Index: llvm-toolchain-snapshot_5.0~svn293390/polly/CMakeLists.txt
include_directories( include_directories(
BEFORE BEFORE
${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include
- ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include - ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/JSON/include
+# ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include +# ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/JSON/include
+ ${JSONCPP_INCLUDE_PATH}
${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include ${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
${CMAKE_CURRENT_SOURCE_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~svn293390/polly/lib/CMakeLists.txt Index: llvm-toolchain-snapshot_5.0~svn294178/polly/lib/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn293390.orig/polly/lib/CMakeLists.txt --- llvm-toolchain-snapshot_5.0~svn294178.orig/polly/lib/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn293390/polly/lib/CMakeLists.txt +++ llvm-toolchain-snapshot_5.0~svn294178/polly/lib/CMakeLists.txt
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
set(LLVM_NO_RTTI 1) set(LLVM_NO_RTTI 1)
-set(POLLY_JSON_FILES -set(POLLY_JSON_FILES
- JSON/json_reader.cpp - External/JSON/json_reader.cpp
- JSON/json_value.cpp - External/JSON/json_value.cpp
- JSON/json_writer.cpp - External/JSON/json_writer.cpp
-) -)
+#set(POLLY_JSON_FILES +#set(POLLY_JSON_FILES
+# JSON/json_reader.cpp +# External/JSON/json_reader.cpp
+# JSON/json_value.cpp +# External/JSON/json_value.cpp
+# JSON/json_writer.cpp +# External/JSON/json_writer.cpp
+#) +#)
set(ISL_CODEGEN_FILES set(ISL_CODEGEN_FILES