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 DF4281381F3 for ; Mon, 3 Jun 2013 23:33:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BD54E09F1; Mon, 3 Jun 2013 23:33:37 +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 E32B7E09B4 for ; Mon, 3 Jun 2013 23:33:36 +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 D68B9335E2B for ; Mon, 3 Jun 2013 23:33:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6E70CE468F for ; Mon, 3 Jun 2013 23:33:34 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1370127537.3177174a45e58895cd3c2748ccd17feea568d291.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/, sys-cluster/modules/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/modules/files/errorline.patch sys-cluster/modules/modules-3.2.9c-r1.ebuild X-VCS-Directories: sys-cluster/modules/files/ sys-cluster/modules/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 3177174a45e58895cd3c2748ccd17feea568d291 X-VCS-Branch: master Date: Mon, 3 Jun 2013 23:33:34 +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: 8b8a5616-d98e-4d77-9666-b90afe69dbff X-Archives-Hash: 27d599b59bfae63460db021f0ec91537 commit: 3177174a45e58895cd3c2748ccd17feea568d291 Author: Andreas Schäfer gmx de> AuthorDate: Sat Jun 1 22:58:57 2013 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Sat Jun 1 22:58:57 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3177174a fixed compilation of modules with recent tcl --- sys-cluster/modules/files/errorline.patch | 14 ++++++++++++++ sys-cluster/modules/modules-3.2.9c-r1.ebuild | 6 +++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/sys-cluster/modules/files/errorline.patch b/sys-cluster/modules/files/errorline.patch new file mode 100644 index 0000000..dc2efcf --- /dev/null +++ b/sys-cluster/modules/files/errorline.patch @@ -0,0 +1,14 @@ +diff -ru modules-3.2.9-a/cmdModule.c modules-3.2.9-b/cmdModule.c +--- modules-3.2.9-a/cmdModule.c 2010-11-11 19:23:18.000000000 +0100 ++++ modules-3.2.9-b/cmdModule.c 2013-05-31 20:48:34.000000000 +0200 +@@ -640,8 +640,8 @@ + case TCL_OK: gotPartial = 0; + continue; /** while **/ + +- case TCL_ERROR: interp->errorLine = ((linenum-1)-gotPartial) + +- interp->errorLine; ++ case TCL_ERROR: //interp->errorLine = ((linenum-1)-gotPartial) + ++ // interp->errorLine; + /* FALLTHROUGH */ + + case TCL_LEVEL0_RETURN: diff --git a/sys-cluster/modules/modules-3.2.9c-r1.ebuild b/sys-cluster/modules/modules-3.2.9c-r1.ebuild index 870399e..4c76601 100644 --- a/sys-cluster/modules/modules-3.2.9c-r1.ebuild +++ b/sys-cluster/modules/modules-3.2.9c-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -26,6 +26,10 @@ S="${WORKDIR}/${P%[a-z]}" DOCS=(ChangeLog README NEWS TODO) +src_prepare() { + epatch "${FILESDIR}"/errorline.patch +} + src_configure() { local myeconfargs=( $(use_with X x)