[gentoo-commits] gentoo-x86 commit in sci-mathematics/octave: ChangeLog octave-2.1.73-r1.ebuild octave-2.1.73.ebuild octave-2.1.73-r2.ebuild

[Steve Arnold (nerdboy)]

nerdboy     07/12/25 01:46:56

  Modified:             ChangeLog octave-2.1.73-r1.ebuild
                        octave-2.1.73.ebuild octave-2.1.73-r2.ebuild
  Log:
  updated to check for mpich2 cxx interface (which breaks standard headers)
  (Portage version: 2.1.4_rc7)

Revision  Changes    Path
1.51                 sci-mathematics/octave/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/ChangeLog?r1=1.50&r2=1.51

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog	18 Dec 2007 10:29:01 -0000	1.50
+++ ChangeLog	25 Dec 2007 01:46:56 -0000	1.51
@@ -1,6 +1,16 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.50 2007/12/18 10:29:01 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.51 2007/12/25 01:46:56 nerdboy Exp $
+
+  25 Dec 2007; Steve Arnold <nerdboy@g.o> octave-2.1.73.ebuild,
+  octave-2.1.73-r1.ebuild, octave-2.1.73-r2.ebuild:
+  Updated to check for mpich2 cxx interface (which breaks standard headers)
+  to address bug #182904).  Unfortunately, the mpich2 headers aren't
+  compatible with the standard ones (see bug #202304) so each package is
+  responsible for the workaround and breakage checking; see the above bug
+  for upstream octave response.  Although it kicks the build, the best way
+  to handle it for now seems to be getting rid of the offending mpich2 C++
+  libraries and include nastiness.
 
   18 Dec 2007; Markus Dittrich <markusle@g.o>
   octave-2.1.73-r2.ebuild:



1.7                  sci-mathematics/octave/octave-2.1.73-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild?r1=1.6&r2=1.7

Index: octave-2.1.73-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- octave-2.1.73-r1.ebuild	20 Nov 2007 14:46:56 -0000	1.6
+++ octave-2.1.73-r1.ebuild	25 Dec 2007 01:46:56 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.6 2007/11/20 14:46:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.7 2007/12/25 01:46:56 nerdboy Exp $
 
 inherit flag-o-matic fortran autotools
 
@@ -58,20 +58,29 @@
 	# mpicc/mpic++
 	# octave links agains -lmpi by default
 	# mpich needs -lmpich instead
-	if use mpi; then
-		CC="mpicc" && CXX="mpiCC"
-		if has_version 'sys-cluster/mpich'; then
-			myconf="${myconf} --with-mpi=mpich"
+	if use mpi ; then
+	    if built_with_use sys-cluster/mpich2 cxx ; then
+		elog "mpich2 must be built without C++ support!"
+		die "please rebuild mpich2 with USE=-cxx..."
+	    else
+		CC="mpicc"
+		if has_version 'sys-cluster/mpich' ; then
+		    CXX="mpiCC"
+		    myconf="${myconf} --with-mpi=mpich"
+		elif has_version 'sys-cluster/mpich2' ; then
+		    F77="mpif77"
+		    myconf="${myconf} --with-mpi=mpich"
 		else
-			myconf="${myconf} --with-mpi=mpi"
+		    myconf="${myconf} --with-mpi=mpi"
 		fi
+	    fi
 	else
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		myconf="${myconf} --without-mpi"
+	    CC="$(tc-getCC)"
+	    CXX="$(tc-getCXX)"
+	    myconf="${myconf} --without-mpi"
 	fi
 
-	CC="${CC}" CXX="${CXX}" \
+	CC="${CC}" CXX="${CXX}" F77="${F77}" \
 	econf \
 		$(use_with hdf5) \
 		$(use_enable readline) \



1.9                  sci-mathematics/octave/octave-2.1.73.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild?r1=1.8&r2=1.9

Index: octave-2.1.73.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- octave-2.1.73.ebuild	20 Nov 2007 14:46:56 -0000	1.8
+++ octave-2.1.73.ebuild	25 Dec 2007 01:46:56 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild,v 1.8 2007/11/20 14:46:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild,v 1.9 2007/12/25 01:46:56 nerdboy Exp $
 
 inherit flag-o-matic fortran
 
@@ -53,20 +53,29 @@
 	# mpicc/mpic++
 	# octave links agains -lmpi by default
 	# mpich needs -lmpich instead
-	if use mpi; then
-		CC="mpicc" && CXX="mpiCC"
-		if has_version 'sys-cluster/mpich'; then
-			myconf="${myconf} --with-mpi=mpich"
+	if use mpi ; then
+	    if built_with_use sys-cluster/mpich2 cxx ; then
+		elog "mpich2 must be built without C++ support!"
+		die "please rebuild mpich2 with USE=-cxx..."
+	    else
+		CC="mpicc"
+		if has_version 'sys-cluster/mpich' ; then
+		    CXX="mpiCC"
+		    myconf="${myconf} --with-mpi=mpich"
+		elif has_version 'sys-cluster/mpich2' ; then
+		    F77="mpif77"
+		    myconf="${myconf} --with-mpi=mpich"
 		else
-			myconf="${myconf} --with-mpi=mpi"
+		    myconf="${myconf} --with-mpi=mpi"
 		fi
+	    fi
 	else
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		myconf="${myconf} --without-mpi"
+	    CC="$(tc-getCC)"
+	    CXX="$(tc-getCXX)"
+	    myconf="${myconf} --without-mpi"
 	fi
 
-	CC="${CC}" CXX="${CXX}" \
+	CC="${CC}" CXX="${CXX}" F77="${F77}" \
 	econf \
 		$(use_with hdf5) \
 		$(use_enable readline) \



1.5                  sci-mathematics/octave/octave-2.1.73-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild?r1=1.4&r2=1.5

Index: octave-2.1.73-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- octave-2.1.73-r2.ebuild	18 Dec 2007 10:29:01 -0000	1.4
+++ octave-2.1.73-r2.ebuild	25 Dec 2007 01:46:56 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v 1.4 2007/12/18 10:29:01 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v 1.5 2007/12/25 01:46:56 nerdboy Exp $
 
 inherit flag-o-matic fortran autotools xemacs-elisp-common
 
@@ -62,23 +62,29 @@
 	# mpicc/mpic++
 	# octave links agains -lmpi by default
 	# mpich needs -lmpich instead
-	if use mpi; then
-		CC="mpicc" && CXX="mpiCC"
-		if has_version 'sys-cluster/mpich'; then
-			myconf="${myconf} --with-mpi=mpich"
+	if use mpi ; then
+	    if built_with_use sys-cluster/mpich2 cxx ; then
+		elog "mpich2 must be built without C++ support!"
+		die "please rebuild mpich2 with USE=-cxx..."
+	    else
+		CC="mpicc"
+		if has_version 'sys-cluster/mpich' ; then
+		    CXX="mpiCC"
+		    myconf="${myconf} --with-mpi=mpich"
+		elif has_version 'sys-cluster/mpich2' ; then
+		    F77="mpif77"
+		    myconf="${myconf} --with-mpi=mpich"
 		else
-			myconf="${myconf} --with-mpi=mpi"
+		    myconf="${myconf} --with-mpi=mpi"
 		fi
+	    fi
 	else
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		myconf="${myconf} --without-mpi"
+	    CC="$(tc-getCC)"
+	    CXX="$(tc-getCXX)"
+	    myconf="${myconf} --without-mpi"
 	fi
 
-	# force use of external blas and lapack
-	myconf="${myconf} --with-blas=blas --with-lapack=lapack"
-
-	CC="${CC}" CXX="${CXX}" \
+	CC="${CC}" CXX="${CXX}" F77="${F77}" \
 	econf \
 		$(use_with hdf5) \
 		$(use_enable readline) \



-- 
gentoo-commits@g.o mailing list