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 25496198005 for ; Mon, 18 Mar 2013 12:21:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A77AE0477; Mon, 18 Mar 2013 12:21:35 +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 12ECFE0477 for ; Mon, 18 Mar 2013 12:21:34 +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 DC62233DA1E for ; Mon, 18 Mar 2013 12:21:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7C308E4073 for ; Mon, 18 Mar 2013 12:21:32 +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: <1363609276.c52ab46c471a453226d3c930816f2c2400a2a19a.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/LU-2982.patch X-VCS-Directories: sys-cluster/lustre/ sys-cluster/lustre/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: c52ab46c471a453226d3c930816f2c2400a2a19a X-VCS-Branch: master Date: Mon, 18 Mar 2013 12:21:32 +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: 21733ea8-24e2-4587-a31a-d18ecfb92ad4 X-Archives-Hash: 37875a99a4008a2ed8c7cd25983a7cea commit: c52ab46c471a453226d3c930816f2c2400a2a19a Author: Alexey Shvetsov gentoo org> AuthorDate: Mon Mar 18 12:21:16 2013 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Mon Mar 18 12:21:16 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c52ab46c Update patch Package-Manager: portage-2.2.0_alpha166 RepoMan-Options: --force --- sys-cluster/lustre/ChangeLog | 3 ++ sys-cluster/lustre/files/LU-2982.patch | 61 ++++++++++++++++--------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog index 35c3d06..26a81d6 100644 --- a/sys-cluster/lustre/ChangeLog +++ b/sys-cluster/lustre/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 18 Mar 2013; Alexey Shvetsov files/LU-2982.patch: + Update patch + 18 Mar 2013; Alexey Shvetsov +files/LU-2982.patch, lustre-9999.ebuild: Fix sandbox violation during configure diff --git a/sys-cluster/lustre/files/LU-2982.patch b/sys-cluster/lustre/files/LU-2982.patch index f8f8bd0..914a398 100644 --- a/sys-cluster/lustre/files/LU-2982.patch +++ b/sys-cluster/lustre/files/LU-2982.patch @@ -1,8 +1,8 @@ diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 -index 4c0a581..1ea0d12 100644 +index 4c0a581..6f6a40a 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 -@@ -363,14 +363,37 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest. +@@ -363,14 +363,38 @@ 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], @@ -14,37 +14,38 @@ index 4c0a581..1ea0d12 100644 - [AC_MSG_RESULT([$LINUX_ARCH])], - [AC_MSG_ERROR([Could not determine the kernel architecture.])]) - rm -f build/arch]) -+ [LINUXARCH= -+ rm -f build/conftest.i -+ AC_MSG_CHECKING([Linux kernel architecture]) -+ if test -s $LINUX_OBJ/include/$AUTOCONF_HDIR/compile.h ; then -+ LINUXARCHHEADER=$AUTOCONF_HDIR/compile.h -+ else -+ LINUXARCHHEADER=linux/version.h -+ fi -+ LB_LINUX_TRY_MAKE([ -+ #include <$LINUXARCHHEADER> -+ ],[ -+ char *LINUXARCH; -+ LINUXARCH=UTS_MACHINE; -+ ],[ -+ $makerule LUSTRE_KERNEL_TEST=conftest.i -+ ],[ -+ test -s build/conftest.i -+ ],[ -+ # LINUXARCH="UTS_MACHINE" -+ eval $(grep "LINUXARCH=" build/conftest.i) -+ ],[ -+ AC_MSG_RESULT([unknown]) -+ AC_MSG_ERROR([Could not preprocess test program. Consult config.log for details.]) -+ ]) -+ rm -f build/conftest.i -+ if test x$LINUXARCH = x ; then -+ AC_MSG_RESULT([unknown]) ++[LINUXARCH= ++rm -f build/conftest.i ++AC_MSG_CHECKING([Linux kernel architecture]) ++if test -s $LINUX_OBJ/include/$AUTOCONF_HDIR/compile.h ; then ++ LINUXARCHHEADER=$AUTOCONF_HDIR/compile.h ++else ++ LINUXARCHHEADER=linux/version.h ++fi ++LB_LINUX_TRY_MAKE([ ++ #include <$LINUXARCHHEADER> ++],[ ++ char *LINUXARCH; ++ LINUXARCH=UTS_MACHINE; ++],[ ++ $makerule LUSTRE_KERNEL_TEST=conftest.i ++],[ ++ test -s build/conftest.i ++],[ ++ # LINUXARCH="UTS_MACHINE" ++ eval $(grep "LINUXARCH=" build/conftest.i) ++],[ ++ AC_MSG_RESULT([unknown]) ++ AC_MSG_ERROR([Could not preprocess test program. Consult config.log for details.]) ++]) ++ rm -f build/conftest.i ++ if test x$LINUXARCH = x ; then ++ AC_MSG_RESULT([unknown]) + AC_MSG_ERROR([Could not determine Linux architecture from linux/version.h.]) -+ fi ++ fi +AC_MSG_RESULT([$LINUXARCH]) +AC_SUBST(LINUXARCH) ++]) # # LB_LINUX_TRY_COMPILE