summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-fs/openafs')
-rw-r--r--net-fs/openafs/ChangeLog6
-rw-r--r--net-fs/openafs/files/openafs-ppc64.patch29
-rw-r--r--net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild4
3 files changed, 37 insertions, 2 deletions
diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index c3d1fa8eaa95..d08a6c6fb8aa 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-fs/openafs
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.113 2007/09/19 10:09:33 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.114 2007/09/19 10:40:52 stefaan Exp $
+
+ 19 Sep 2007; Stefaan De Roeck <stefaan@gentoo.org>
+ +files/openafs-ppc64.patch, openafs-1.4.4_p20070724-r1.ebuild:
+ Fix for ppc64 (bug #191216)
*openafs-1.4.4_p20070724-r1 (19 Sep 2007)
diff --git a/net-fs/openafs/files/openafs-ppc64.patch b/net-fs/openafs/files/openafs-ppc64.patch
new file mode 100644
index 000000000000..ae444e52a90f
--- /dev/null
+++ b/net-fs/openafs/files/openafs-ppc64.patch
@@ -0,0 +1,29 @@
+--- src/afs/afs_call.c.old 2007-09-09 14:38:44.000000000 +0400
++++ src/afs/afs_call.c 2007-09-09 14:50:18.460222354 +0400
+@@ -1340,7 +1340,11 @@ copyin_iparam(caddr_t cmarg, struct ipar
+ if (current->thread.flags & THREAD_IA32)
+
+ #elif defined(AFS_PPC64_LINUX26_ENV)
+- if (current->thread_info->flags & _TIF_32BIT)
++#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
++ if (current->thread_info->flags & _TIF_32BIT)
++#else
++ if (current_thread_info()->flags & _TIF_32BIT)
++#endif
+ #elif defined(AFS_PPC64_LINUX20_ENV)
+ if (current->thread.flags & PPC_FLAG_32BIT)
+
+--- src/afs/afs_pioctl.c.bak 2007-09-18 01:12:03.000000000 -0400
++++ src/afs/afs_pioctl.c 2007-09-18 01:12:40.000000000 -0400
+@@ -284,7 +284,11 @@
+ if (current->thread.flags & THREAD_IA32)
+
+ #elif defined(AFS_PPC64_LINUX26_ENV)
++#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
+ if (current->thread_info->flags & _TIF_32BIT)
++#else
++ if (current_thread_info()->flags & _TIF_32BIT)
++#endif
+ #elif defined(AFS_PPC64_LINUX20_ENV)
+ if (current->thread.flags & PPC_FLAG_32BIT)
+
diff --git a/net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild b/net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild
index 51c57c86ef49..dbc395eee0e1 100644
--- a/net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild
+++ b/net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild,v 1.1 2007/09/19 10:09:33 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.4_p20070724-r1.ebuild,v 1.2 2007/09/19 10:40:52 stefaan Exp $
inherit flag-o-matic eutils linux-mod toolchain-funcs versionator
@@ -40,6 +40,8 @@ src_unpack() {
epatch ${DISTDIR}/${MY_P}-cvs${MY_PV_DATE}.patch.bz2
+ epatch ${FILESDIR}/openafs-ppc64.patch
+
./regen.sh || die "Failed: regenerating configure script"
}