GNU bug report logs -
#20819
[PATCH] i18n: check for non-POSIX strtol_l
Previous Next
Reported by: Natanael Copa <ncopa <at> alpinelinux.org>
Date: Mon, 15 Jun 2015 15:28:02 UTC
Severity: normal
Tags: patch
Done: Mark H Weaver <mhw <at> netris.org>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your message dated Fri, 19 Jun 2015 16:09:06 -0400
with message-id <87pp4rbgv1.fsf <at> netris.org>
and subject line Re: bug#20819: [PATCH] i18n: check for non-POSIX strtol_l
has caused the debbugs.gnu.org bug report #20819,
regarding [PATCH] i18n: check for non-POSIX strtol_l
to be marked as done.
(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)
--
20819: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20819
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
* configure.ac: Check for strtol_l
* libguile/i18n.c: Check with HAVE_STRTOL_L before using strtol_l. This
fixes build with musl libc.
---
configure.ac | 5 +++--
libguile/i18n.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 19e00d8..b73a0db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -752,6 +752,7 @@ AC_CHECK_HEADERS([assert.h crt_externs.h])
# isblank - available as a GNU extension or in C99
# _NSGetEnviron - Darwin specific
# strcoll_l, newlocale, uselocale, utimensat - POSIX.1-2008
+# strtol_l - non-POSIX, found in glibc and BSD
# fork - unavailable on Windows
# sched_getaffinity, sched_setaffinity - GNU extensions (glibc)
# sendfile - non-POSIX, found in glibc
@@ -765,8 +766,8 @@ AC_CHECK_FUNCS([DINFINITY DQNAN cexp chsize clog clog10 ctermid \
strdup system usleep atexit on_exit chown link fcntl ttyname getpwent \
getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp \
index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron \
- strcoll strcoll_l newlocale uselocale utimensat sched_getaffinity \
- sched_setaffinity sendfile])
+ strcoll strcoll_l strtol_l newlocale uselocale utimensat \
+ sched_getaffinity sched_setaffinity sendfile])
# Reasons for testing:
# netdb.h - not in mingw
diff --git a/libguile/i18n.c b/libguile/i18n.c
index f0e3443..17e9eca 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -1373,7 +1373,7 @@ SCM_DEFINE (scm_locale_string_to_integer, "locale-string->integer",
if (c_locale != NULL)
{
-#ifdef USE_GNU_LOCALE_API
+#if defined(USE_GNU_LOCALE_API) && defined(HAVE_STRTOL_L)
c_result = strtol_l (c_str, &c_endptr, c_base, c_locale);
#else
RUN_IN_LOCALE_SECTION (c_locale,
--
2.4.3
[Message part 3 (message/rfc822, inline)]
Natanael Copa <ncopa <at> alpinelinux.org> writes:
> * configure.ac: Check for strtol_l
> * libguile/i18n.c: Check with HAVE_STRTOL_L before using strtol_l. This
> fixes build with musl libc.
Pushed (with slight modifications) to stable-2.0.
Thanks!
Mark
This bug report was last modified 9 years and 335 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.