gentoo resync : 14.07.2018

4 files changed, 0 insertions, 119 deletions

diff --git a/dev-scheme/c-wrapper/files/c-wrapper-closure.patch b/dev-scheme/c-wrapper/files/c-wrapper-closure.patch
deleted file mode 100644
index 24be1d052fd7..000000000000
--- a/dev-scheme/c-wrapper/files/c-wrapper-closure.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/closure_alloc.c
-+++ b/src/closure_alloc.c
-@@ -100,6 +100,7 @@
-             ++(node->n);
-             return;
-         }
-+        node = node->next;
-     }
- 
-     node = malloc(sizeof(FreeNode));
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
deleted file mode 100644
index 091b1e2da105..000000000000
--- a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/src/c-parser.c
-+++ b/src/c-parser.c
-@@ -1668,6 +1668,7 @@
- {
-     static ScmObj trigger_line = SCM_FALSE;
-     ScmObj line_str;
-+    ScmObj regexp = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
- 
-     /* skip the first line '# 1 "<stdin>"' */
-     Scm_ReadLineUnsafe(SCM_PORT(in));
-@@ -1682,16 +1683,26 @@
-         }
-     }
- 
--    while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
--        if (SCM_NULLP(macro_list)) {
-+    line_str = SCM_NIL;
-+    while (!SCM_NULLP(macro_list)) {
-+        ScmObj body_str = line_str;
-+        if (SCM_NULLP(body_str)
-+            && SCM_EOFP(body_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
-             Scm_Error("[bug] lost macro body");
--        } else {
--            ScmObj pos_name_args = SCM_CDAR(macro_list);
--            macro_list = SCM_CDR(macro_list);
--            Scm_FilenameSet(SCM_CAAR(pos_name_args));
--            Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
--            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)))
-+            && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) {
-+            if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
-+                Scm_Error("[bug] unexpected EOF while parsing macro body");
-+            }
-+            body_str = Scm_StringAppend2(SCM_STRING(body_str), SCM_STRING(line_str));
-+            line_str = SCM_NIL;
-+        }
-+        ScmObj pos_name_args = SCM_CDAR(macro_list);
-+        macro_list = SCM_CDR(macro_list);
-+        Scm_FilenameSet(SCM_CAAR(pos_name_args));
-+        Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
-+        parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), body_str);
-     }
- 
-     SCM_RETURN(SCM_UNDEFINED);
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch b/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch
deleted file mode 100644
index e94d55fa0d21..000000000000
--- a/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,6 +53,7 @@
- 
- dnl Check for libraries
- dnl Add your macro calls to check required libraries, if you have any.
-+PKG_CHECK_MODULES([FFI], [libffi])
- 
- dnl Platform-dependent configuration.
- AC_ARG_ENABLE(objc, [  --enable-objc           turn on Objective-C support])
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -20,9 +20,10 @@
- GAUCHE_PACKAGE = @GAUCHE_PACKAGE@
- INSTALL        = @GAUCHE_INSTALL@
- 
--CPPFLAGS       = -I./libffi/include -DGAUCHE_API_0_8_8 @CPPFLAGS@
-+CPPFLAGS       = -DGAUCHE_API_0_8_8 @FFI_CFLAGS@ @CPPFLAGS@
-+CFLAGS         = @CFLAGS@
- LDFLAGS        = @LDFLAGS@
--LIBS           = libffi/.libs/libffi.a @LIBS@
-+LIBS           = @FFI_LIBS@ @LIBS@
- 
- YACC           = @YACC@
- 
-@@ -38,7 +39,7 @@
- SCMFILES  = 
- HEADERS   = 
- 
--TARGET    = libffi/.libs/libffi.a $(ARCHFILES)
-+TARGET    = $(ARCHFILES)
- GENERATED = libffi
- CONFIG_GENERATED = libffi/Makefile Makefile cwcompile
- 
-@@ -62,13 +63,13 @@
- 	cd libffi; $(MAKE)
- 
- c-ffi.$(SOEXT): $(ffi_SRCS)
--	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS)
-+	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS)
- 
- c-lex.$(SOEXT): $(clex_SRCS)
--	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS)
-+	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS)
- 
- c-parser.$(SOEXT): $(cparser_SRCS) y.tab.c
--	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS)
-+	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS)
- 
- c-grammar.y: c-grammar.scm genyacc.scm
- 	$(GOSH) genyacc.scm --outfile=c-grammar.y $<
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch b/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch
deleted file mode 100644
index 0776b255bbac..000000000000
--- a/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/lib/c-wrapper/c-parser.scm
-+++ b/lib/c-wrapper/c-parser.scm
-@@ -1115,7 +1115,9 @@
-                 (raise e))))
-      (call-with-gcc-io include-dirs headers options
-                        (lambda (in out)
--                         (let ((macro-list (queue->list (macro-queue))))
-+                         (let ((macro-list (filter (lambda (m)
-+                                                     (not (string-prefix?  "__glibc_macro_warning" (car m))))
-+                                                   (queue->list (macro-queue)))))
-                            (for-each (lambda (macro-def)
-                                        (display (car macro-def) out)
-                                        (newline out))