diff options
| author |   Mark Wright <gienah@gentoo.org> | 2015-07-10 01:12:45 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2015-07-10 01:12:45 +0000 |
| commit | c8ed9568f7be889abe2e3351906a2268b6621151 (patch) | |
| tree | a14370acb0378f8dddc2f588c2ad6a0811406164 /sci-mathematics | |
| parent | Revbump for libgudev, bug 552036. (diff) | |
| download | gentoo-2-c8ed9568f7be889abe2e3351906a2268b6621151.tar.gz gentoo-2-c8ed9568f7be889abe2e3351906a2268b6621151.tar.bz2 gentoo-2-c8ed9568f7be889abe2e3351906a2268b6621151.zip | |
Thanks to PL Hayes for pointing out in bug 554290 that it needs a fix for to work for USE=jit, llvm >= 3.5 installed, autoconf-archive not installed.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/octave/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-mathematics/octave/octave-4.0.0.ebuild | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog index 372f62ba3467..0aafd12c43aa 100644 --- a/sci-mathematics/octave/ChangeLog +++ b/sci-mathematics/octave/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/octave # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.177 2015/07/09 14:24:51 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.178 2015/07/10 01:12:45 gienah Exp $ + + 10 Jul 2015; Mark Wright <gienah@gentoo.org> octave-4.0.0.ebuild: + Thanks to PL Hayes for pointing out in bug 554290 that it needs a fix for to + work for USE=jit, llvm >= 3.5 installed, autoconf-archive not installed. 09 Jul 2015; Mark Wright <gienah@gentoo.org> +files/octave-4.0.0-llvm-3.5-gnulib-hg.patch, octave-4.0.0.ebuild: diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild index 565f8416f1e9..ace67f0655ac 100644 --- a/sci-mathematics/octave/octave-4.0.0.ebuild +++ b/sci-mathematics/octave/octave-4.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild,v 1.2 2015/07/09 14:24:51 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild,v 1.3 2015/07/10 01:12:45 gienah Exp $ EAPI=5 @@ -35,7 +35,9 @@ RDEPEND=" media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) - jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) + jit? ( + >=sys-devel/autoconf-archive-2015.02.04 + >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= @@ -88,7 +90,8 @@ src_prepare() { fi # Octave fails to build with LLVM 3.5 http://savannah.gnu.org/bugs/?41061 - has_version ">=sys-devel/llvm-3.5" && \ + use jit && \ + has_version ">=sys-devel/llvm-3.5" && \ epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch && \ epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch |