From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QVtCe-0002Ji-9t for garchives@archives.gentoo.org; Sun, 12 Jun 2011 22:32:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0F331C03C; Sun, 12 Jun 2011 22:32:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7A1EC1C03C for ; Sun, 12 Jun 2011 22:32:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1ACF1B4009 for ; Sun, 12 Jun 2011 22:32:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 26BEE8003C for ; Sun, 12 Jun 2011 22:32:09 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: <0f22979b05165de377e96100ee2a137ec73cfd94.jsbronder@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/, sys-cluster/mpich2/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/mpich2/ChangeLog sys-cluster/mpich2/files/fix-pkg-config-files.patch sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild sys-cluster/mpich2/mpich2-1.4_rc2.ebuild X-VCS-Directories: sys-cluster/mpich2/ sys-cluster/mpich2/files/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: 0f22979b05165de377e96100ee2a137ec73cfd94 Date: Sun, 12 Jun 2011 22:32:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2cfa83f176c29977198a36dd05ace659 commit: 0f22979b05165de377e96100ee2a137ec73cfd94 Author: Justin Bronder gentoo org> AuthorDate: Sun Jun 12 22:31:11 2011 +0000 Commit: Justin Bronder gentoo org> CommitDate: Sun Jun 12 22:31:11 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D0f22979b Fix pkg-config files, #369263 (Portage version: 2.1.9.50/git/Linux x86_64, signed Manifest commit with = key 4D7043C9) --- sys-cluster/mpich2/ChangeLog | 6 + .../mpich2/files/fix-pkg-config-files.patch | 123 ++++++++++++++= ++++++ ...ch2-1.4_rc2.ebuild =3D> mpich2-1.4_rc2-r1.ebuild} | 6 +- 3 files changed, 134 insertions(+), 1 deletions(-) diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog index 24b5f57..dd19de2 100644 --- a/sys-cluster/mpich2/ChangeLog +++ b/sys-cluster/mpich2/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*mpich2-1.4_rc2-r1 (12 Jun 2011) + + 12 Jun 2011; Justin Bronder -mpich2-1.4_rc2.ebu= ild, + +mpich2-1.4_rc2-r1.ebuild, +files/fix-pkg-config-files.patch: + Fix pkg-config files, #369263 + 10 May 2011; Justin Bronder mpich2-1.4_rc2.ebui= ld: Correct fix for #293665 =20 diff --git a/sys-cluster/mpich2/files/fix-pkg-config-files.patch b/sys-cl= uster/mpich2/files/fix-pkg-config-files.patch new file mode 100644 index 0000000..9e319f4 --- /dev/null +++ b/sys-cluster/mpich2/files/fix-pkg-config-files.patch @@ -0,0 +1,123 @@ +From e4ffe1eb191ab5d02de5c25e416f1d4d0f471f44 Mon Sep 17 00:00:00 2001 +From: Justin Bronder +Date: Sun, 12 Jun 2011 14:45:34 -0400 +Subject: [PATCH] fix pkg-config files + +https://trac.mcs.anl.gov/projects/mpich2/ticket/1044 +https://trac.mcs.anl.gov/projects/mpich2/ticket/1500 +--- + configure.in | 6 ++++++ + src/packaging/pkgconfig/mpich2-c.pc.in | 10 ++-------- + src/packaging/pkgconfig/mpich2-cxx.pc.in | 10 ++-------- + src/packaging/pkgconfig/mpich2-f77.pc.in | 10 ++-------- + src/packaging/pkgconfig/mpich2-f90.pc.in | 10 ++-------- + 5 files changed, 14 insertions(+), 32 deletions(-) + +diff --git a/configure.in b/configure.in +index de22cac..8543bb1 100644 +--- a/configure.in ++++ b/configure.in +@@ -5329,6 +5329,12 @@ AC_SUBST(MPICH_TIMER_KIND) + # Setup other replaceable values + AC_SUBST(MPILIBNAME) + AC_SUBST(PMPILIBNAME) ++PKGCONFIG_PMPILIB=3D"" ++if test "$NEEDSPLIB" =3D yes -a test -n "${PMPILIBNAME}" ; then ++ PKGCONFIG_PMPILIB=3D"-l${PMPILIBNAME}" ++fi ++AC_SUBST(PKGCONFIG_PMPILIB) ++ + # Note that aint_size must be used instead of void_p where the desired = check + # is on the size of MPI_Aint + aint_size=3D$ac_cv_sizeof_void_p +diff --git a/src/packaging/pkgconfig/mpich2-c.pc.in b/src/packaging/pkgc= onfig/mpich2-c.pc.in +index b071fc6..e0ab3fa 100644 +--- a/src/packaging/pkgconfig/mpich2-c.pc.in ++++ b/src/packaging/pkgconfig/mpich2-c.pc.in +@@ -4,15 +4,9 @@ exec_prefix=3D@exec_prefix@ + libdir=3D@libdir@ + includedir=3D@includedir@ +=20 +-if test "@NEEDSPLIB@" =3D "yes" ; then +- plib=3D@PMPILIBNAME@ +-else +- plib=3D +-fi +- + Name: mpich2 + Description: MPICH2 is an implementation of the Message-Passing Interfa= ce (MPI). The goals of MPICH2 are to provide an MPI implementation for im= portant platforms, including clusters, SMPs, and massively parallel proce= ssors. It also provides a vehicle for MPI implementation research and for= developing new and better parallel programming environments. + Version: @MPICH2_VERSION@ + Requires: +-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ +-Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I$includedir ++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ = @WRAPPER_LIBS@ ++Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir} +diff --git a/src/packaging/pkgconfig/mpich2-cxx.pc.in b/src/packaging/pk= gconfig/mpich2-cxx.pc.in +index d21f9e6..d82e184 100644 +--- a/src/packaging/pkgconfig/mpich2-cxx.pc.in ++++ b/src/packaging/pkgconfig/mpich2-cxx.pc.in +@@ -4,15 +4,9 @@ exec_prefix=3D@exec_prefix@ + libdir=3D@libdir@ + includedir=3D@includedir@ +=20 +-if test "@NEEDSPLIB@" =3D "yes" ; then +- plib=3D@PMPILIBNAME@ +-else +- plib=3D +-fi +- + Name: mpich2 + Description: MPICH2 is an implementation of the Message-Passing Interfa= ce (MPI). The goals of MPICH2 are to provide an MPI implementation for im= portant platforms, including clusters, SMPs, and massively parallel proce= ssors. It also provides a vehicle for MPI implementation research and for= developing new and better parallel programming environments. + Version: @MPICH2_VERSION@ + Requires: +-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ +-Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I$includedir ++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ = @WRAPPER_LIBS@ ++Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir} +diff --git a/src/packaging/pkgconfig/mpich2-f77.pc.in b/src/packaging/pk= gconfig/mpich2-f77.pc.in +index 1b48bf6..193c2ab 100644 +--- a/src/packaging/pkgconfig/mpich2-f77.pc.in ++++ b/src/packaging/pkgconfig/mpich2-f77.pc.in +@@ -4,15 +4,9 @@ exec_prefix=3D@exec_prefix@ + libdir=3D@libdir@ + includedir=3D@includedir@ +=20 +-if test "@NEEDSPLIB@" =3D "yes" ; then +- plib=3D@PMPILIBNAME@ +-else +- plib=3D +-fi +- + Name: mpich2 + Description: MPICH2 is an implementation of the Message-Passing Interfa= ce (MPI). The goals of MPICH2 are to provide an MPI implementation for im= portant platforms, including clusters, SMPs, and massively parallel proce= ssors. It also provides a vehicle for MPI implementation research and for= developing new and better parallel programming environments. + Version: @MPICH2_VERSION@ + Requires: +-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ +-Fflags: @WRAPPER_FFLAGS@ -I$includedir ++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ = @WRAPPER_LIBS@ ++Fflags: @WRAPPER_FFLAGS@ -I${includedir} +diff --git a/src/packaging/pkgconfig/mpich2-f90.pc.in b/src/packaging/pk= gconfig/mpich2-f90.pc.in +index ebb8499..700976f 100644 +--- a/src/packaging/pkgconfig/mpich2-f90.pc.in ++++ b/src/packaging/pkgconfig/mpich2-f90.pc.in +@@ -4,15 +4,9 @@ exec_prefix=3D@exec_prefix@ + libdir=3D@libdir@ + includedir=3D@includedir@ +=20 +-if test "@NEEDSPLIB@" =3D "yes" ; then +- plib=3D@PMPILIBNAME@ +-else +- plib=3D +-fi +- + Name: mpich2 + Description: MPICH2 is an implementation of the Message-Passing Interfa= ce (MPI). The goals of MPICH2 are to provide an MPI implementation for im= portant platforms, including clusters, SMPs, and massively parallel proce= ssors. It also provides a vehicle for MPI implementation research and for= developing new and better parallel programming environments. + Version: @MPICH2_VERSION@ + Requires: +-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ +-Fcflags: @WRAPPER_FCFLAGS@ -I$includedir ++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ = @WRAPPER_LIBS@ ++Fcflags: @WRAPPER_FCFLAGS@ -I${includedir} +--=20 +1.7.3.4 + diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild b/sys-cluster/mpich= 2/mpich2-1.4_rc2-r1.ebuild similarity index 95% rename from sys-cluster/mpich2/mpich2-1.4_rc2.ebuild rename to sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild index 383e59e..ddfe4b5 100644 --- a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild +++ b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild @@ -3,7 +3,7 @@ # $Header: $ =20 EAPI=3D2 -inherit eutils mpi toolchain-funcs +inherit eutils mpi toolchain-funcs autotools =20 MY_PV=3D${PV/_/} DESCRIPTION=3D"MPICH2 - A portable MPI implementation" @@ -56,6 +56,10 @@ src_prepare() { sed -i \ -e 's,\(.*=3D\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \ src/env/*.in || die + + # 369263 and 1044, 1500 upstream. =09 + epatch "${FILESDIR}"/fix-pkg-config-files.patch + AT_M4DIR=3D"${S}"/confdb eautoreconf || die } =20 src_configure() {