summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-01 09:31:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-09 21:42:51 +0100
commit3eff636ee86ce1f650625147d524b0c3429784e8 (patch)
tree52056a0cbd6781678045853db77fa23ced5072ac
parent1e6c1169fee55ec1c492865cb8187f5ed4b16590 (diff)
downloadpoky-3eff636ee86ce1f650625147d524b0c3429784e8.tar.gz
guile: upgrade from 2.0.3 to 2.0.5
(From OE-Core rev: 29afcb7ad976db62f9a46abf305a47a24a99dbda) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch33
-rw-r--r--meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch25
-rw-r--r--meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch38
-rw-r--r--meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch26
-rw-r--r--meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch33
-rw-r--r--meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch24
-rw-r--r--meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch3
-rw-r--r--meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch3
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.5.bb (renamed from meta/recipes-devtools/guile/guile_2.0.3.bb)16
9 files changed, 108 insertions, 93 deletions
diff --git a/meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch b/meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
deleted file mode 100644
index e6df9b9f9c..0000000000
--- a/meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Inappropriate [debian patch]
2
3From c53b49c63d7ed145fbaa3dde25063c407631f373 Mon Sep 17 00:00:00 2001
4From: Rob Browning <rlb@defaultvalue.org>
5Date: Sat, 23 Apr 2011 14:57:49 -0500
6Subject: Fix the SRFI 60 copy-bit documentation.
7
8---
9 libguile/srfi-60.c | 4 ++--
10 1 files changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
13index 264f4cb..1ed3c9e 100644
14--- a/libguile/srfi-60.c
15+++ b/libguile/srfi-60.c
16@@ -70,7 +70,7 @@ SCM_DEFINE (scm_srfi60_log2_binary_factors, "log2-binary-factors", 1, 0, 0,
17
18
19 SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
20- (SCM index, SCM n, SCM bit),
21+ (SCM index, SCM n, SCM newbit),
22 "Return @var{n} with the bit at @var{index} set according to\n"
23 "@var{newbit}. @var{newbit} should be @code{#t} to set the bit\n"
24 "to 1, or @code{#f} to set it to 0. Bits other than at\n"
25@@ -86,7 +86,7 @@ SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
26 int bb;
27
28 ii = scm_to_ulong (index);
29- bb = scm_to_bool (bit);
30+ bb = scm_to_bool (newbit);
31
32 if (SCM_I_INUMP (n))
33 {
diff --git a/meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch b/meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
deleted file mode 100644
index 7176c76409..0000000000
--- a/meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Inappropriate [debian patch]
2
3From 6614b8efc5a8d90a26a2b99308b909ac351b65e5 Mon Sep 17 00:00:00 2001
4From: Rob Browning <rlb@defaultvalue.org>
5Date: Sat, 23 Apr 2011 14:57:50 -0500
6Subject: Define _GNU_SOURCE to fix the GNU/kFreeBSD build.
7
8Author: Petr Salinger <Petr.Salinger@seznam.cz>
9Closes: #401168
10---
11 libguile/fports.c | 1 +
12 1 files changed, 1 insertions(+), 0 deletions(-)
13
14diff --git a/libguile/fports.c b/libguile/fports.c
15index 1348b8b..3ac3ced 100644
16--- a/libguile/fports.c
17+++ b/libguile/fports.c
18@@ -20,6 +20,7 @@
19
20
21 #define _LARGEFILE64_SOURCE /* ask for stat64 etc */
22+#define _GNU_SOURCE /* ask for LONG_LONG_MAX/LONG_LONG_MIN */
23
24 #ifdef HAVE_CONFIG_H
25 # include <config.h>
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
new file mode 100644
index 0000000000..06c849432b
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
@@ -0,0 +1,38 @@
1Upstream-Status: Inappropriate [debian patch]
2
3Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
4
5From e52bfcdbaca5dce498678d8f512381e3e39a4066 Mon Sep 17 00:00:00 2001
6From: Rob Browning <rlb@defaultvalue.org>
7Date: Sun, 18 Mar 2012 11:40:55 -0500
8Subject: Mark "Unused modules are removed" gc test as unresolved.
9
10As per discussion with upstream, mark this test as unresolved since it
11may produce false negatives, depending on the behavior/timing of the
12garbage collector.
13---
14 test-suite/tests/gc.test | 11 ++++++-----
15 1 files changed, 6 insertions(+), 5 deletions(-)
16
17diff --git a/test-suite/tests/gc.test b/test-suite/tests/gc.test
18index 97eeb19..58e4936 100644
19--- a/test-suite/tests/gc.test
20+++ b/test-suite/tests/gc.test
21@@ -80,11 +80,12 @@
22 (gc) ;; thrice: because the test doesn't succeed with only
23 ;; one gc round. not sure why.
24
25- (= (let lp ((i 0))
26- (if (guard)
27- (lp (1+ i))
28- i))
29- total)))
30+ (or (= (let lp ((i 0))
31+ (if (guard)
32+ (lp (1+ i))
33+ i))
34+ total)
35+ (throw 'unresolved))))
36
37 (pass-if "Lexical vars are collectable"
38 (let ((l (compile
diff --git a/meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch b/meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
deleted file mode 100644
index aa64f58800..0000000000
--- a/meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Upstream-Status: Inappropriate [debian patch]
2
3From 0c91fa9270e86b20bfb8e62db5ac84617b2567d9 Mon Sep 17 00:00:00 2001
4From: Rob Browning <rlb@defaultvalue.org>
5Date: Thu, 10 Nov 2011 02:23:04 -0600
6Subject: Include gc.h rather than gc/gc_version.h in pthread test.
7
8See comments in recent gc_version.h. It should never be included
9directly, and doing so was causing build failures.
10---
11 .../standalone/test-pthread-create-secondary.c | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14diff --git a/test-suite/standalone/test-pthread-create-secondary.c b/test-suite/standalone/test-pthread-create-secondary.c
15index fe39c2a..d87fb33 100644
16--- a/test-suite/standalone/test-pthread-create-secondary.c
17+++ b/test-suite/standalone/test-pthread-create-secondary.c
18@@ -27,7 +27,7 @@
19 #include <stdlib.h>
20 #include <libguile.h>
21
22-#include <gc/gc_version.h>
23+#include <gc.h>
24
25
26 /* Up to GC 7.2alpha5, calling `GC_INIT' from a secondary thread would
diff --git a/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch b/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
new file mode 100644
index 0000000000..34be3b96e7
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
@@ -0,0 +1,33 @@
1Upstream-Status: Inappropriate [debian patch]
2
3Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
4
5From 848543091d55dddb54a85612155964506d712852 Mon Sep 17 00:00:00 2001
6From: Rob Browning <rlb@defaultvalue.org>
7Date: Sun, 18 Mar 2012 13:28:24 -0500
8Subject: Mark "mutex with owner not retained" threads test as unresolved.
9
10As per discussion with upstream, mark this test as unresolved since it
11may produce false negatives, depending on the behavior/timing of the
12garbage collector.
13---
14 test-suite/tests/threads.test | 6 ++++--
15 1 files changed, 4 insertions(+), 2 deletions(-)
16
17diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test
18index 85a7c38..50899cb 100644
19--- a/test-suite/tests/threads.test
20+++ b/test-suite/tests/threads.test
21@@ -414,8 +414,10 @@
22
23 (gc) (gc)
24 (let ((m (g)))
25- (and (mutex? m)
26- (eq? (mutex-owner m) (current-thread)))))))
27+ (or
28+ (and (mutex? m)
29+ (eq? (mutex-owner m) (current-thread)))
30+ (throw 'unresolved))))))
31
32 ;;
33 ;; mutex lock levels
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.5_fix_sed_error.patch
new file mode 100644
index 0000000000..e5dc226370
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch
@@ -0,0 +1,24 @@
1Upstream-Status: Pending
2
3This fixes sed issue when prefix has / in it, like /usr/local
4
5autoreconf error avoided:
6| sed: -e expression #1, char 9: unknown option to `s'
7| configure.ac:39: error: AC_INIT should be called with package and version arguments
8
9Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
102012/05/01
11
12Index: guile-2.0.5/build-aux/git-version-gen
13===================================================================
14--- guile-2.0.5.orig/build-aux/git-version-gen
15+++ guile-2.0.5/build-aux/git-version-gen
16@@ -187,7 +187,7 @@ else
17 v=UNKNOWN
18 fi
19
20-v=`echo "$v" |sed "s/^$prefix//"`
21+v=`echo "$v" |sed "s#^$prefix##"`
22
23 # Test whether to append the "-dirty" suffix only if the version
24 # string we're using came from git. I.e., skip the test if it's "UNKNOWN"
diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch b/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
index be3191a039..d3e312f770 100644
--- a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
+++ b/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
@@ -1,6 +1,7 @@
1
2Upstream-Status: Inappropriate [opensuse patch] 1Upstream-Status: Inappropriate [opensuse patch]
3 2
3Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
4
4Index: guile-2.0.3/libguile/hash.c 5Index: guile-2.0.3/libguile/hash.c
5=================================================================== 6===================================================================
6--- guile-2.0.3.orig/libguile/hash.c 2011-07-06 15:49:59.000000000 -0700 7--- guile-2.0.3.orig/libguile/hash.c 2011-07-06 15:49:59.000000000 -0700
diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch b/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
index ed56694a98..e201486284 100644
--- a/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
+++ b/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
@@ -1,6 +1,7 @@
1
2Upstream-Status: Inappropriate [opensuse patch] 1Upstream-Status: Inappropriate [opensuse patch]
3 2
3Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
4
4See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10096 5See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10096
5why this test is turned off. 6why this test is turned off.
6Index: guile-2.0.3/test-suite/tests/gc.test 7Index: guile-2.0.3/test-suite/tests/gc.test
diff --git a/meta/recipes-devtools/guile/guile_2.0.3.bb b/meta/recipes-devtools/guile/guile_2.0.5.bb
index 164ab8c647..db75863d34 100644
--- a/meta/recipes-devtools/guile/guile_2.0.3.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.5.bb
@@ -14,17 +14,19 @@ LICENSE = "GPLv3"
14LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 14LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
15 15
16SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \ 16SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
17 file://debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch \ 17 file://debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch \
18 file://debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch \ 18 file://debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch \
19 file://debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch \
20 file://opensuse/guile-64bit.patch \ 19 file://opensuse/guile-64bit.patch \
21 file://opensuse/guile-turn-off-gc-test.patch \ 20 file://guile_2.0.5_fix_sed_error.patch \
22 " 21 "
23 22
24SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8" 23# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
25SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08" 24# file://opensuse/guile-turn-off-gc-test.patch
26 25
27PR = "r5" 26SRC_URI[md5sum] = "bcf70d54b44c99cb9acd3f63c5486b4b"
27SRC_URI[sha256sum] = "2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956"
28
29PR = "r0"
28 30
29inherit autotools gettext 31inherit autotools gettext
30BBCLASSEXTEND = "native" 32BBCLASSEXTEND = "native"