Reduced number of jobs for the tests and updated the mpi m4 macro, should fix bug #279150

(Portage version: 2.2_rc61/cvs/Linux x86_64)

2 files changed, 154 insertions, 152 deletions

diff --git a/sci-libs/parmetis/ChangeLog b/sci-libs/parmetis/ChangeLog
index 2db689921d07..54ca573cac07 100644
--- a/sci-libs/parmetis/ChangeLog
+++ b/sci-libs/parmetis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/parmetis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmetis/ChangeLog,v 1.4 2009/09/13 16:57:06 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmetis/ChangeLog,v 1.5 2010/01/20 20:04:45 bicatali Exp $
+
+  20 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  files/parmetis-3.1.1-autotools.patch:
+  Reduced number of jobs for the tests and updated the mpi m4 macro, should
+  fix bug #279150
 
   13 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> -parmetis-3.1.ebuild,
   -files/parmetis-3.1-autotools.patch:
diff --git a/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch b/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch
index 7fd09ab6b4b5..0c4ef28b5bc4 100644
--- a/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch
+++ b/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch
@@ -1,14 +1,138 @@
-diff -Nur ParMetis-3.1.1.orig/acx_mpi.m4 ParMetis-3.1.1/acx_mpi.m4
---- ParMetis-3.1.1.orig/acx_mpi.m4	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/acx_mpi.m4	2008-05-16 17:43:21.000000000 +0100
-@@ -0,0 +1,181 @@
+diff -Nur ParMetis-3.1.1.orig/configure.ac ParMetis-3.1.1/configure.ac
+--- ParMetis-3.1.1.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ ParMetis-3.1.1/configure.ac	2009-03-14 11:37:58.804041439 +0000
+@@ -0,0 +1,18 @@
++# -*- Autoconf -*-
++AC_PREREQ(2.59)
++AC_INIT(parmetis, 3.1.1, karypis@cs.umn.edu)
++AM_INIT_AUTOMAKE([foreign])
++AC_CONFIG_HEADER([config.h])
++AC_PROG_INSTALL
++AC_PROG_LIBTOOL
++AC_CHECK_LIB(m, sqrt)
++sinclude(ax_mpi.m4)
++AC_LANG_PUSH([C])
++AX_MPI([], AC_MSG_ERROR([could not compile an mpi test program]))
++AC_CONFIG_FILES([Makefile 
++		 metis.pc
++		 parmetis.pc
++		 ParMETISLib/Makefile
++		 METISLib/Makefile
++		 Programs/Makefile])
++AC_OUTPUT
+diff -Nur ParMetis-3.1.1.orig/Makefile.am ParMetis-3.1.1/Makefile.am
+--- ParMetis-3.1.1.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ ParMetis-3.1.1/Makefile.am	2009-03-14 11:37:15.700900498 +0000
+@@ -0,0 +1,5 @@
++SUBDIRS = METISLib ParMETISLib Programs
++EXTRA_DIST = CHANGES VERSION parmetis.pc.in metis.pc.in
++include_HEADERS = parmetis.h
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = metis.pc parmetis.pc
+diff -Nur ParMetis-3.1.1.orig/METISLib/Makefile.am ParMetis-3.1.1/METISLib/Makefile.am
+--- ParMetis-3.1.1.orig/METISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ ParMetis-3.1.1/METISLib/Makefile.am	2009-03-14 11:37:15.700900498 +0000
+@@ -0,0 +1,18 @@
++pkginclude_HEADERS = defs.h macros.h metis.h proto.h rename.h \
++	stdheaders.h struct.h
++pkgincludedir = $(includedir)/metis
++
++lib_LTLIBRARIES = libmetis.la
++libmetis_la_SOURCES = \
++	coarsen.c fm.c initpart.c match.c ccgraph.c \
++	pmetis.c pqueue.c refine.c util.c timing.c debug.c \
++	bucketsort.c graph.c stat.c kmetis.c kwayrefine.c \
++	kwayfm.c balance.c ometis.c srefine.c sfm.c separator.c \
++	mincover.c mmd.c mesh.c meshpart.c frename.c fortran.c \
++	myqsort.c compress.c parmetis.c estmem.c \
++	mpmetis.c mcoarsen.c mmatch.c minitpart.c mbalance.c \
++	mutil.c mkmetis.c mkwayrefine.c mkwayfmh.c \
++	mrefine2.c minitpart2.c mbalance2.c mfm2.c \
++	kvmetis.c kwayvolrefine.c kwayvolfm.c subdomains.c \
++	mfm.c memory.c mrefine.c checkgraph.c
++libmetis_la_LDFLAGS = -no-undefined -version-info 4:1:0 
+diff -Nur ParMetis-3.1.1.orig/metis.pc.in ParMetis-3.1.1/metis.pc.in
+--- ParMetis-3.1.1.orig/metis.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ ParMetis-3.1.1/metis.pc.in	2009-03-14 11:37:15.700900498 +0000
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: METIS
++Description: Software for unstructured graph partitioning
++Version: @VERSION@
++Libs: -L${libdir} -lmetis
++Cflags: -I${includedir}/metis
+diff -Nur ParMetis-3.1.1.orig/ParMETISLib/Makefile.am ParMetis-3.1.1/ParMETISLib/Makefile.am
+--- ParMetis-3.1.1.orig/ParMETISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ ParMetis-3.1.1/ParMETISLib/Makefile.am	2009-03-14 11:57:08.006017954 +0000
+@@ -0,0 +1,21 @@
++pkginclude_HEADERS = defs.h macros.h parmetislib.h proto.h \
++	rename.h stdheaders.h struct.h
++pkgincludedir = $(includedir)/parmetis
++
++lib_LTLIBRARIES = libparmetis.la
++libparmetis_la_SOURCES = \
++	comm.c util.c debug.c setup.c grsetup.c timer.c \
++	node_refine.c initmsection.c order.c \
++	xyzpart.c pspases.c frename.c \
++	iintsort.c iidxsort.c ikeysort.c ikeyvalsort.c \
++	kmetis.c gkmetis.c ometis.c \
++	initpart.c match.c \
++	kwayfm.c kwayrefine.c kwaybalance.c \
++	remap.c stat.c fpqueue.c \
++	ametis.c rmetis.c lmatch.c initbalance.c \
++	mdiffusion.c diffutil.c wave.c \
++	csrmatch.c redomylink.c balancemylink.c \
++	selectq.c akwayfm.c serial.c move.c \
++	mmetis.c mesh.c memory.c weird.c backcompat.c
++libparmetis_la_LDFLAGS = -no-undefined -version-info 3:1:1
++libparmetis_la_LIBADD = @MPILIBS@ $(top_builddir)/METISLib/libmetis.la
+diff -Nur ParMetis-3.1.1.orig/parmetis.pc.in ParMetis-3.1.1/parmetis.pc.in
+--- ParMetis-3.1.1.orig/parmetis.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ ParMetis-3.1.1/parmetis.pc.in	2009-03-14 11:37:15.700900498 +0000
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: ParMETIS
++Description: Software for parallel (mpi) unstructured graph partitioning
++Version: @VERSION@
++Requires: metis
++Libs: -L${libdir} -lparmetis
++Cflags: -I${includedir}
+diff -Nur ParMetis-3.1.1.orig/Programs/Makefile.am ParMetis-3.1.1/Programs/Makefile.am
+--- ParMetis-3.1.1.orig/Programs/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ ParMetis-3.1.1/Programs/Makefile.am	2009-03-14 11:37:15.700900498 +0000
+@@ -0,0 +1,13 @@
++AM_CPPFLAGS = -I$(top_srcdir)/ParMETISLib
++LDADD = $(top_builddir)/METISLib/libmetis.la \
++	$(top_builddir)/ParMETISLib/libparmetis.la
++
++check_PROGRAMS = ptest mtest
++ptest_SOURCES = ptest.c io.c adaptgraph.c
++mtest_SOURCES = mtest.c io.c
++
++MPIRUN = mpirun -np 2
++
++check-local: $(check_PROGRAMS)
++	$(MPIRUN) ptest ../Graphs/rotor.graph
++	$(MPIRUN) mtest ../Graphs/bricks.hex3d 2
+diff -Nur ParMetis-3.1.1.orig/ax_mpi.m4 ParMetis-3.1.1/ax_mpi.m4
+--- ParMetis-3.1.1.orig/ax_mpi.m4	1970-01-01 01:00:00.000000000 +0100
++++ ParMetis-3.1.1/ax_mpi.m4	2010-01-20 20:33:15.000000000 +0000
+@@ -0,0 +1,178 @@
 +# ===========================================================================
