Gentoo Archives: gentoo-commits

From: Christoph Junghans <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/, sys-cluster/modules/
Date: Mon, 03 Jun 2013 23:33:41
Message-Id: 1370127537.3177174a45e58895cd3c2748ccd17feea568d291.ottxor@gentoo
1 commit: 3177174a45e58895cd3c2748ccd17feea568d291
2 Author: Andreas Schäfer <gentryx <AT> gmx <DOT> de>
3 AuthorDate: Sat Jun 1 22:58:57 2013 +0000
4 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 1 22:58:57 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3177174a
7
8 fixed compilation of modules with recent tcl
9
10 ---
11 sys-cluster/modules/files/errorline.patch | 14 ++++++++++++++
12 sys-cluster/modules/modules-3.2.9c-r1.ebuild | 6 +++++-
13 2 files changed, 19 insertions(+), 1 deletion(-)
14
15 diff --git a/sys-cluster/modules/files/errorline.patch b/sys-cluster/modules/files/errorline.patch
16 new file mode 100644
17 index 0000000..dc2efcf
18 --- /dev/null
19 +++ b/sys-cluster/modules/files/errorline.patch
20 @@ -0,0 +1,14 @@
21 +diff -ru modules-3.2.9-a/cmdModule.c modules-3.2.9-b/cmdModule.c
22 +--- modules-3.2.9-a/cmdModule.c 2010-11-11 19:23:18.000000000 +0100
23 ++++ modules-3.2.9-b/cmdModule.c 2013-05-31 20:48:34.000000000 +0200
24 +@@ -640,8 +640,8 @@
25 + case TCL_OK: gotPartial = 0;
26 + continue; /** while **/
27 +
28 +- case TCL_ERROR: interp->errorLine = ((linenum-1)-gotPartial) +
29 +- interp->errorLine;
30 ++ case TCL_ERROR: //interp->errorLine = ((linenum-1)-gotPartial) +
31 ++ // interp->errorLine;
32 + /* FALLTHROUGH */
33 +
34 + case TCL_LEVEL0_RETURN:
35
36 diff --git a/sys-cluster/modules/modules-3.2.9c-r1.ebuild b/sys-cluster/modules/modules-3.2.9c-r1.ebuild
37 index 870399e..4c76601 100644
38 --- a/sys-cluster/modules/modules-3.2.9c-r1.ebuild
39 +++ b/sys-cluster/modules/modules-3.2.9c-r1.ebuild
40 @@ -1,4 +1,4 @@
41 -# Copyright 1999-2012 Gentoo Foundation
42 +# Copyright 1999-2013 Gentoo Foundation
43 # Distributed under the terms of the GNU General Public License v2
44 # $Header: $
45
46 @@ -26,6 +26,10 @@ S="${WORKDIR}/${P%[a-z]}"
47
48 DOCS=(ChangeLog README NEWS TODO)
49
50 +src_prepare() {
51 + epatch "${FILESDIR}"/errorline.patch
52 +}
53 +
54 src_configure() {
55 local myeconfargs=(
56 $(use_with X x)