summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2016-02-10 01:04:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:49 +0000
commit954dc4524dda2241feadaddd0831f25c82b15f76 (patch)
tree37286ae3ca6378aaef17ef66be1f5fa2659a44b6
parent611e3d87d81364b19888afcaa03d328a64bdcdb0 (diff)
downloadpoky-954dc4524dda2241feadaddd0831f25c82b15f76.tar.gz
guile: Fix nios2 support
Add minor patch to recognize nios2 build target. (From OE-Core rev: b2a5f9e98fd6bd7e1deeb0cd83587eb567ed6d75) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.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.patch36
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.11.bb1
2 files changed, 37 insertions, 0 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
new file mode 100644
index 0000000000..519585b8e9
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch
@@ -0,0 +1,36 @@
1From 76155065c70b5ab65c6c805423183b360141db84 Mon Sep 17 00:00:00 2001
2From: Marek Vasut <marex@denx.de>
3Date: Thu, 28 Jan 2016 04:46:23 +0100
4Subject: [PATCH] Recognize nios2 as compilation target
5
6Signed-off-by: Marek Vasut <marex@denx.de>
7Upstream-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
12diff --git a/module/system/base/target.scm b/module/system/base/target.scm
13index d60a8e0..d1f6cff 100644
14--- a/module/system/base/target.scm
15+++ b/module/system/base/target.scm
16@@ -65,7 +65,7 @@
17 (cond ((string-match "^i[0-9]86$" cpu)
18 (endianness little))
19 ((member cpu '("x86_64" "ia64"
20- "powerpcle" "powerpc64le" "mipsel" "mips64el"))
21+ "powerpcle" "powerpc64le" "mipsel" "mips64el" "nios2"))
22 (endianness little))
23 ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu"
24 "mips" "mips64"))
25@@ -100,7 +100,7 @@
26
27 ((string-match "64$" cpu) 8)
28 ((string-match "64[lbe][lbe]$" cpu) 8)
29- ((member cpu '("sparc" "powerpc" "mips" "mipsel")) 4)
30+ ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2")) 4)
31 ((string-match "^arm.*" cpu) 4)
32 (else (error "unknown CPU word size" cpu)))))
33
34--
352.7.0.rc3
36
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb
index 6815e257d9..6cefe66496 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.11.bb
@@ -25,6 +25,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
25 file://libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch \ 25 file://libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch \
26 file://remove_strcase_l_funcs.patch \ 26 file://remove_strcase_l_funcs.patch \
27 file://0001-libguile-Check-for-strtol_l-during-configure.patch \ 27 file://0001-libguile-Check-for-strtol_l-during-configure.patch \
28 file://0002-Recognize-nios2-as-compilation-target.patch \
28 " 29 "
29 30
30# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 31# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch