diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-12-29 01:18:47 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:47 +0000 |
| commit | e00dbd3863bebab02bb3e0c51bfc24a3079585d0 (patch) | |
| tree | d37ebce4007235f5a750f771d281bcfcad9007d4 /meta/recipes-devtools/guile | |
| parent | 86a801b970ab1e796d7c851755719e4b125d11fd (diff) | |
| download | openembedded-core-contrib-e00dbd3863bebab02bb3e0c51bfc24a3079585d0.tar.gz | |
guile: Fix build with uclibc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-devtools/guile')
| -rw-r--r-- | meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-devtools/guile/guile_2.0.11.bb | 3 |
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 @@ +These unused functions cause build failures with uclibc since they reference __uclibc_locale_struct +and this is exposed by uclibc API headers only if C locales are built, but for OE we build full locale +support + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending +Index: guile-2.0.11/libguile/i18n.c +=================================================================== +--- guile-2.0.11.orig/libguile/i18n.c ++++ guile-2.0.11/libguile/i18n.c +@@ -851,27 +851,6 @@ str_downcase (register char *dst, regist + *dst = '\0'; + } + +-#ifdef USE_GNU_LOCALE_API +-static inline void +-str_upcase_l (register char *dst, register const char *src, +- scm_t_locale locale) +-{ +- for (; *src != '\0'; src++, dst++) +- *dst = toupper_l (*src, locale); +- *dst = '\0'; +-} +- +-static inline void +-str_downcase_l (register char *dst, register const char *src, +- scm_t_locale locale) +-{ +- for (; *src != '\0'; src++, dst++) +- *dst = tolower_l (*src, locale); +- *dst = '\0'; +-} +-#endif +- +- + SCM_DEFINE (scm_string_locale_lt, "string-locale<?", 2, 1, 0, + (SCM s1, SCM s2, SCM locale), + "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 \ file://workaround-ice-ssa-corruption.patch \ file://libguile-Makefile.am-hook.patch \ file://libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch \ + file://remove_strcase_l_funcs.patch \ " # 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 EXTRA_OECONF_append_class-target = " --with-libunistring-prefix=${STAGING_LIBDIR} \ --with-libgmp-prefix=${STAGING_LIBDIR} \ --with-libltdl-prefix=${STAGING_LIBDIR}" - +EXTRA_OECONF_append_libc-uclibc = " guile_cv_use_csqrt=no " do_configure_prepend() { mkdir -p po } |