diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-12-20 22:17:11 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-05 13:54:05 +0000 |
commit | e8852827fc56e2e3c8769c252761dca56b689261 (patch) | |
tree | 401d5a26e1ab0d360c9ac4245c21cfcdfdb096de /meta/recipes-devtools | |
parent | aa31fe37e21d4e78ee0c0bb878e246e2178da05b (diff) | |
download | poky-e8852827fc56e2e3c8769c252761dca56b689261.tar.gz |
guile: 2.0.12 -> 2.0.13
Remove 0002-Recognize-nios2-as-compilation-target.patch which is already
in the source.
(From OE-Core rev: a2b7f442d8872afe8edec062c60264b31e860218)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@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/0002-Recognize-nios2-as-compilation-target.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/guile/guile_2.0.13.bb (renamed from meta/recipes-devtools/guile/guile_2.0.12.bb) | 5 |
2 files changed, 2 insertions, 35 deletions
diff --git a/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch b/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch deleted file mode 100644 index 8e84747704..0000000000 --- a/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 76155065c70b5ab65c6c805423183b360141db84 Mon Sep 17 00:00:00 2001 | ||
2 | From: Marek Vasut <marex@denx.de> | ||
3 | Date: Thu, 28 Jan 2016 04:46:23 +0100 | ||
4 | Subject: [PATCH] Recognize nios2 as compilation target | ||
5 | |||
6 | Signed-off-by: Marek Vasut <marex@denx.de> | ||
7 | Upstream-Status: Submitted [ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22480 ] | ||
8 | --- | ||
9 | module/system/base/target.scm | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/module/system/base/target.scm b/module/system/base/target.scm | ||
13 | --- a/module/system/base/target.scm | ||
14 | +++ b/module/system/base/target.scm | ||
15 | @@ -65,7 +65,7 @@ | ||
16 | (cond ((string-match "^i[0-9]86$" cpu) | ||
17 | (endianness little)) | ||
18 | ((member cpu '("x86_64" "ia64" | ||
19 | - "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4")) | ||
20 | + "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4" "nios2")) | ||
21 | (endianness little)) | ||
22 | ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu" | ||
23 | "mips" "mips64" "m68k" "s390x")) | ||
24 | @@ -108,7 +108,7 @@ | ||
25 | |||
26 | ((string-match "64$" cpu) 8) | ||
27 | ((string-match "64_?[lbe][lbe]$" cpu) 8) | ||
28 | - ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4")) 4) | ||
29 | + ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4" "nios2")) 4) | ||
30 | ((member cpu '("s390x")) 8) | ||
31 | ((string-match "^arm.*" cpu) 4) | ||
32 | (else (error "unknown CPU word size" cpu))))) | ||
diff --git a/meta/recipes-devtools/guile/guile_2.0.12.bb b/meta/recipes-devtools/guile/guile_2.0.13.bb index d2fe511ae4..dd38b47993 100644 --- a/meta/recipes-devtools/guile/guile_2.0.12.bb +++ b/meta/recipes-devtools/guile/guile_2.0.13.bb | |||
@@ -22,11 +22,10 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \ | |||
22 | file://arm_aarch64.patch \ | 22 | file://arm_aarch64.patch \ |
23 | file://workaround-ice-ssa-corruption.patch \ | 23 | file://workaround-ice-ssa-corruption.patch \ |
24 | file://libguile-Makefile.am-hook.patch \ | 24 | file://libguile-Makefile.am-hook.patch \ |
25 | file://0002-Recognize-nios2-as-compilation-target.patch \ | ||
26 | " | 25 | " |
27 | 26 | ||
28 | SRC_URI[md5sum] = "081fdf80cd3a76f260a2a0d87f773d6b" | 27 | SRC_URI[md5sum] = "d50bbb19672b72aa1e1c96e8f024bf00" |
29 | SRC_URI[sha256sum] = "de8187736f9b260f2fa776ed39b52cb74dd389ccf7039c042f0606270196b7e9" | 28 | SRC_URI[sha256sum] = "3744f2addc282a0de627aaef048f062982b44564d54ac31ff5217972529ed88b" |
30 | 29 | ||
31 | inherit autotools gettext pkgconfig texinfo | 30 | inherit autotools gettext pkgconfig texinfo |
32 | BBCLASSEXTEND = "native" | 31 | BBCLASSEXTEND = "native" |