summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-09-25 04:27:29 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-09-25 04:27:29 +0000
commit0bad67c63456effd30c10605e1700fa52266fe8d (patch)
tree1460b04f2a311eb7c2cf7293ecbd19670b4f1d30 /sys-cluster
parent(#111797) Fix some errors from trying to do things to nonexistent files. (diff)
downloadgentoo-2-0bad67c63456effd30c10605e1700fa52266fe8d.tar.gz
gentoo-2-0bad67c63456effd30c10605e1700fa52266fe8d.tar.bz2
gentoo-2-0bad67c63456effd30c10605e1700fa52266fe8d.zip
(#103430) Make AFS work without requiring /usr/afsws to exist.
(Portage version: 2.1.2_pre1-r1)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/mpich/ChangeLog6
-rw-r--r--sys-cluster/mpich/files/1.2.7_p1-allow-fhs-afs.patch36
-rw-r--r--sys-cluster/mpich/mpich-1.2.7_p1.ebuild15
3 files changed, 52 insertions, 5 deletions
diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index c3fd351bd42c..9aab96f67e42 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/mpich
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.29 2006/09/25 04:05:52 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.30 2006/09/25 04:27:29 dberkholz Exp $
+
+ 25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+ +files/1.2.7_p1-allow-fhs-afs.patch, mpich-1.2.7_p1.ebuild:
+ (#103430) Make AFS work without requiring /usr/afsws to exist.
25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
mpich-1.2.7_p1.ebuild:
diff --git a/sys-cluster/mpich/files/1.2.7_p1-allow-fhs-afs.patch b/sys-cluster/mpich/files/1.2.7_p1-allow-fhs-afs.patch
new file mode 100644
index 000000000000..522bae30241b
--- /dev/null
+++ b/sys-cluster/mpich/files/1.2.7_p1-allow-fhs-afs.patch
@@ -0,0 +1,36 @@
+diff -urN mpich-1.2.7p1.orig/mpid/server/aclocal.m4 mpich-1.2.7p1/mpid/server/aclocal.m4
+--- mpich-1.2.7p1.orig/mpid/server/aclocal.m4 2006-09-24 21:11:27.000000000 -0700
++++ mpich-1.2.7p1/mpid/server/aclocal.m4 2006-09-24 21:14:26.000000000 -0700
+@@ -27,21 +27,18 @@
+ dnl Just having AFS directories doesn't mean that you can use
+ dnl AFS headers.
+ AC_DEFUN(AC_CHECK_AFS,
+-[AC_MSG_CHECKING(for AFS (/usr/afsws))
++[AC_MSG_CHECKING(for AFS)
+ AC_CACHE_VAL(ac_cv_sys_afs, [dnl
+- if test -d /usr/afsws ; then
+- afs_avail=1
+- AC_CHECK_HEADER(afs/kauth.h,,afs_avail=0)
+- AC_CHECK_HEADER(afs/kautils.h,,afs_avail=0)
+- AC_CHECK_HEADER(afs/auth.h,,afs_avail=0)
+- if test $afs_avail = 1 ; then
+- ac_cv_sys_afs="yes"
+- else
+- ac_cv_sys_afs="no"
+- fi
+- else
+- ac_cv_sys_afs="no"
+- fi
++ afs_avail=1
++ AC_CHECK_HEADER(afs/kauth.h,,afs_avail=0)
++ AC_CHECK_HEADER(afs/kautils.h,,afs_avail=0)
++ AC_CHECK_HEADER(afs/auth.h,,afs_avail=0)
++ if test $afs_avail = 1 ; then
++ ac_cv_sys_afs="yes"
++ else
++ ac_cv_sys_afs="no"
++ fi
++ ac_cv_sys_afs="no"
+ ])
+ if test "$ac_cv_sys_afs" = "yes"; then
+ AC_DEFINE(HAVE_AFS)
diff --git a/sys-cluster/mpich/mpich-1.2.7_p1.ebuild b/sys-cluster/mpich/mpich-1.2.7_p1.ebuild
index 6bbb5413e120..f34663b3b623 100644
--- a/sys-cluster/mpich/mpich-1.2.7_p1.ebuild
+++ b/sys-cluster/mpich/mpich-1.2.7_p1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.7_p1.ebuild,v 1.7 2006/09/25 04:05:52 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.7_p1.ebuild,v 1.8 2006/09/25 04:27:29 dberkholz Exp $
-inherit eutils
+inherit autotools eutils
# Set the MPICH_CONFIGURE_OPTS environment variable to change the signal
# mpich listens on or any other custom options (#38207).
@@ -47,9 +47,16 @@ src_unpack() {
# Fix broken romio
epatch ${FILESDIR}/${PV}-fix-romio-sandbox-breakage.patch
- cd ${S}/romio
+ pushd ${S}/romio
rm configure
- autoreconf --install --verbose
+ eautoreconf
+ popd
+
+ epatch ${FILESDIR}/${PV}-allow-fhs-afs.patch
+ pushd ${S}/mpid/server
+ rm configure
+ eautoreconf
+ popd
}
src_compile() {