diff options
author | Chong Lu <Chong.Lu@windriver.com> | 2014-05-20 09:28:26 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-21 19:50:21 +0100 |
commit | 894df445fa71a170397c6e0b4960a89ef20a4230 (patch) | |
tree | 33dad3b34d2a12b98bf66268fadc98229bea2e94 /meta/recipes-devtools | |
parent | da3a742587514573d1bb3b4bf88fd0ca01370f31 (diff) | |
download | poky-894df445fa71a170397c6e0b4960a89ef20a4230.tar.gz |
guile: Update to 2.0.11 version
Upgrade guile to 2.0.11 version and remove unneeded patch since
it's included in new version.
(From OE-Core rev: f1727bb18f35ff01e53d3d442a6ff3c613639fa6)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch | 65 | ||||
-rw-r--r-- | meta/recipes-devtools/guile/guile_2.0.11.bb (renamed from meta/recipes-devtools/guile/guile_2.0.9.bb) | 5 |
2 files changed, 2 insertions, 68 deletions
diff --git a/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch b/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch deleted file mode 100644 index 3f65dce72c..0000000000 --- a/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | From 36c40440078c005cd5e239cca487d29f6f60007d Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark H Weaver <mhw@netris.org> | ||
3 | Date: Mon, 4 Nov 2013 19:41:52 -0500 | ||
4 | Subject: [PATCH] Don't use the identifier 'noreturn'. | ||
5 | |||
6 | Fixes <http://bugs.gnu.org/15798>. | ||
7 | Reported by Matt Sicker <boards@gmail.com>. | ||
8 | |||
9 | * libguile/__scm.h (SCM_NORETURN): Use ((__noreturn__)) instead of | ||
10 | ((noreturn)). | ||
11 | |||
12 | * libguile/throw.h (scm_ithrow): Rename formal parameter from 'noreturn' | ||
13 | to 'no_return'. | ||
14 | |||
15 | * libguile/throw.c (scm_ithrow): Rename formal parameter from 'noreturn' | ||
16 | to 'no_return'. | ||
17 | --- | ||
18 | libguile/__scm.h | 2 +- | ||
19 | libguile/throw.c | 2 +- | ||
20 | libguile/throw.h | 2 +- | ||
21 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
22 | |||
23 | Upstream-Status: Backport | ||
24 | |||
25 | diff --git a/libguile/__scm.h b/libguile/__scm.h | ||
26 | index ed35d53..a0b02b6 100644 | ||
27 | --- a/libguile/__scm.h | ||
28 | +++ b/libguile/__scm.h | ||
29 | @@ -77,7 +77,7 @@ | ||
30 | * 1) int foo (char arg) SCM_NORETURN; | ||
31 | */ | ||
32 | #ifdef __GNUC__ | ||
33 | -#define SCM_NORETURN __attribute__ ((noreturn)) | ||
34 | +#define SCM_NORETURN __attribute__ ((__noreturn__)) | ||
35 | #else | ||
36 | #define SCM_NORETURN | ||
37 | #endif | ||
38 | diff --git a/libguile/throw.c b/libguile/throw.c | ||
39 | index 9c29351..7fc9edf 100644 | ||
40 | --- a/libguile/throw.c | ||
41 | +++ b/libguile/throw.c | ||
42 | @@ -436,7 +436,7 @@ scm_handle_by_throw (void *handler_data SCM_UNUSED, SCM tag, SCM args) | ||
43 | } | ||
44 | |||
45 | SCM | ||
46 | -scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED) | ||
47 | +scm_ithrow (SCM key, SCM args, int no_return SCM_UNUSED) | ||
48 | { | ||
49 | return scm_throw (key, args); | ||
50 | } | ||
51 | diff --git a/libguile/throw.h b/libguile/throw.h | ||
52 | index 6cf6790..62592d2 100644 | ||
53 | --- a/libguile/throw.h | ||
54 | +++ b/libguile/throw.h | ||
55 | @@ -79,7 +79,7 @@ SCM_API int scm_exit_status (SCM args); | ||
56 | SCM_API SCM scm_catch_with_pre_unwind_handler (SCM tag, SCM thunk, SCM handler, SCM lazy_handler); | ||
57 | SCM_API SCM scm_catch (SCM tag, SCM thunk, SCM handler); | ||
58 | SCM_API SCM scm_with_throw_handler (SCM tag, SCM thunk, SCM handler); | ||
59 | -SCM_API SCM scm_ithrow (SCM key, SCM args, int noreturn); | ||
60 | +SCM_API SCM scm_ithrow (SCM key, SCM args, int no_return); | ||
61 | |||
62 | SCM_API SCM scm_throw (SCM key, SCM args); | ||
63 | SCM_INTERNAL void scm_init_throw (void); | ||
64 | -- | ||
65 | 1.7.2.5 | ||
diff --git a/meta/recipes-devtools/guile/guile_2.0.9.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb index b35d54e7d2..c597111826 100644 --- a/meta/recipes-devtools/guile/guile_2.0.9.bb +++ b/meta/recipes-devtools/guile/guile_2.0.11.bb | |||
@@ -19,14 +19,13 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \ | |||
19 | file://opensuse/guile-64bit.patch \ | 19 | file://opensuse/guile-64bit.patch \ |
20 | file://guile_2.0.6_fix_sed_error.patch \ | 20 | file://guile_2.0.6_fix_sed_error.patch \ |
21 | file://arm_endianness.patch \ | 21 | file://arm_endianness.patch \ |
22 | file://guile_2.0.9_fix_noreturn.patch \ | ||
23 | " | 22 | " |
24 | 23 | ||
25 | # file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch | 24 | # file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch |
26 | # file://opensuse/guile-turn-off-gc-test.patch | 25 | # file://opensuse/guile-turn-off-gc-test.patch |
27 | 26 | ||
28 | SRC_URI[md5sum] = "a69b575d4a633bdd9118f3a4a1e97766" | 27 | SRC_URI[md5sum] = "03f1bce1a4983076d955003472306a13" |
29 | SRC_URI[sha256sum] = "f70a38c8d9751f442679bfe61852bba8545af4d4355d037630997c2f37f2895b" | 28 | SRC_URI[sha256sum] = "aed0a4a6db4e310cbdfeb3613fa6f86fddc91ef624c1e3f8937a6304c69103e2" |
30 | 29 | ||
31 | 30 | ||
32 | inherit autotools gettext texinfo | 31 | inherit autotools gettext texinfo |