From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F3A86198005 for ; Mon, 18 Mar 2013 14:10:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6D05E00E6; Mon, 18 Mar 2013 14:10:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22E99E00E6 for ; Mon, 18 Mar 2013 14:10:45 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C91D533BF3E for ; Mon, 18 Mar 2013 14:10:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 63258E4073 for ; Mon, 18 Mar 2013 14:10:42 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1363615815.8dad098e3fd7649e64485557e32d1612479cfd24.alexxy@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/, sys-cluster/lustre/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/lustre/ChangeLog sys-cluster/lustre/files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch X-VCS-Directories: sys-cluster/lustre/ sys-cluster/lustre/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 8dad098e3fd7649e64485557e32d1612479cfd24 X-VCS-Branch: master Date: Mon, 18 Mar 2013 14:10:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 31676168-8db1-4812-bcef-e6923eec1b41 X-Archives-Hash: df18962bb143bd055c81b6257d6f27b1 commit: 8dad098e3fd7649e64485557e32d1612479cfd24 Author: Alexey Shvetsov gentoo org> AuthorDate: Mon Mar 18 14:10:15 2013 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Mon Mar 18 14:10:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8dad098e 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 | 56 +++++++++++--------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog index 6558efd..c519988 100644 --- a/sys-cluster/lustre/ChangeLog +++ b/sys-cluster/lustre/ChangeLog @@ -7,6 +7,10 @@ Update patch 18 Mar 2013; Alexey Shvetsov + files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch: + Update patch + + 18 Mar 2013; Alexey Shvetsov +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 f03d0f1..1602cb0 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 8464c612c87117d6f71a1515cd24e72508ee237a Mon Sep 17 00:00:00 2001 +From 1154d0914e29f3d6badb63913855faa008ac7b7b Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Mon, 18 Mar 2013 16:22:27 +0400 Subject: [PATCH] LU-2982 build: make AC check for linux arch sandbox friendly @@ -9,14 +9,14 @@ Signed-off-by: Alexey Shvetsov Change-Id: I173cd892bca5587519806cf6d300a5053dfb935f Signed-off-by: Alexey Shvetsov --- - build/autoconf/lustre-build-linux.m4 | 59 +++++++++++++++++++++++++++++++----- - 1 file changed, 51 insertions(+), 8 deletions(-) + build/autoconf/lustre-build-linux.m4 | 65 +++++++++++++++++++++++++++++++----- + 1 file changed, 57 insertions(+), 8 deletions(-) diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 -index 4c0a581..b6dc7c7 100644 +index 4c0a581..9fcd0b3 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 -@@ -363,14 +363,57 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest. +@@ -363,14 +363,63 @@ 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], @@ -37,28 +37,34 @@ index 4c0a581..b6dc7c7 100644 + LINUXARCHHEADER=linux/autoconf.h +fi +LB_LINUX_TRY_MAKE([ -+ #include <$LINUXARCHHEADER> ++#include <$LINUXARCHHEADER> ++ ++#ifndef UTS_MACHINE ++ ++ #ifdef CONFIG_X86 ++ #ifdef CONFIG_X86_32 ++ #define UTS_MACHINE i386 ++ #else ++ #define UTS_MACHINE x86_64 ++ #endif ++ #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 +],[ + 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