summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-29 01:18:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:27 +0000
commit493e5572c855d60e7543d2389d8803605d67a618 (patch)
tree1775b16331d16220d9f738287e1502d269eb8201 /meta
parent1636f6fdeabc540ad41acc783e7ee21c6dc3e6eb (diff)
downloadpoky-493e5572c855d60e7543d2389d8803605d67a618.tar.gz
guile: Fix build with uclibc
(From OE-Core rev: e00dbd3863bebab02bb3e0c51bfc24a3079585d0) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch38
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.11.bb3
2 files changed, 40 insertions, 1 deletions
diff --git a/meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch b/meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch
new file mode 100644
index 0000000000..e7a06fef17
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch
@@ -0,0 +1,38 @@
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.11.bb
index fa45008e07..413c81daac 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.11.bb
@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
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 \ 25 file://libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch \
26 file://remove_strcase_l_funcs.patch \
26 " 27 "
27 28
28# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 29# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
@@ -50,7 +51,7 @@ EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix --without
50EXTRA_OECONF_append_class-target = " --with-libunistring-prefix=${STAGING_LIBDIR} \ 51EXTRA_OECONF_append_class-target = " --with-libunistring-prefix=${STAGING_LIBDIR} \
51 --with-libgmp-prefix=${STAGING_LIBDIR} \ 52 --with-libgmp-prefix=${STAGING_LIBDIR} \
52 --with-libltdl-prefix=${STAGING_LIBDIR}" 53 --with-libltdl-prefix=${STAGING_LIBDIR}"
53 54EXTRA_OECONF_append_libc-uclibc = " guile_cv_use_csqrt=no "
54do_configure_prepend() { 55do_configure_prepend() {
55 mkdir -p po 56 mkdir -p po
56} 57}