-+#                http://autoconf-archive.cryp.to/acx_mpi.html
++#             http://www.nongnu.org/autoconf-archive/ax_mpi.html
 +# ===========================================================================
 +#
 +# SYNOPSIS
 +#
-+#   ACX_MPI([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#   AX_MPI([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 +#
 +# DESCRIPTION
 +#
@@ -25,8 +149,8 @@ diff -Nur ParMetis-3.1.1.orig/acx_mpi.m4 ParMetis-3.1.1/acx_mpi.m4
 +#
 +#   If you want to compile everything with MPI, you should set:
 +#
-+#       CC="MPICC" #OR# CXX="MPICXX" #OR# F77="MPIF77" #OR# FC="MPIFC"
-+#       LIBS="$MPILIBS $LIBS"
++#     CC="MPICC" #OR# CXX="MPICXX" #OR# F77="MPIF77" #OR# FC="MPIFC"
++#     LIBS="$MPILIBS $LIBS"
 +#
 +#   NOTE: The above assumes that you will use $CC (or whatever) for linking
 +#   as well as for compiling. (This is the default for automake and most
@@ -40,11 +164,7 @@ diff -Nur ParMetis-3.1.1.orig/acx_mpi.m4 ParMetis-3.1.1/acx_mpi.m4
 +#   found. If ACTION-IF-FOUND is not specified, the default action will
 +#   define HAVE_MPI.
 +#
