diff options
author | Michał Górny <mgorny@gentoo.org> | 2016-06-04 22:47:11 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2016-06-05 13:47:40 +0200 |
commit | a663d1f5cf154936b347888c2c91a0bd87ff3870 (patch) | |
tree | 4b25db914fd61dadddafcbd34d810248b57ece6f /sci-mathematics/octave/files | |
parent | sci-mathematics/octave: Nuke 3.8.1 (diff) | |
download | gentoo-a663d1f5cf154936b347888c2c91a0bd87ff3870.tar.gz gentoo-a663d1f5cf154936b347888c2c91a0bd87ff3870.tar.bz2 gentoo-a663d1f5cf154936b347888c2c91a0bd87ff3870.zip |
sci-mathematics/octave: Remove jit from 3* as it requires llvm < 3.5
Diffstat (limited to 'sci-mathematics/octave/files')
-rw-r--r-- | sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch | 63 | ||||
-rw-r--r-- | sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch | 12 |
2 files changed, 0 insertions, 75 deletions
diff --git a/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch b/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch deleted file mode 100644 index 63c5303d13c7..000000000000 --- a/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -aur octave-3.8.0/libinterp/corefcn/jit-util.h octave-3.8.0.fix/libinterp/corefcn/jit-util.h ---- octave-3.8.0/libinterp/corefcn/jit-util.h 2013-12-27 15:57:41.000000000 -0600 -+++ octave-3.8.0.fix/libinterp/corefcn/jit-util.h 2014-01-16 17:06:47.512782643 -0600 -@@ -42,8 +42,10 @@ - { - class Value; - class Module; -- class FunctionPassManager; -- class PassManager; -+ namespace legacy { -+ class FunctionPassManager; -+ class PassManager; -+ } - class ExecutionEngine; - class Function; - class BasicBlock; -diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.cc octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc ---- octave-3.8.0/libinterp/corefcn/pt-jit.cc 2013-12-27 15:58:17.000000000 -0600 -+++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc 2014-01-16 17:08:28.030924785 -0600 -@@ -52,7 +52,7 @@ - #include <llvm/Bitcode/ReaderWriter.h> - #include <llvm/ExecutionEngine/ExecutionEngine.h> - #include <llvm/ExecutionEngine/JIT.h> --#include <llvm/PassManager.h> -+#include <llvm/IR/LegacyPassManager.h> - - #ifdef HAVE_LLVM_IR_FUNCTION_H - #include <llvm/IR/LLVMContext.h> -@@ -1888,10 +1888,10 @@ - if (! engine) - return false; - -- module_pass_manager = new llvm::PassManager (); -+ module_pass_manager = new llvm::legacy::PassManager (); - module_pass_manager->add (llvm::createAlwaysInlinerPass ()); - -- pass_manager = new llvm::FunctionPassManager (module); -+ pass_manager = new llvm::legacy::FunctionPassManager (module); - #ifdef HAVE_LLVM_DATALAYOUT - pass_manager->add (new llvm::DataLayout (*engine->getDataLayout ())); - #else -@@ -2007,7 +2007,7 @@ - { - std::string error; - llvm::raw_fd_ostream fout ("test.bc", error, -- llvm::raw_fd_ostream::F_Binary); -+ llvm::sys::fs::F_Binary); - llvm::WriteBitcodeToFile (module, fout); - } - } -diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.h octave-3.8.0.fix/libinterp/corefcn/pt-jit.h ---- octave-3.8.0/libinterp/corefcn/pt-jit.h 2013-12-27 15:58:17.000000000 -0600 -+++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.h 2014-01-16 17:05:08.224619116 -0600 -@@ -384,8 +384,8 @@ - size_t trip_count (const octave_value& bounds) const; - - llvm::Module *module; -- llvm::PassManager *module_pass_manager; -- llvm::FunctionPassManager *pass_manager; -+ llvm::legacy::PassManager *module_pass_manager; -+ llvm::legacy::FunctionPassManager *pass_manager; - llvm::ExecutionEngine *engine; - }; diff --git a/sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch b/sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch deleted file mode 100644 index 82c6c1458093..000000000000 --- a/sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- octave-3.8.0-orig/configure.ac 2013-12-28 08:58:28.000000000 +1100 -+++ octave-3.8.0/configure.ac 2014-02-15 20:51:21.431570121 +1100 -@@ -805,7 +805,8 @@ - dnl Use -isystem so we don't get warnings from llvm headers - LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`" - LLVM_CXXFLAGS= -- LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" -+ dnl If llvm-config --ldflags has -L ending with /llvm then specify this directory with -R -+ LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags | sed -e 's/-L\(@<:@^ \t@:>@*\/llvm\)/-L\1 -R\1/' -e 's/-@<:@^LR@:>@.*@<:@ \t@:>@//g'`" - - - LDFLAGS="$LDFLAGS $LLVM_LDFLAGS" |