gienah 15/07/09 14:24:51 Modified: octave-4.0.0.ebuild ChangeLog Log: Fix Bug 554290 - sci-mathematics/octave-4.0.0 fails to build - syntax error near unexpected token -std=c++11, AX_CHECK_COMPILE_FLAG(-std=c++11,' - thanks to Nikolaos Chatzidakis for reporting, PL Hayes, Francisco Vazquez for helping. Correct --without-64 to --disable-64. Apply octave-4.0.0-llvm-3.5-gnulib-hg.patch from http://savannah.gnu.org/bugs/?41061 to fix compile error with some configurations (gcc 4.8.3 in a mostly stable chroot with llvm 3.5.0, USE=jit) (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Revision Changes Path 1.2 sci-mathematics/octave/octave-4.0.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild?r1=1.1&r2=1.2 Index: octave-4.0.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- octave-4.0.0.ebuild 7 Jul 2015 13:25:35 -0000 1.1 +++ octave-4.0.0.ebuild 9 Jul 2015 14:24:51 -0000 1.2 @@ -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.1 2015/07/07 13:25:35 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild,v 1.2 2015/07/09 14:24:51 gienah Exp $ EAPI=5 @@ -35,7 +35,7 @@ media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) - jit? ( >=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= @@ -87,8 +87,10 @@ use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4" fi + # Octave fails to build with LLVM 3.5 http://savannah.gnu.org/bugs/?41061 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.patch && \ + epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch # Fix bug 501756 sed -i \ @@ -110,7 +112,7 @@ --localstatedir="${EPREFIX}/var/state/octave" --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --without-64 + --disable-64 $(use_enable doc docs) $(use_enable java) $(use_enable gui) 1.177 sci-mathematics/octave/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.177&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.177&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/octave/ChangeLog?r1=1.176&r2=1.177 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- ChangeLog 7 Jul 2015 13:25:35 -0000 1.176 +++ ChangeLog 9 Jul 2015 14:24:51 -0000 1.177 @@ -1,6 +1,16 @@ # 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.176 2015/07/07 13:25:35 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.177 2015/07/09 14:24:51 gienah Exp $ + + 09 Jul 2015; Mark Wright <[email protected]> + +files/octave-4.0.0-llvm-3.5-gnulib-hg.patch, octave-4.0.0.ebuild: + Fix Bug 554290 - sci-mathematics/octave-4.0.0 fails to build - syntax error + near unexpected token -std=c++11, AX_CHECK_COMPILE_FLAG(-std=c++11,' - thanks + to Nikolaos Chatzidakis for reporting, PL Hayes, Francisco Vazquez for + helping. Correct --without-64 to --disable-64. Apply octave-4.0.0-llvm-3.5 + -gnulib-hg.patch from http://savannah.gnu.org/bugs/?41061 to fix compile error + with some configurations (gcc 4.8.3 in a mostly stable chroot with llvm 3.5.0, + USE=jit) *octave-4.0.0 (07 Jul 2015)
