summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/guile/files/0001-libguile-Check-for-strtol_l-during-configure.patch56
-rw-r--r--meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch20
-rw-r--r--meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch43
-rw-r--r--meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch38
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.12.bb (renamed from meta/recipes-devtools/guile/guile_2.0.11.bb)11
5 files changed, 10 insertions, 158 deletions
diff --git a/meta/recipes-devtools/guile/files/0001-libguile-Check-for-strtol_l-during-configure.patch b/meta/recipes-devtools/guile/files/0001-libguile-Check-for-strtol_l-during-configure.patch
deleted file mode 100644
index 24f073f9fb..0000000000
--- a/meta/recipes-devtools/guile/files/0001-libguile-Check-for-strtol_l-during-configure.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 814d6fb6c1f4a544c8fd37f5a390ba020c2d8c85 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 10 Jan 2016 22:28:17 +0000
4Subject: [PATCH] libguile: Check for strtol_l during configure
5
6strtol_l is a gnu extention which may not be available on other linux
7libc implementations e.g. musl. Therefore check for this funciton and
8conditionalize the use of it.
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 configure.ac | 5 +++--
15 libguile/i18n.c | 2 +-
16 2 files changed, 4 insertions(+), 3 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index 3969929..f8a6a1a 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -752,7 +752,8 @@ AC_CHECK_HEADERS([assert.h crt_externs.h])
23 # truncate - not in mingw
24 # isblank - available as a GNU extension or in C99
25 # _NSGetEnviron - Darwin specific
26-# strcoll_l, newlocale - GNU extensions (glibc), also available on Darwin
27+# strcoll_l, newlocale, strtol_l - GNU extensions (glibc),
28+# also available on Darwin
29 # fork - unavailable on Windows
30 # utimensat - posix.1-2008
31 # sched_getaffinity, sched_setaffinity - GNU extensions (glibc)
32@@ -768,7 +769,7 @@ AC_CHECK_FUNCS([DINFINITY DQNAN cexp chsize clog clog10 ctermid \
33 getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp \
34 index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron \
35 strcoll strcoll_l newlocale utimensat sched_getaffinity \
36- sched_setaffinity sendfile])
37+ sched_setaffinity sendfile strtol_l])
38
39 AM_CONDITIONAL([BUILD_ICE_9_POPEN],
40 [test "x$enable_posix" = "xyes" && test "x$ac_cv_func_fork" = "xyes"])
41diff --git a/libguile/i18n.c b/libguile/i18n.c
42index 97d44b0..9fb6976 100644
43--- a/libguile/i18n.c
44+++ b/libguile/i18n.c
45@@ -1352,7 +1352,7 @@ SCM_DEFINE (scm_locale_string_to_integer, "locale-string->integer",
46
47 if (c_locale != NULL)
48 {
49-#ifdef USE_GNU_LOCALE_API
50+#if defined(USE_GNU_LOCALE_API) && defined(HAVE_STRTOL_L)
51 c_result = strtol_l (c_str, &c_endptr, c_base, c_locale);
52 #else
53 RUN_IN_LOCALE_SECTION (c_locale,
54--
552.7.0
56
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
index 519585b8e9..8e84747704 100644
--- 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
@@ -10,27 +10,23 @@ Upstream-Status: Submitted [ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22480
10 1 file changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 2 insertions(+), 2 deletions(-)
11 11
12diff --git a/module/system/base/target.scm b/module/system/base/target.scm 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 13--- a/module/system/base/target.scm
15+++ b/module/system/base/target.scm 14+++ b/module/system/base/target.scm
16@@ -65,7 +65,7 @@ 15@@ -65,7 +65,7 @@
17 (cond ((string-match "^i[0-9]86$" cpu) 16 (cond ((string-match "^i[0-9]86$" cpu)
18 (endianness little)) 17 (endianness little))
19 ((member cpu '("x86_64" "ia64" 18 ((member cpu '("x86_64" "ia64"
20- "powerpcle" "powerpc64le" "mipsel" "mips64el")) 19- "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4"))
21+ "powerpcle" "powerpc64le" "mipsel" "mips64el" "nios2")) 20+ "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4" "nios2"))
22 (endianness little)) 21 (endianness little))
23 ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu" 22 ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu"
24 "mips" "mips64")) 23 "mips" "mips64" "m68k" "s390x"))
25@@ -100,7 +100,7 @@ 24@@ -108,7 +108,7 @@
26 25
27 ((string-match "64$" cpu) 8) 26 ((string-match "64$" cpu) 8)
28 ((string-match "64[lbe][lbe]$" cpu) 8) 27 ((string-match "64_?[lbe][lbe]$" cpu) 8)
29- ((member cpu '("sparc" "powerpc" "mips" "mipsel")) 4) 28- ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4")) 4)
30+ ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2")) 4) 29+ ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4" "nios2")) 4)
30 ((member cpu '("s390x")) 8)
31 ((string-match "^arm.*" cpu) 4) 31 ((string-match "^arm.*" cpu) 4)
32 (else (error "unknown CPU word size" cpu))))) 32 (else (error "unknown CPU word size" cpu)))))
33
34--
352.7.0.rc3
36
diff --git a/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch b/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
deleted file mode 100644
index e50059a7e6..0000000000
--- a/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From a85c78ea1393985fdb6e6678dea19135c553d341 Mon Sep 17 00:00:00 2001
2From: Mark H Weaver <mhw@netris.org>
3Date: Fri, 19 Sep 2014 21:18:09 -0400
4Subject: [PATCH] VM: ASM_MUL for ARM: Add earlyclobber constraint to the SMULL
5 outputs.
6
7Reported by Rob Browning <rlb@defaultvalue.org>.
8
9* libguile/vm-i-scheme.c (ASM_MUL)[ARM]: Add earlyclobber (&) constraint
10 to the SMULL output registers.
11
12Author: Mark H Weaver <mhw@netris.org>
13
14Upstream-Status: Backport
15
16Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
17---
18 libguile/vm-i-scheme.c | 5 ++---
19 1 file changed, 2 insertions(+), 3 deletions(-)
20
21diff --git a/libguile/vm-i-scheme.c b/libguile/vm-i-scheme.c
22index 587aa95..162efab 100644
23--- a/libguile/vm-i-scheme.c
24+++ b/libguile/vm-i-scheme.c
25@@ -1,5 +1,4 @@
26-/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013,
27- * 2014 Free Software Foundation, Inc.
28+/* Copyright (C) 2001, 2009-2014 Free Software Foundation, Inc.
29 *
30 * This library is free software; you can redistribute it and/or
31 * modify it under the terms of the GNU Lesser General Public License
32@@ -363,7 +362,7 @@ VM_DEFINE_FUNCTION (149, ge, "ge?", 2)
33 { \
34 scm_t_signed_bits rlo, rhi; \
35 asm ("smull %0, %1, %2, %3\n" \
36- : "=r" (rlo), "=r" (rhi) \
37+ : "=&r" (rlo), "=&r" (rhi) \
38 : "r" (SCM_UNPACK (x) - scm_tc2_int), \
39 "r" (SCM_I_INUM (y))); \
40 if (SCM_LIKELY (SCM_SRS (rlo, 31) == rhi)) \
41--
422.3.5
43
diff --git a/meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch b/meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch
deleted file mode 100644
index e7a06fef17..0000000000
--- a/meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1These unused functions cause build failures with uclibc since they reference __uclibc_locale_struct
2and this is exposed by uclibc API headers only if C locales are built, but for OE we build full locale
3support
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Pending
7Index: guile-2.0.11/libguile/i18n.c
8===================================================================
9--- guile-2.0.11.orig/libguile/i18n.c
10+++ guile-2.0.11/libguile/i18n.c
11@@ -851,27 +851,6 @@ str_downcase (register char *dst, regist
12 *dst = '\0';
13 }
14
15-#ifdef USE_GNU_LOCALE_API
16-static inline void
17-str_upcase_l (register char *dst, register const char *src,
18- scm_t_locale locale)
19-{
20- for (; *src != '\0'; src++, dst++)
21- *dst = toupper_l (*src, locale);
22- *dst = '\0';
23-}
24-
25-static inline void
26-str_downcase_l (register char *dst, register const char *src,
27- scm_t_locale locale)
28-{
29- for (; *src != '\0'; src++, dst++)
30- *dst = tolower_l (*src, locale);
31- *dst = '\0';
32-}
33-#endif
34-
35-
36 SCM_DEFINE (scm_string_locale_lt, "string-locale<?", 2, 1, 0,
37 (SCM s1, SCM s2, SCM locale),
38 "Compare strings @var{s1} and @var{s2} in a locale-dependent way."
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.12.bb
index 6cefe66496..d2fe511ae4 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.12.bb
@@ -22,18 +22,11 @@ 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://libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch \
26 file://remove_strcase_l_funcs.patch \
27 file://0001-libguile-Check-for-strtol_l-during-configure.patch \
28 file://0002-Recognize-nios2-as-compilation-target.patch \ 25 file://0002-Recognize-nios2-as-compilation-target.patch \
29 " 26 "
30 27
31# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 28SRC_URI[md5sum] = "081fdf80cd3a76f260a2a0d87f773d6b"
32# file://opensuse/guile-turn-off-gc-test.patch 29SRC_URI[sha256sum] = "de8187736f9b260f2fa776ed39b52cb74dd389ccf7039c042f0606270196b7e9"
33
34SRC_URI[md5sum] = "03f1bce1a4983076d955003472306a13"
35SRC_URI[sha256sum] = "aed0a4a6db4e310cbdfeb3613fa6f86fddc91ef624c1e3f8937a6304c69103e2"
36
37 30
38inherit autotools gettext pkgconfig texinfo 31inherit autotools gettext pkgconfig texinfo
39BBCLASSEXTEND = "native" 32BBCLASSEXTEND = "native"