dev-scheme/guile: clean unused patches

Package-Manager: portage-2.3.0
2026-08-01 11:18:09 -07:00 · 2016-12-20 11:38:59 +01:00
parent 5783ccd544
commit a4e5b7cfbf
2 changed files with 0 additions and 112 deletions
--- a/dev-scheme/guile/files/guile-2.0.12-build_includes2.patch
+++ b/dev-scheme/guile/files/guile-2.0.12-build_includes2.patch
@@ -1,48 +0,0 @@
-From 9eb8c3652d6a424a9c60da03584b8056497d1fdf Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw@netris.org>
-Date: Thu, 11 Aug 2016 03:59:40 -0400
-Subject: build: .x and .doc files depend on generated includes.
-
-Fixes <https://bugs.gentoo.org/show_bug.cgi?id=590528>.
-
-* libguile/Makefile.am (BUILT_INCLUDES): New variable.
-(BUILT_SOURCES): Put .i and other generated .h to BUILT_INCLUDES.
-(DOT_X_FILES, EXTRA_DOT_X_FILES, DOT_DOC_FILES, EXTRA_DOT_DOC_FILES):
-Depend on $(BUILT_INCLUDES), in place of scmconfig.h which is included
-in $(BUILT_INCLUDES).
---
- libguile/Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/libguile/Makefile.am b/libguile/Makefile.am
-index cd85604..1383c13 100644
--- a/libguile/Makefile.am
-+++ b/libguile/Makefile.am
-@@ -430,9 +430,9 @@ DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i
- .c.i:
- 	$(AM_V_GEN)$(GREP) '^VM_DEFINE' $< > $@
- 
-BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h \
-    scmconfig.h \
-    $(DOT_I_FILES) $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
-+BUILT_INCLUDES = $(DOT_I_FILES) scmconfig.h
-+BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h $(BUILT_INCLUDES) \
-+    $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
- 
- # Force the generation of `guile-procedures.texi' because the top-level
- # Makefile expects it to be built.
-@@ -735,9 +735,9 @@ SUFFIXES = .x .doc
- .c.doc:
- 	$(AM_V_SNARF)./guile-snarf-docs -o $@ $< -- $(snarfcppopts)
- 
-$(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in version.h
-+$(DOT_X_FILES) $(EXTRA_DOT_X_FILES): $(BUILT_INCLUDES) snarf.h guile-snarf.in version.h
- 
-$(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): scmconfig.h snarf.h guile-snarf-docs.in guile_filter_doc_snarfage$(EXEEXT)
-+$(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): $(BUILT_INCLUDES) snarf.h guile-snarf-docs.in guile_filter_doc_snarfage$(EXEEXT)
- 
- error.x: cpp-E.c
- posix.x: cpp-SIG.c
-- 
-cgit v1.0
-
--- a/dev-scheme/guile/files/guile-2.0.12-workaround-ice-ssa-corruption.patch
+++ b/dev-scheme/guile/files/guile-2.0.12-workaround-ice-ssa-corruption.patch
@@ -1,64 +0,0 @@
-libguile/vm-i-system.c: workaround ice ssa corruption while compiling with option -g -O
-
-While compiling with option -g -O, there was a ssa corruption:
-..
-Unable to coalesce ssa_names 48 and 3476 which are marked as MUST COALESCE.
-sp_48(ab) and  sp_3476(ab)
-guile-2.0.11/libguile/vm-engine.c: In function 'vm_debug_engine':
-guile-2.0.11/libguile/vm.c:673:19: internal compiler error: SSA corruption
- #define VM_NAME   vm_debug_engine
-                   ^
-guile-2.0.11/libguile/vm-engine.c:39:1: note: in expansion of macro 'VM_NAME'
- VM_NAME (SCM vm, SCM program, SCM *argv, int nargs)
- ^
-Please submit a full bug report,
-with preprocessed source if appropriate.
-See <http://gcc.gnu.org/bugs.html> for instructions.
-...
-
-Tweak libguile/vm-i-system.c to add boundary value check to workaround it.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
-Fixes Buildroot autobuilder failures on AArch64.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
- libguile/vm-i-system.c | 20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
--- a/libguile/vm-i-system.c
-+++ b/libguile/vm-i-system.c
-@@ -625,10 +625,22 @@ VM_DEFINE_INSTRUCTION (47, bind_optionals_shuffle, "bind-optionals/shuffle", 6,
-   /* now shuffle up, from walk to ntotal */
-   {
-     scm_t_ptrdiff nshuf = sp - walk + 1, i;
-    sp = (fp - 1) + ntotal + nshuf;
-    CHECK_OVERFLOW ();
-    for (i = 0; i < nshuf; i++)
-      sp[-i] = walk[nshuf-i-1];
-+    /* check the value of nshuf to workaround ice ssa corruption */
-+    /* while compiling with -O -g */
-+    if (nshuf > 0)
-+    {
-+      sp = (fp - 1) + ntotal + nshuf;
-+      CHECK_OVERFLOW ();
-+      for (i = 0; i < nshuf; i++)
-+        sp[-i] = walk[nshuf-i-1];
-+    }
-+    else
-+    {
-+      sp = (fp - 1) + ntotal + nshuf;
-+      CHECK_OVERFLOW ();
-+      for (i = 0; i < nshuf; i++)
-+        sp[-i] = walk[nshuf-i-1];
-+    }
-   }
-   /* and fill optionals & keyword args with SCM_UNDEFINED */
-   while (walk <= (fp - 1) + ntotal)
-- 
-1.9.1
-