[gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/, sys-cluster/lustre/files/

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     1fe05f3e5a923a101b22f889392f2b7538015cfc
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 13:59:36 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 13:59:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1fe05f3e

Update patch

Package-Manager: portage-2.2.0_alpha166
RepoMan-Options: --force

---
 sys-cluster/lustre/ChangeLog                       |    4 ++
 ...ld-make-AC-check-for-linux-arch-sandbox-f.patch |   32 ++++++++++++++++----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog
index 8acda36..6558efd 100644
--- a/sys-cluster/lustre/ChangeLog
+++ b/sys-cluster/lustre/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   18 Mar 2013; Alexey Shvetsov <alexxy@gentoo.org>
+  files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch:
+  Update patch
+
+  18 Mar 2013; Alexey Shvetsov <alexxy@gentoo.org>
   +files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
   -files/LU-2982.patch, lustre-9999.ebuild:
   Add patch sended upstream

diff --git a/sys-cluster/lustre/files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch b/sys-cluster/lustre/files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
index 601c219..f03d0f1 100644
--- a/sys-cluster/lustre/files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
+++ b/sys-cluster/lustre/files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
@@ -1,4 +1,4 @@
-From 1abbac39f89cc7e078fd3a3abcd0597c736918a1 Mon Sep 17 00:00:00 2001
+From 8464c612c87117d6f71a1515cd24e72508ee237a Mon Sep 17 00:00:00 2001
 From: Alexey Shvetsov <alexxy@gentoo.org>
 Date: Mon, 18 Mar 2013 16:22:27 +0400
 Subject: [PATCH] LU-2982 build: make AC check for linux arch sandbox friendly
@@ -7,15 +7,16 @@ this commit makes AC check for linux kernel arch sandbox friendly
 
 Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 Change-Id: I173cd892bca5587519806cf6d300a5053dfb935f
+Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 ---
- build/autoconf/lustre-build-linux.m4 | 40 ++++++++++++++++++++++++++++--------
- 1 file changed, 32 insertions(+), 8 deletions(-)
+ build/autoconf/lustre-build-linux.m4 | 59 +++++++++++++++++++++++++++++++-----
+ 1 file changed, 51 insertions(+), 8 deletions(-)
 
 diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
-index 4c0a581..6f6a40a 100644
+index 4c0a581..b6dc7c7 100644
 --- a/build/autoconf/lustre-build-linux.m4
 +++ b/build/autoconf/lustre-build-linux.m4
-@@ -363,14 +363,38 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.
+@@ -363,14 +363,57 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.
  # Determine the kernel's idea of the current architecture
  #
  AC_DEFUN([LB_LINUX_ARCH],
@@ -33,12 +34,31 @@ index 4c0a581..6f6a40a 100644
 +if test -s $LINUX_OBJ/include/$AUTOCONF_HDIR/compile.h ; then
 +	LINUXARCHHEADER=$AUTOCONF_HDIR/compile.h
 +else
-+	LINUXARCHHEADER=linux/version.h
++	LINUXARCHHEADER=linux/autoconf.h
 +fi
 +LB_LINUX_TRY_MAKE([
 +	#include <$LINUXARCHHEADER>
 +],[
 +	char *LINUXARCH;
++	#ifndef UTS_MACHINE
++	#ifdef CONFIG_X86
++	#ifdef CONFIG_X86_32
++	#define UTS_MACHINE i386
++	#else
++	#define UTS_MACHINE x86_64
++	#endif
++	#ifdef CONFIG_IA64
++	#define UTS_MACHINE ia64
++	#endif
++	#ifdef CONFIG_PPC
++	#ifdef CONFIG_PPC32
++	#define UTS_MACHINE ppc
++	#endif
++	#ifdef CONFIG_PPC64
++	#define UTS_MACHINE ppc64
++	#endif
++	#endif
++	#endif
 +	LINUXARCH=UTS_MACHINE;
 +],[
 +	$makerule LUSTRE_KERNEL_TEST=conftest.i