jsbronder    14/10/16 14:59:06

  Modified:             openmpi-1.8.ebuild openmpi-1.8.3.ebuild ChangeLog
                        openmpi-1.8.1.ebuild
  Log:
  Properly disable fortran when requested, #525492.  Thanks to Boris Bigott for 
providing a solution.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
4D7043C9)

Revision  Changes    Path
1.3                  sys-cluster/openmpi/openmpi-1.8.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.ebuild?r1=1.2&r2=1.3

Index: openmpi-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openmpi-1.8.ebuild  17 Apr 2014 14:59:46 -0000      1.2
+++ openmpi-1.8.ebuild  16 Oct 2014 14:59:06 -0000      1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.ebuild,v 
1.2 2014/04/17 14:59:46 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.ebuild,v 
1.3 2014/10/16 14:59:06 jsbronder Exp $
 
 EAPI=5
 
@@ -113,14 +113,9 @@
        fi
 
        if use fortran; then
-               if [[ $(tc-getFC) =~ g77 ]]; then
-                       myconf+=(--disable-mpi-f90)
-               elif [[ $(tc-getFC) =~ if ]]; then
-                       # Enabled here as gfortran compile times are huge with 
this enabled.
-                       myconf+=(--with-mpi-f90-size=medium)
-               fi
+               myconf+=(--enable-mpi-fortran=all)
        else
-               myconf+=(--disable-mpi-f90 --disable-mpi-f77)
+               myconf+=(--enable-mpi-fortran=no)
        fi
 
        ! use vt && myconf+=(--enable-contrib-no-build=vt)



1.2                  sys-cluster/openmpi/openmpi-1.8.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.3.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.3.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.3.ebuild?r1=1.1&r2=1.2

Index: openmpi-1.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openmpi-1.8.3.ebuild        15 Oct 2014 05:16:42 -0000      1.1
+++ openmpi-1.8.3.ebuild        16 Oct 2014 14:59:06 -0000      1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.3.ebuild,v 
1.1 2014/10/15 05:16:42 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.3.ebuild,v 
1.2 2014/10/16 14:59:06 jsbronder Exp $
 
 EAPI=5
 
@@ -114,14 +114,9 @@
        fi
 
        if use fortran; then
-               if [[ $(tc-getFC) =~ g77 ]]; then
-                       myconf+=(--disable-mpi-f90)
-               elif [[ $(tc-getFC) =~ if ]]; then
-                       # Enabled here as gfortran compile times are huge with 
this enabled.
-                       myconf+=(--with-mpi-f90-size=medium)
-               fi
+               myconf+=(--enable-mpi-fortran=all)
        else
-               myconf+=(--disable-mpi-f90 --disable-mpi-f77)
+               myconf+=(--enable-mpi-fortran=no)
        fi
 
        ! use vt && myconf+=(--enable-contrib-no-build=vt)



1.127                sys-cluster/openmpi/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/ChangeLog?rev=1.127&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/ChangeLog?rev=1.127&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/ChangeLog?r1=1.126&r2=1.127

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- ChangeLog   15 Oct 2014 05:16:42 -0000      1.126
+++ ChangeLog   16 Oct 2014 14:59:06 -0000      1.127
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.126 
2014/10/15 05:16:42 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.127 
2014/10/16 14:59:06 jsbronder Exp $
+
+  16 Oct 2014; Justin Bronder <[email protected]> openmpi-1.8.ebuild,
+  openmpi-1.8.1.ebuild, openmpi-1.8.3.ebuild:
+  Properly disable fortran when requested, #525492. Thanks to Boris Bigott for
+  providing a solution.
 
 *openmpi-1.8.3 (15 Oct 2014)
 



1.2                  sys-cluster/openmpi/openmpi-1.8.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.1.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.1.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.1.ebuild?r1=1.1&r2=1.2

Index: openmpi-1.8.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openmpi-1.8.1.ebuild        3 Jun 2014 01:33:26 -0000       1.1
+++ openmpi-1.8.1.ebuild        16 Oct 2014 14:59:06 -0000      1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.1.ebuild,v 
1.1 2014/06/03 01:33:26 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.1.ebuild,v 
1.2 2014/10/16 14:59:06 jsbronder Exp $
 
 EAPI=5
 
@@ -114,14 +114,9 @@
        fi
 
        if use fortran; then
-               if [[ $(tc-getFC) =~ g77 ]]; then
-                       myconf+=(--disable-mpi-f90)
-               elif [[ $(tc-getFC) =~ if ]]; then
-                       # Enabled here as gfortran compile times are huge with 
this enabled.
-                       myconf+=(--with-mpi-f90-size=medium)
-               fi
+               myconf+=(--enable-mpi-fortran=all)
        else
-               myconf+=(--disable-mpi-f90 --disable-mpi-f77)
+               myconf+=(--enable-mpi-fortran=no)
        fi
 
        ! use vt && myconf+=(--enable-contrib-no-build=vt)




Reply via email to