-+# LAST MODIFICATION
-+#
-+#   2008-04-12
-+#
-+# COPYLEFT
++# LICENSE
 +#
 +#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
 +#   Copyright (c) 2008 Julian C. Cummings <cummings@cacr.caltech.edu>
@@ -71,18 +191,19 @@ diff -Nur ParMetis-3.1.1.orig/acx_mpi.m4 ParMetis-3.1.1/acx_mpi.m4
 +#   all other use of the material that constitutes the Autoconf Macro.
 +#
 +#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Macro Archive. When you make and
-+#   distribute a modified version of the Autoconf Macro, you may extend this
-+#   special exception to the GPL to apply to your modified version as well.
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
 +
-+AC_DEFUN([ACX_MPI], [
++AU_ALIAS([ACX_MPI], [AX_MPI])
++AC_DEFUN([AX_MPI], [
 +AC_PREREQ(2.50) dnl for AC_LANG_CASE
 +
 +AC_LANG_CASE([C], [
 +	AC_REQUIRE([AC_PROG_CC])
 +	AC_ARG_VAR(MPICC,[MPI C compiler command])
 +	AC_CHECK_PROGS(MPICC, mpicc hcc mpxlc_r mpxlc mpcc cmpicc, $CC)
-+	acx_mpi_save_CC="$CC"
++	ax_mpi_save_CC="$CC"
 +	CC="$MPICC"
 +	AC_SUBST(MPICC)
 +],
@@ -90,7 +211,7 @@ diff -Nur ParMetis-3.1.1.orig/acx_mpi.m4 ParMetis-3.1.1/acx_mpi.m4
 +	AC_REQUIRE([AC_PROG_CXX])
 +	AC_ARG_VAR(MPICXX,[MPI C++ compiler command])
 +	AC_CHECK_PROGS(MPICXX, mpic++ mpicxx mpiCC hcp mpxlC_r mpxlC mpCC cmpic++, $CXX)
-+	acx_mpi_save_CXX="$CXX"
++	ax_mpi_save_CXX="$CXX"
 +	CXX="$MPICXX"
 +	AC_SUBST(MPICXX)
 +],
@@ -98,7 +219,7 @@ diff -Nur ParMetis-3.1.1.orig/acx_mpi.m4 ParMetis-3.1.1/acx_mpi.m4
 +	AC_REQUIRE([AC_PROG_F77])
 +	AC_ARG_VAR(MPIF77,[MPI Fortran 77 compiler command])
 +	AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf_r mpxlf mpf77 cmpifc, $F77)
-+	acx_mpi_save_F77="$F77"
++	ax_mpi_save_F77="$F77"
 +	F77="$MPIF77"
 +	AC_SUBST(MPIF77)
 +],
@@ -106,7 +227,7 @@ diff -Nur ParMetis-3.1.1.orig/acx_mpi.m4 ParMetis-3.1.1/acx_mpi.m4
 +	AC_REQUIRE([AC_PROG_FC])
 +	AC_ARG_VAR(MPIFC,[MPI Fortran compiler command])
 +	AC_CHECK_PROGS(MPIFC, mpif90 mpxlf95_r mpxlf90_r mpxlf95 mpxlf90 mpf90 cmpif90c, $FC)
-+	acx_mpi_save_FC="$FC"
++	ax_mpi_save_FC="$FC"
 +	FC="$MPIFC"
 +	AC_SUBST(MPIFC)
 +])
