commit:     0ba5ef83c4faef54a1bff90bab73c9787756745e
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 14:48:56 2020 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue May 12 14:59:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba5ef83

dev-scheme/c-wrapper: fix build with >=dev-scheme/gauche-0.9.9

Closes: https://bugs.gentoo.org/721390
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch 
b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
index 091b1e2da10..98dfaa2f945 100644
--- a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
@@ -8,7 +8,7 @@
  
      /* skip the first line '# 1 "<stdin>"' */
      Scm_ReadLineUnsafe(SCM_PORT(in));
-@@ -1682,16 +1683,26 @@
+@@ -1682,16 +1683,30 @@
          }
      }
  
@@ -28,7 +28,11 @@
 -            parse_macro_body(SCM_CADR(pos_name_args), 
SCM_CDDR(pos_name_args), line_str);
          }
 +        while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))
++#ifdef SCM_REGEXP_MULTI_LINE
++            && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), 
SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
++#else
 +            && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), 
SCM_STRING(line_str)))) {
++#endif
 +            if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
 +                Scm_Error("[bug] unexpected EOF while parsing macro body");
 +            }

Reply via email to