Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2014-02-02 18:10:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2014-01-03 19:47:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-02-02 18:10:03.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Feb 1 08:34:46 UTC 2014 - dmitr...@opensuse.org + +- Fix build with LLVM-3.4 + * octave-3.8.0-llvm-3.4.patch + +------------------------------------------------------------------- New: ---- octave-3.8.0-llvm-3.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.eaTZR3/_old 2014-02-02 18:10:04.000000000 +0100 +++ /var/tmp/diff_new_pack.eaTZR3/_new 2014-02-02 18:10:04.000000000 +0100 @@ -37,6 +37,8 @@ Source2: octave.pc.in # PATCH-FIX-UPSTREAM octave-3.8.0-gzip-compressed-info.patch bnc#857130 Patch1: octave-3.8.0-gzip-compressed-info.patch +# PATCH-FIX-UPSTREAM octave-3.8.0-llvm-3.4.patch https://savannah.gnu.org/bugs/?41061 +Patch2: octave-3.8.0-llvm-3.4.patch BuildRequires: arpack-ng-devel BuildRequires: bison BuildRequires: blas-devel @@ -151,6 +153,9 @@ %prep %setup -q %patch1 -p1 +%if 0%{?suse_version} > 1310 +%patch2 -p1 +%endif %build export CPPFLAGS="-DH5_USE_16_API" ++++++ octave-3.8.0-llvm-3.4.patch ++++++ 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; }; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