@@ -167,10 +288,10 @@ diff -Nur ParMetis-3.1.1.orig/acx_mpi.m4 ParMetis-3.1.1/acx_mpi.m4
 +		AC_MSG_RESULT(no)])
 +fi])
 +
-+AC_LANG_CASE([C], [CC="$acx_mpi_save_CC"],
-+	[C++], [CXX="$acx_mpi_save_CXX"],
-+	[Fortran 77], [F77="$acx_mpi_save_F77"],
-+	[Fortran], [FC="$acx_mpi_save_FC"])
++AC_LANG_CASE([C], [CC="$ax_mpi_save_CC"],
++	[C++], [CXX="$ax_mpi_save_CXX"],
++	[Fortran 77], [F77="$ax_mpi_save_F77"],
++	[Fortran], [FC="$ax_mpi_save_FC"])
 +
 +AC_SUBST(MPILIBS)
 +
@@ -182,128 +303,4 @@ diff -Nur ParMetis-3.1.1.orig/acx_mpi.m4 ParMetis-3.1.1/acx_mpi.m4
 +        ifelse([$1],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$1])
 +        :
 +fi
-+])dnl ACX_MPI
-diff -Nur ParMetis-3.1.1.orig/configure.ac ParMetis-3.1.1/configure.ac
---- ParMetis-3.1.1.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/configure.ac	2009-03-14 11:37:58.804041439 +0000
-@@ -0,0 +1,18 @@
-+# -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(parmetis, 3.1.1, karypis@cs.umn.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_CONFIG_HEADER([config.h])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+sinclude(acx_mpi.m4)
-+AC_LANG_PUSH([C])
-+ACX_MPI([], AC_MSG_ERROR([could not compile an mpi test program]))
-+AC_CONFIG_FILES([Makefile 
-+		 metis.pc
-+		 parmetis.pc
-+		 ParMETISLib/Makefile
-+		 METISLib/Makefile
-+		 Programs/Makefile])
-+AC_OUTPUT
-diff -Nur ParMetis-3.1.1.orig/Makefile.am ParMetis-3.1.1/Makefile.am
---- ParMetis-3.1.1.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/Makefile.am	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,5 @@
-+SUBDIRS = METISLib ParMETISLib Programs
-+EXTRA_DIST = CHANGES VERSION parmetis.pc.in metis.pc.in
-+include_HEADERS = parmetis.h
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = metis.pc parmetis.pc
-diff -Nur ParMetis-3.1.1.orig/METISLib/Makefile.am ParMetis-3.1.1/METISLib/Makefile.am
---- ParMetis-3.1.1.orig/METISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/METISLib/Makefile.am	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,18 @@
-+pkginclude_HEADERS = defs.h macros.h metis.h proto.h rename.h \
-+	stdheaders.h struct.h
-+pkgincludedir = $(includedir)/metis
-+
-+lib_LTLIBRARIES = libmetis.la
-+libmetis_la_SOURCES = \
-+	coarsen.c fm.c initpart.c match.c ccgraph.c \
-+	pmetis.c pqueue.c refine.c util.c timing.c debug.c \
-+	bucketsort.c graph.c stat.c kmetis.c kwayrefine.c \
-+	kwayfm.c balance.c ometis.c srefine.c sfm.c separator.c \
-+	mincover.c mmd.c mesh.c meshpart.c frename.c fortran.c \
-+	myqsort.c compress.c parmetis.c estmem.c \
-+	mpmetis.c mcoarsen.c mmatch.c minitpart.c mbalance.c \
-+	mutil.c mkmetis.c mkwayrefine.c mkwayfmh.c \
-+	mrefine2.c minitpart2.c mbalance2.c mfm2.c \
-+	kvmetis.c kwayvolrefine.c kwayvolfm.c subdomains.c \
-+	mfm.c memory.c mrefine.c checkgraph.c
-+libmetis_la_LDFLAGS = -no-undefined -version-info 4:1:0 
-diff -Nur ParMetis-3.1.1.orig/metis.pc.in ParMetis-3.1.1/metis.pc.in
---- ParMetis-3.1.1.orig/metis.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/metis.pc.in	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: METIS
-+Description: Software for unstructured graph partitioning
-+Version: @VERSION@
-+Libs: -L${libdir} -lmetis
-+Cflags: -I${includedir}/metis
-diff -Nur ParMetis-3.1.1.orig/ParMETISLib/Makefile.am ParMetis-3.1.1/ParMETISLib/Makefile.am
---- ParMetis-3.1.1.orig/ParMETISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/ParMETISLib/Makefile.am	2009-03-14 11:57:08.006017954 +0000
-@@ -0,0 +1,21 @@
-+pkginclude_HEADERS = defs.h macros.h parmetislib.h proto.h \
-+	rename.h stdheaders.h struct.h
-+pkgincludedir = $(includedir)/parmetis
-+
-+lib_LTLIBRARIES = libparmetis.la
-+libparmetis_la_SOURCES = \
-+	comm.c util.c debug.c setup.c grsetup.c timer.c \
-+	node_refine.c initmsection.c order.c \
-+	xyzpart.c pspases.c frename.c \
-+	iintsort.c iidxsort.c ikeysort.c ikeyvalsort.c \
-+	kmetis.c gkmetis.c ometis.c \
-+	initpart.c match.c \
-+	kwayfm.c kwayrefine.c kwaybalance.c \
-+	remap.c stat.c fpqueue.c \
-+	ametis.c rmetis.c lmatch.c initbalance.c \
-+	mdiffusion.c diffutil.c wave.c \
-+	csrmatch.c redomylink.c balancemylink.c \
-+	selectq.c akwayfm.c serial.c move.c \
-+	mmetis.c mesh.c memory.c weird.c backcompat.c
-+libparmetis_la_LDFLAGS = -no-undefined -version-info 3:1:1
-+libparmetis_la_LIBADD = @MPILIBS@ $(top_builddir)/METISLib/libmetis.la
-diff -Nur ParMetis-3.1.1.orig/parmetis.pc.in ParMetis-3.1.1/parmetis.pc.in
---- ParMetis-3.1.1.orig/parmetis.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/parmetis.pc.in	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: ParMETIS
-+Description: Software for parallel (mpi) unstructured graph partitioning
-+Version: @VERSION@
-+Requires: metis
-+Libs: -L${libdir} -lparmetis
-+Cflags: -I${includedir}
-diff -Nur ParMetis-3.1.1.orig/Programs/Makefile.am ParMetis-3.1.1/Programs/Makefile.am
---- ParMetis-3.1.1.orig/Programs/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/Programs/Makefile.am	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,13 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/ParMETISLib
-+LDADD = $(top_builddir)/METISLib/libmetis.la \
-+	$(top_builddir)/ParMETISLib/libparmetis.la
-+
-+check_PROGRAMS = ptest mtest
-+ptest_SOURCES = ptest.c io.c adaptgraph.c
-+mtest_SOURCES = mtest.c io.c
-+
-+MPIRUN = mpirun -np 4
-+
-+check-local: $(check_PROGRAMS)
-+	$(MPIRUN) ptest ../Graphs/rotor.graph
-+	$(MPIRUN) mtest ../Graphs/bricks.hex3d 2
++])dnl AX_MPI