aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-12-20 22:17:11 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-05 13:54:05 +0000
commite8852827fc56e2e3c8769c252761dca56b689261 (patch)
tree401d5a26e1ab0d360c9ac4245c21cfcdfdb096de
parentaa31fe37e21d4e78ee0c0bb878e246e2178da05b (diff)
downloadopenembedded-core-contrib-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>
-rw-r--r--meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch32
-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 @@
-From 76155065c70b5ab65c6c805423183b360141db84 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Thu, 28 Jan 2016 04:46:23 +0100
-Subject: [PATCH] Recognize nios2 as compilation target
-
-Signed-off-by: Marek Vasut <marex@denx.de>
-Upstream-Status: Submitted [ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22480 ]
----
- module/system/base/target.scm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/module/system/base/target.scm b/module/system/base/target.scm
---- a/module/system/base/target.scm
-+++ b/module/system/base/target.scm
-@@ -65,7 +65,7 @@
- (cond ((string-match "^i[0-9]86$" cpu)
- (endianness little))
- ((member cpu '("x86_64" "ia64"
-- "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4"))
-+ "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4" "nios2"))
- (endianness little))
- ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu"
- "mips" "mips64" "m68k" "s390x"))
-@@ -108,7 +108,7 @@
-
- ((string-match "64$" cpu) 8)
- ((string-match "64_?[lbe][lbe]$" cpu) 8)
-- ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4")) 4)
-+ ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4" "nios2")) 4)
- ((member cpu '("s390x")) 8)
- ((string-match "^arm.*" cpu) 4)
- (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 \
file://arm_aarch64.patch \
file://workaround-ice-ssa-corruption.patch \
file://libguile-Makefile.am-hook.patch \
- file://0002-Recognize-nios2-as-compilation-target.patch \
"
-SRC_URI[md5sum] = "081fdf80cd3a76f260a2a0d87f773d6b"
-SRC_URI[sha256sum] = "de8187736f9b260f2fa776ed39b52cb74dd389ccf7039c042f0606270196b7e9"
+SRC_URI[md5sum] = "d50bbb19672b72aa1e1c96e8f024bf00"
+SRC_URI[sha256sum] = "3744f2addc282a0de627aaef048f062982b44564d54ac31ff5217972529ed88b"
inherit autotools gettext pkgconfig texinfo
BBCLASSEXTEND = "native"