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)

3 files changed, 36 insertions, 5 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 505268d116fb..372f62ba3467 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -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 <gienah@gentoo.org>
+  +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)
 
diff --git a/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch b/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch
new file mode 100644
index 000000000000..e74d123b6418
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch
@@ -0,0 +1,19 @@
+diff -r 7f19e7f2afa2 lib/stddef.in.h
+--- a/libgnu/stddef.in.h	Sat Feb 21 06:19:32 2015 -0800
++++ b/libgnu/stddef.in.h	Fri May 01 06:01:06 2015 +0200
+@@ -82,6 +82,7 @@
+ #endif
+ 
+ /* Some platforms lack max_align_t.  */
++#ifndef _GCC_MAX_ALIGN_T
+ #if !@HAVE_MAX_ALIGN_T@
+ typedef union
+ {
+@@ -91,6 +92,7 @@
+   long int __i;
+ } max_align_t;
+ #endif
++#endif
+ 
+ #  endif /* _@GUARD_PREFIX@_STDDEF_H */
+ # endif /* _@GUARD_PREFIX@_STDDEF_H */
diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index b8b77603bff7..565f8416f1e9 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.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 @@ RDEPEND="
 			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 @@ src_prepare() {
 		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 @@ src_configure() {
 		--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)