summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch13
-rw-r--r--meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch29
-rw-r--r--meta/recipes-devtools/guile/files/guile_2.0.5_disable_goops_optimizations.patch32
-rw-r--r--meta/recipes-devtools/guile/files/guile_2.0.5_fix_cross_compilation.patch47
-rw-r--r--meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch (renamed from meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch)0
-rw-r--r--meta/recipes-devtools/guile/files/remove-gets.patch23
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.6.bb (renamed from meta/recipes-devtools/guile/guile_2.0.5.bb)11
7 files changed, 23 insertions, 132 deletions
diff --git a/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch b/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
index 9445fca640..b9d1ca5143 100644
--- a/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
+++ b/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
@@ -22,18 +22,15 @@ Signed-off-by: Song.Li <Song.Li@windriver.com>
22 1 file changed, 1 insertion(+), 1 deletion(-) 22 1 file changed, 1 insertion(+), 1 deletion(-)
23 23
24diff --git a/meta/Makefile.am b/meta/Makefile.am 24diff --git a/meta/Makefile.am b/meta/Makefile.am
25index f26fc44..e603e5c 100644 25index a05730d..bd20784 100644
26--- a/meta/Makefile.am 26--- a/meta/Makefile.am
27+++ b/meta/Makefile.am 27+++ b/meta/Makefile.am
28@@ -27,7 +27,7 @@ EXTRA_DIST= \ 28@@ -28,7 +28,7 @@ EXTRA_DIST= \
29 guild.in guile-config.in 29 guild.in guile-config.in
30 30
31 # What we now call `guild' used to be known as `guile-tools'. 31 # What we now call `guild' used to be known as `guile-tools'.
32-install-data-hook: 32-install-data-hook:
33+install-exec-hook: 33+install-exec-hook:
34 cd $(DESTDIR)$(bindir) && rm -f guile-tools$(EXEEXT) && \ 34 guild="`echo $(ECHO_N) guild \
35 $(LN_S) guild$(EXEEXT) guile-tools$(EXEEXT) 35 | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \
36 36 guile_tools="`echo $(ECHO_N) guile-tools \
37--
381.7.9.5
39
diff --git a/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch b/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
index 06c849432b..43238a7d2e 100644
--- a/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
+++ b/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
@@ -15,24 +15,25 @@ garbage collector.
15 1 files changed, 6 insertions(+), 5 deletions(-) 15 1 files changed, 6 insertions(+), 5 deletions(-)
16 16
17diff --git a/test-suite/tests/gc.test b/test-suite/tests/gc.test 17diff --git a/test-suite/tests/gc.test b/test-suite/tests/gc.test
18index 97eeb19..58e4936 100644 18index a969752..8c8e13e 100644
19--- a/test-suite/tests/gc.test 19--- a/test-suite/tests/gc.test
20+++ b/test-suite/tests/gc.test 20+++ b/test-suite/tests/gc.test
21@@ -80,11 +80,12 @@ 21@@ -84,11 +84,13 @@
22 (gc) ;; thrice: because the test doesn't succeed with only
23 ;; one gc round. not sure why. 22 ;; one gc round. not sure why.
24 23
25- (= (let lp ((i 0)) 24 (maybe-gc-flakiness
26- (if (guard) 25- (= (let lp ((i 0))
27- (lp (1+ i)) 26- (if (guard)
28- i)) 27- (lp (1+ i))
29- total))) 28- i))
30+ (or (= (let lp ((i 0)) 29- total))))
31+ (if (guard) 30+ (or (= (let lp ((i 0))
32+ (lp (1+ i)) 31+ (if (guard)
33+ i)) 32+ (lp (1+ i))
34+ total) 33+ i))
35+ (throw 'unresolved)))) 34+ total)
35+ (throw 'unresolved)))))
36+
36 37
37 (pass-if "Lexical vars are collectable" 38 (pass-if "Lexical vars are collectable"
38 (let ((l (compile 39 (let ((l (compile
diff --git a/meta/recipes-devtools/guile/files/guile_2.0.5_disable_goops_optimizations.patch b/meta/recipes-devtools/guile/files/guile_2.0.5_disable_goops_optimizations.patch
deleted file mode 100644
index 8609775310..0000000000
--- a/meta/recipes-devtools/guile/files/guile_2.0.5_disable_goops_optimizations.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1commit f7d8efc630ce45f5d82aae5b2682d261e5541d5f
2Author: Andy Wingo <wingo@pobox.com>
3Date: Sun Apr 15 13:00:30 2012 -0700
4
5 disable optimizations in goops dispatch procedures
6
7 * module/oop/goops/dispatch.scm: Disable peval and cse.
8
9Upstream-Status: Backported
10
11diff --git a/module/oop/goops/dispatch.scm b/module/oop/goops/dispatch.scm
12index e433b86..b12ab15 100644
13--- a/module/oop/goops/dispatch.scm
14+++ b/module/oop/goops/dispatch.scm
15@@ -1,4 +1,4 @@
16-;;;; Copyright (C) 1999, 2000, 2001, 2003, 2006, 2009 Free Software Foundation, Inc.
17+;;;; Copyright (C) 1999, 2000, 2001, 2003, 2006, 2009, 2012 Free Software Foundation, Inc.
18 ;;;;
19 ;;;; This library is free software; you can redistribute it and/or
20 ;;;; modify it under the terms of the GNU Lesser General Public
21@@ -178,7 +178,9 @@
22 '())
23 (acons gf gf-sym '()))))
24 (define (comp exp vals)
25- (let ((p ((@ (system base compile) compile) exp #:env *dispatch-module*)))
26+ (let ((p ((@ (system base compile) compile) exp
27+ #:env *dispatch-module*
28+ #:opts '(#:partial-eval? #f #:cse? #f))))
29 (apply p vals)))
30
31 ;; kick it.
32
diff --git a/meta/recipes-devtools/guile/files/guile_2.0.5_fix_cross_compilation.patch b/meta/recipes-devtools/guile/files/guile_2.0.5_fix_cross_compilation.patch
deleted file mode 100644
index b81f02e82a..0000000000
--- a/meta/recipes-devtools/guile/files/guile_2.0.5_fix_cross_compilation.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1commit f3b312a19d70293d7a3407fc4ef479183edd7cca
2Author: Ludovic Courtès <ludo@gnu.org>
3Date: Wed Jun 20 01:11:44 2012 +0200
4
5 Fix cross-compilation of GOOPS-using code.
6
7 Fixes <http://bugs.gnu.org/11645>.
8 Reported by Bogdan A. Marinescu <bogdan.a.marinescu@intel.com>.
9
10 * module/oop/goops/dispatch.scm (compute-dispatch-procedure)[comp]:
11 Wrap `compile' call in (with-target %host-type ...).
12
13Upstream-Status: Backported
14
15diff --git a/module/oop/goops/dispatch.scm b/module/oop/goops/dispatch.scm
16index b12ab15..de5359f 100644
17--- a/module/oop/goops/dispatch.scm
18+++ b/module/oop/goops/dispatch.scm
19@@ -25,6 +25,7 @@
20 #:use-module (oop goops)
21 #:use-module (oop goops util)
22 #:use-module (oop goops compile)
23+ #:use-module (system base target)
24 #:export (memoize-method!)
25 #:no-backtrace)
26
27@@ -178,11 +179,15 @@
28 '())
29 (acons gf gf-sym '()))))
30 (define (comp exp vals)
31- (let ((p ((@ (system base compile) compile) exp
32- #:env *dispatch-module*
33- #:opts '(#:partial-eval? #f #:cse? #f))))
34- (apply p vals)))
35-
36+ ;; When cross-compiling Guile itself, the native Guile must generate
37+ ;; code for the host.
38+ (with-target %host-type
39+ (lambda ()
40+ (let ((p ((@ (system base compile) compile) exp
41+ #:env *dispatch-module*
42+ #:opts '(#:partial-eval? #f #:cse? #f))))
43+ (apply p vals)))))
44+
45 ;; kick it.
46 (scan))
47
diff --git a/meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch b/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch
index e5dc226370..e5dc226370 100644
--- a/meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch
+++ b/meta/recipes-devtools/guile/files/guile_2.0.6_fix_sed_error.patch
diff --git a/meta/recipes-devtools/guile/files/remove-gets.patch b/meta/recipes-devtools/guile/files/remove-gets.patch
deleted file mode 100644
index 6d3605f106..0000000000
--- a/meta/recipes-devtools/guile/files/remove-gets.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: guile-2.0.5/lib/stdio.in.h
7===================================================================
8--- guile-2.0.5.orig/lib/stdio.in.h 2012-01-24 03:06:06.000000000 -0800
9+++ guile-2.0.5/lib/stdio.in.h 2012-07-04 12:28:15.617108481 -0700
10@@ -711,11 +711,13 @@
11 _GL_CXXALIAS_SYS (gets, char *, (char *s));
12 # undef gets
13 # endif
14+# if defined gets
15 _GL_CXXALIASWARN (gets);
16 /* It is very rare that the developer ever has full control of stdin,
17 so any use of gets warrants an unconditional warning. Assume it is
18 always declared, since it is required by C89. */
19 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
20+# endif
21 #endif
22
23
diff --git a/meta/recipes-devtools/guile/guile_2.0.5.bb b/meta/recipes-devtools/guile/guile_2.0.6.bb
index 8fae7125f4..a9df4f768f 100644
--- a/meta/recipes-devtools/guile/guile_2.0.5.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.6.bb
@@ -17,10 +17,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
17 file://debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch \ 17 file://debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch \
18 file://debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch \ 18 file://debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch \
19 file://opensuse/guile-64bit.patch \ 19 file://opensuse/guile-64bit.patch \
20 file://guile_2.0.5_fix_sed_error.patch \ 20 file://guile_2.0.6_fix_sed_error.patch \
21 file://guile_2.0.5_disable_goops_optimizations.patch \
22 file://guile_2.0.5_fix_cross_compilation.patch \
23 file://remove-gets.patch \
24 file://arm_endianness.patch \ 21 file://arm_endianness.patch \
25 file://change-install-data-hook-to-install-exec-hook-in-gui.patch \ 22 file://change-install-data-hook-to-install-exec-hook-in-gui.patch \
26 " 23 "
@@ -28,10 +25,8 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
28# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 25# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
29# file://opensuse/guile-turn-off-gc-test.patch 26# file://opensuse/guile-turn-off-gc-test.patch
30 27
31SRC_URI[md5sum] = "bcf70d54b44c99cb9acd3f63c5486b4b" 28SRC_URI[md5sum] = "3438cd4415c0c43ca93a20e845eba7e2"
32SRC_URI[sha256sum] = "2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956" 29SRC_URI[sha256sum] = "3ece055145a5020dd36b84f5fbccd4b3846a671960dd5ee55931555f03200950"
33
34PR = "r5"
35 30
36inherit autotools gettext 31inherit autotools gettext
37BBCLASSEXTEND = "native" 32BBCLASSEXTEND = "native"