[gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/files/, sci-mathematics/petsc/

[Jens-Malte Gottfried]

commit:     43c2b626dd412374d7cf5d9c0bffe4b438d1139d
Author:     Jens-Malte Gottfried <jmgottfried <AT> web <DOT> de>
AuthorDate: Thu Mar  1 17:07:58 2012 +0000
Commit:     Jens-Malte Gottfried <jmg <AT> godefridus <DOT> de>
CommitDate: Thu Mar  1 17:07:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=43c2b626

added new petsc 3.2-p6 ebuild

---
 sci-mathematics/petsc/ChangeLog                    |    7 +++++
 .../petsc/files/petsc-3.1_p8-configure-pic.patch   |   11 -------
 .../petsc/files/petsc-configure-pic.patch          |    4 +-
 sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild       |    2 +-
 ...{petsc-3.1_p8-r1.ebuild => petsc-3.2_p6.ebuild} |   29 +++++++++----------
 5 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/sci-mathematics/petsc/ChangeLog b/sci-mathematics/petsc/ChangeLog
index 7826fc6..3a12aab 100644
--- a/sci-mathematics/petsc/ChangeLog
+++ b/sci-mathematics/petsc/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*petsc-3.2_p6 (01 Mar 2012)
+
+  01 Mar 2012; Jens-Malte Gottfried <jmgottfried@×××.de>
+  petsc-3.1_p8-r1.ebuild, -files/petsc-3.1_p8-configure-pic.patch,
+  +petsc-3.2_p6.ebuild, files/petsc-configure-pic.patch:
+  added new petsc 3.2-p6 ebuild
+
   23 Jan 2012; Sébastien Fabbro <bicatali@g.o> -petsc-3.1_p4.ebuild,
   -petsc-3.1_p5-r2.ebuild, -petsc-3.1_p7.ebuild, -petsc-3.1_p8.ebuild,
   petsc-3.1_p8-r1.ebuild:

diff --git a/sci-mathematics/petsc/files/petsc-3.1_p8-configure-pic.patch b/sci-mathematics/petsc/files/petsc-3.1_p8-configure-pic.patch
deleted file mode 100644
index bbfdae1..0000000
--- a/sci-mathematics/petsc/files/petsc-3.1_p8-configure-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/BuildSystem/config/setCompilers.py.old	2010-09-07 21:41:32.693103846 +0200
-+++ config/BuildSystem/config/setCompilers.py	2010-09-07 21:41:45.322093881 +0200
-@@ -875,7 +875,7 @@
-       languages.append('FC')
-     for language in languages:
-       self.pushLanguage(language)
--      for testFlag in ['-PIC', '-fPIC', '-KPIC','-qpic']:
-+      for testFlag in ['-fPIC', '-PIC', '-KPIC', '-qpic']:
-         try:
-           self.framework.logPrint('Trying '+language+' compiler flag '+testFlag)
-           if not self.checkLinkerFlag(testFlag):

diff --git a/sci-mathematics/petsc/files/petsc-configure-pic.patch b/sci-mathematics/petsc/files/petsc-configure-pic.patch
index 51e1132..bbfdae1 100644
--- a/sci-mathematics/petsc/files/petsc-configure-pic.patch
+++ b/sci-mathematics/petsc/files/petsc-configure-pic.patch
@@ -4,8 +4,8 @@
        languages.append('FC')
      for language in languages:
        self.pushLanguage(language)
--      for testFlag in ['-PIC', '-fPIC', '-KPIC']:
-+      for testFlag in ['-fPIC', '-PIC', '-KPIC']:
+-      for testFlag in ['-PIC', '-fPIC', '-KPIC','-qpic']:
++      for testFlag in ['-fPIC', '-PIC', '-KPIC', '-qpic']:
          try:
            self.framework.logPrint('Trying '+language+' compiler flag '+testFlag)
            if not self.checkLinkerFlag(testFlag):

diff --git a/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild b/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild
index ddd7a4c..5de7a82 100644
--- a/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild
@@ -37,7 +37,7 @@ if use hypre; then
 fi
 
 src_prepare(){
-	epatch "${FILESDIR}/${P}-configure-pic.patch"
+	epatch "${FILESDIR}/${PN}-configure-pic.patch"
 	epatch "${FILESDIR}/${PN}-disable-rpath.patch"
 }
 

diff --git a/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild b/sci-mathematics/petsc/petsc-3.2_p6.ebuild
similarity index 88%
copy from sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild
copy to sci-mathematics/petsc/petsc-3.2_p6.ebuild
index ddd7a4c..178b6bc 100644
--- a/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.2_p6.ebuild
@@ -27,7 +27,9 @@ RDEPEND="mpi? ( virtual/mpi[cxx?,fortran?] )
 "
 
 DEPEND="${RDEPEND}
-	sys-devel/gcc[-nocxx,fortran?]"
+	sys-devel/gcc[-nocxx,fortran?]
+	dev-util/cmake
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,7 +39,7 @@ if use hypre; then
 fi
 
 src_prepare(){
-	epatch "${FILESDIR}/${P}-configure-pic.patch"
+	epatch "${FILESDIR}/${PN}-configure-pic.patch"
 	epatch "${FILESDIR}/${PN}-disable-rpath.patch"
 }
 
@@ -64,14 +66,15 @@ src_configure(){
 	myconf[19]="--with-petsc-arch=${PETSC_ARCH}"
 	myconf[20]="--with-precision=double"
 	myconf[21]="--with-gnu-compilers=1"
+	myconf[22]="--with-cmake=/usr/bin/cmake"
 	use amd64 \
-		&& myconf[22]="--with-64-bit-pointers=1" \
-		|| myconf[22]="--with-64-bit-pointers=0"
+		&& myconf[23]="--with-64-bit-pointers=1" \
+		|| myconf[23]="--with-64-bit-pointers=0"
 	use cxx \
-		&& myconf[23]="--with-c-support=1"
+		&& myconf[24]="--with-c-support=1"
 	use amd64 \
-		&& myconf[24]="--with-64-bit-indices=1" \
-		|| myconf[24]="--with-64-bit-indices=0"
+		&& myconf[25]="--with-64-bit-indices=1" \
+		|| myconf[25]="--with-64-bit-indices=0"
 
 	if use mpi; then
 		myconf[30]="--with-cc=/usr/bin/mpicc"
@@ -90,8 +93,8 @@ src_configure(){
 		&& myconf[40]="--with-X=1" \
 		|| myconf[40]="--with-X=0"
 	use static-libs \
-		&& myconf[41]="--with-shared=0" \
-		|| myconf[41]="--with-shared=1"
+		&& myconf[41]="--with-shared-libraries=0" \
+		|| myconf[41]="--with-shared-libraries=1"
 	use fortran \
 		&& myconf[43]="--with-fortran=1" \
 		|| myconf[43]="--with-fortran=0"
@@ -106,7 +109,7 @@ src_configure(){
 
 	if use hypre; then
 		# hypre cannot handle 64 bit indices, therefore disabled
-		myconf[24]="--with-64-bit-indices=0"
+		myconf[25]="--with-64-bit-indices=0"
 		myconf[52]="--with-hypre=1"
 		myconf[53]="--with-hypre-include=/usr/include/hypre"
 		use static-libs \
@@ -118,7 +121,7 @@ src_configure(){
 
 	if use metis; then
 		# parmetis cannot handle 64 bit indices, therefore disabled
-		myconf[24]="--with-64-bit-indices=0"
+		myconf[25]="--with-64-bit-indices=0"
 		myconf[61]="--with-parmetis=1"
 		myconf[62]="--with-parmetis-include=/usr/include/parmetis"
 		myconf[63]="--with-parmetis-lib=/usr/$(get_libdir)/libparmetis.so"
@@ -194,8 +197,4 @@ pkg_postinst() {
 	elog "The petsc ebuild is still under development."
 	elog "Help us improve the ebuild in:"
 	elog "http://bugs.gentoo.org/show_bug.cgi?id=53386"
-	elog "This ebuild is known to have parallel build issues, "
-	elog "hopefully resolved by upstream soon."
-	elog "Another problem is that you can break this package by"
-	elog "switching your mpi implementation without rebuild petsc."
 }