commit: a663d1f5cf154936b347888c2c91a0bd87ff3870
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 20:47:11 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 11:47:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a663d1f5
sci-mathematics/octave: Remove jit from 3* as it requires llvm < 3.5
.../octave/files/octave-3.8.0-llvm-3.4.patch | 63 ----------------------
.../octave/files/octave-3.8.0-llvm-configure.patch | 12 -----
sci-mathematics/octave/octave-3.8.2.ebuild | 12 ++---
3 files changed, 4 insertions(+), 83 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 63c5303..0000000
--- 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 82c6c14..0000000
--- 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"
diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild
b/sci-mathematics/octave/octave-3.8.2.ebuild
index b649ce0..7d12d6f 100644
--- a/sci-mathematics/octave/octave-3.8.2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/";
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java opengl
postscript +qhull +qrupdate readline +sparse static-libs X zlib"
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -34,7 +34,6 @@ RDEPEND="
media-gfx/graphicsmagick[cxx]
media-gfx/imagemagick[cxx] ) )
java? ( >=virtual/jre-1.6.0:* )
- jit? ( <sys-devel/llvm-3.5:0= )
opengl? (
media-libs/freetype:2=
media-libs/fontconfig:1.0=
@@ -75,7 +74,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.3-texi.patch
"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
- "${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
"${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
)
@@ -87,9 +85,6 @@ src_prepare() {
use gui && append-ldflags
-Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
fi
- has_version ">=sys-devel/llvm-3.4" && \
- epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
-
# Fix bug 501756
sed -i \
-e 's@A-Za-z0-9@[:alnum:]@g' \
@@ -113,7 +108,8 @@ src_configure() {
$(use_enable doc docs)
$(use_enable java)
$(use_enable gui)
- $(use_enable jit)
+ # requires llvm < 3.5
+ --disable-jit
$(use_enable readline)
$(use_with curl)
$(use_with fftw fftw3)
@@ -147,7 +143,7 @@ src_configure() {
src_compile() {
emake
- if use java || use jit ; then
+ if use java ; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
}
