public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Christoph Junghans" <ottxor@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/, sys-cluster/modules/
Date: Mon,  3 Jun 2013 23:33:34 +0000 (UTC)	[thread overview]
Message-ID: <1370127537.3177174a45e58895cd3c2748ccd17feea568d291.ottxor@gentoo> (raw)

commit:     3177174a45e58895cd3c2748ccd17feea568d291
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Sat Jun  1 22:58:57 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> 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)


             reply	other threads:[~2013-06-03 23:33 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-03 23:33 Christoph Junghans [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-06-03 23:33 [gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/, sys-cluster/modules/ Christoph Junghans
2013-06-26 14:53 Justin Lecher
2013-06-26 17:23 Sebastien Fabbro
2014-01-26 22:52 Nicolas Bock
2017-08-25 19:36 Andrew Savchenko
2020-09-26 19:11 Aisha Tammy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370127537.3177174a45e58895cd3c2748ccd17feea568d291.ottxor@gentoo \
    --to=ottxor@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox