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

Fix the usage of jsoncpp in polly. Thanks to James Clarke for the patch

Browse Source 
(Closes: #835607)
This commit is contained in:
Sylvestre Ledru 2016-08-27 15:47:47 +00:00
parent 200f9c8b24
commit 2fc7beada0
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ llvm-toolchain-snapshot (1:4.0~svn279916-1) unstable; urgency=medium
* Snapshot is now 4.0 * Snapshot is now 4.0
* Introduce clang-include-fixer-4.0 * Introduce clang-include-fixer-4.0
* Fix the usage of jsoncpp in polly. Thanks to James Clarke for the patch
(Closes: #835607)
* Fix the renaming of the manpages (Closes: #834077) * Fix the renaming of the manpages (Closes: #834077)
* Use the manpage from clang.rst instead of help2man * Use the manpage from clang.rst instead of help2man
* Disable the build of lldb on mips64el, ppc64 and s390x for real * Disable the build of lldb on mips64el, ppc64 and s390x for real

1
debian/clang-X.Y.manpages.in vendored
View File

@ -7,4 +7,3 @@ debian/man/clang-apply-replacements-@LLVM_VERSION@.1
debian/man/sancov-@LLVM_VERSION@.1 debian/man/sancov-@LLVM_VERSION@.1
debian/man/scan-view-@LLVM_VERSION@.1 debian/man/scan-view-@LLVM_VERSION@.1
debian/man/modularize-@LLVM_VERSION@.1 debian/man/modularize-@LLVM_VERSION@.1

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

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.9~svn260089/polly/lib/CMakeLists.txt Index: b/polly/lib/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.9~svn260089.orig/polly/lib/CMakeLists.txt --- a/polly/lib/CMakeLists.txt
+++ llvm-toolchain-snapshot_3.9~svn260089/polly/lib/CMakeLists.txt +++ b/polly/lib/CMakeLists.txt
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
set(LLVM_NO_RTTI 1) set(LLVM_NO_RTTI 1)
@ -18,7 +18,7 @@ Index: llvm-toolchain-snapshot_3.9~svn260089/polly/lib/CMakeLists.txt
set(ISL_CODEGEN_FILES set(ISL_CODEGEN_FILES
CodeGen/IslAst.cpp CodeGen/IslAst.cpp
@@ -46,7 +46,7 @@ add_polly_library(Polly @@ -46,7 +46,7 @@
Support/RegisterPasses.cpp Support/RegisterPasses.cpp
Support/ScopHelper.cpp Support/ScopHelper.cpp
Support/ScopLocation.cpp Support/ScopLocation.cpp
@ -27,7 +27,7 @@ Index: llvm-toolchain-snapshot_3.9~svn260089/polly/lib/CMakeLists.txt
Transform/Canonicalization.cpp Transform/Canonicalization.cpp
Transform/CodePreparation.cpp Transform/CodePreparation.cpp
Transform/DeadCodeElimination.cpp Transform/DeadCodeElimination.cpp
@@ -54,7 +54,7 @@ add_polly_library(Polly @@ -54,7 +54,7 @@
${POLLY_HEADER_FILES} ${POLLY_HEADER_FILES}
) )
@ -36,3 +36,22 @@ Index: llvm-toolchain-snapshot_3.9~svn260089/polly/lib/CMakeLists.txt
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
target_link_libraries(Polly target_link_libraries(Polly
Index: b/polly/CMakeLists.txt
===================================================================
--- a/polly/CMakeLists.txt
+++ b/polly/CMakeLists.txt
@@ -128,10 +128,13 @@
INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} )
endif(CUDALIB_FOUND)
+find_path(JSONCPP_INCLUDE_PATH json/json.h PATH_SUFFIXES jsoncpp)
+
include_directories(
BEFORE
${CMAKE_CURRENT_SOURCE_DIR}/include
- ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
+# ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
+ ${JSONCPP_INCLUDE_PATH}
${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
${CMAKE_CURRENT_BINARY_DIR}/include