1 patch for repository http://divine.fi.muni.cz/darcs/mainline: patch eb9d439af080d1c9a8d8781add4a0c4da1aee728 Author: Vladimir Still Date: Sat Oct 3 20:57:28 CEST 2015 * Gut compile to work with LLVM 3.5. New patches: [Gut compile to work with LLVM 3.5. Vladimir Still **20151003185728 Ignore-this: e0cae885406c838ad81790f1a65ee821 ] hunk ./CMakeLists.txt 335 -if( GEN_LLVM ) hunk ./CMakeLists.txt 337 - elseif ( ${LLVM_STRING_VERSION} MATCHES "3[.][34]([^0-9]*|[.].*)" ) - link_directories( ${LLVM_LIBRARY_DIRS} ) - # this is not very nice but it works and ncurses & zlib break builds under NixOS - list( REMOVE_ITEM LLVM_SYSLIBS "z" "ncurses" ) - # suppress warnings coming from LLVM headers - add_definitions( -isystem ${LLVM_INCLUDE_DIRS} ) - else() - disable( GEN_LLVM "" "Found version ${LLVM_STRING_VERSION} but 3.3 or 3.4 is required." ) hunk ./CMakeLists.txt 346 -endif() hunk ./CMakeLists.txt 518 -if( GEN_LLVM ) hunk ./CMakeLists.txt 522 -endif() hunk ./bricks/brick-llvm.h 11 -#include +#include hunk ./bricks/brick-llvm.h 18 -#include +#include hunk ./bricks/brick-llvm.h 22 +#include hunk ./bricks/brick-llvm.h 406 - ::llvm::raw_fd_ostream fs( out.c_str(), serr ); + ::llvm::raw_fd_ostream fs( out.c_str(), serr, ::llvm::sys::fs::F_None ); hunk ./divine/CMakeLists.txt 34 -if( GEN_LLVM ) - file( GLOB SRC_LLVM llvm/*.cpp ) - file( GLOB H_LLVM llvm/*.h ) hunk ./divine/CMakeLists.txt 36 - template_separe( LLVM llvm/interpreter.cpp ) -else() # enable silk even when LLVM is disabled - file( GLOB SRC_LLVM llvm/silk-*.cpp ) - file( GLOB H_LLVM llvm/silk-*.h ) -endif() hunk ./divine/CMakeLists.txt 111 -if( GEN_LLVM ) hunk ./divine/CMakeLists.txt 118 -endif() hunk ./divine/compile/llvm.h 3 -#if GEN_LLVM || GEN_LLVM_CSDR || GEN_LLVM_PROB || GEN_LLVM_PTST +#if 1 hunk ./tools/compile.h 239 -#if GEN_LLVM || GEN_LLVM_CSDR || GEN_LLVM_PROB || GEN_LLVM_PTST +#if 1 Context: [TAG 2015 Q1 Petr Rockai **20150411105733 Ignore-this: 8c0a41a640c86fc754c7cd4bc344f547 ] Patch bundle hash: 87dcc128a3bfddd8ef41343c1fa775a5467f3fae