Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/c-wrapper/files/
Date: Tue, 12 May 2020 14:59:53
Message-Id: 1589295563.0ba5ef83c4faef54a1bff90bab73c9787756745e.hattya@gentoo
1 commit: 0ba5ef83c4faef54a1bff90bab73c9787756745e
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 12 14:48:56 2020 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Tue May 12 14:59:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba5ef83
7
8 dev-scheme/c-wrapper: fix build with >=dev-scheme/gauche-0.9.9
9
10 Closes: https://bugs.gentoo.org/721390
11 Package-Manager: Portage-2.3.99, Repoman-2.3.22
12 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
13
14 dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch | 6 +++++-
15 1 file changed, 5 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
18 index 091b1e2da10..98dfaa2f945 100644
19 --- a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
20 +++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
21 @@ -8,7 +8,7 @@
22
23 /* skip the first line '# 1 "<stdin>"' */
24 Scm_ReadLineUnsafe(SCM_PORT(in));
25 -@@ -1682,16 +1683,26 @@
26 +@@ -1682,16 +1683,30 @@
27 }
28 }
29
30 @@ -28,7 +28,11 @@
31 - parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), line_str);
32 }
33 + while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))
34 ++#ifdef SCM_REGEXP_MULTI_LINE
35 ++ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
36 ++#else
37 + && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) {
38 ++#endif
39 + if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
40 + Scm_Error("[bug] unexpected EOF while parsing macro body");
41 + }