iconv_open-utf.m4

Show log
Commit

Hash : 86a9695e
Author :
Date : 2023-02-17T16:24:34

Improve cross-compilation from midipix.

Reported by Ørjan Malde <red@foxi.me> at
<https://lists.gnu.org/archive/html/bug-gnulib/2023-02/msg00131.html>.

Since midipix consists of musl libc based on an emulation of Linux system
calls, for pure libc functionality it can be treated like musl libc.

* m4/calloc.m4 (_AC_FUNC_CALLOC_IF): Treat midipix like systems with
musl libc.
* m4/cbrtl.m4 (gl_FUNC_CBRTL): Likewise.
* m4/ceil.m4 (gl_FUNC_CEIL): Likewise.
* m4/ceilf.m4 (gl_FUNC_CEILF): Likewise.
* m4/ceill.m4 (gl_FUNC_CEILL): Likewise.
* m4/exp2l.m4 (gl_FUNC_EXP2L): Likewise.
* m4/expl.m4 (gl_FUNC_EXPL): Likewise.
* m4/expm1.m4 (gl_FUNC_EXPM1): Likewise.
* m4/expm1f.m4 (gl_FUNC_EXPM1F): Likewise.
* m4/expm1l.m4 (gl_FUNC_EXPM1L): Likewise.
* m4/fclose.m4 (gl_FUNC_FCLOSE_STDIN): Likewise.
* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Likewise.
* m4/ffsll.m4 (gl_FUNC_FFSLL): Likewise.
* m4/floor.m4 (gl_FUNC_FLOOR): Likewise.
* m4/floorf.m4 (gl_FUNC_FLOORF): Likewise.
* m4/fmod.m4 (gl_FUNC_FMOD): Likewise.
* m4/fmodf.m4 (gl_FUNC_FMODF): Likewise.
* m4/fmodl.m4 (gl_FUNC_FMODL): Likewise.
* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): Likewise.
* m4/fopen.m4 (gl_FUNC_FOPEN_GNU): Likewise.
* m4/fpurge.m4 (gl_FUNC_FPURGE): Likewise.
* m4/getdelim.m4 (gl_FUNC_GETDELIM): Likewise.
* m4/getline.m4 (gl_FUNC_GETLINE): Likewise.
* m4/hypot.m4 (gl_FUNC_HYPOT): Likewise.
* m4/hypotf.m4 (gl_FUNC_HYPOTF): Likewise.
* m4/hypotl.m4 (gl_FUNC_HYPOTL): Likewise.
* m4/iconv_open-utf.m4 (gl_FUNC_ICONV_OPEN_UTF_SUPPORT): Likewise.
* m4/log.m4 (gl_FUNC_LOG): Likewise.
* m4/log10.m4 (gl_FUNC_LOG10): Likewise.
* m4/log10f.m4 (gl_FUNC_LOG10F): Likewise.
* m4/log10l.m4 (gl_FUNC_LOG10L_WORKS): Likewise.
* m4/log1p.m4 (gl_FUNC_LOG1P): Likewise.
* m4/log1pf.m4 (gl_FUNC_LOG1PF): Likewise.
* m4/log1pl.m4 (gl_FUNC_LOG1PL, gl_FUNC_LOG1PL_WORKS): Likewise.
* m4/log2.m4 (gl_FUNC_LOG2): Likewise.
* m4/log2f.m4 (gl_FUNC_LOG2F): Likewise.
* m4/log2l.m4 (gl_FUNC_LOG2L_WORKS): Likewise.
* m4/logf.m4 (gl_FUNC_LOGF): Likewise.
* m4/logl.m4 (gl_FUNC_LOGL_WORKS): Likewise.
* m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Likewise.
* m4/mkstemp.m4 (gl_FUNC_MKSTEMP): Likewise.
* m4/modf.m4 (gl_FUNC_MODF): Likewise.
* m4/modff.m4 (gl_FUNC_MODFF): Likewise.
* m4/modfl.m4 (gl_FUNC_MODFL): Likewise.
* m4/musl.m4 (gl_MUSL_LIBC): Likewise.
* m4/perror.m4 (gl_FUNC_PERROR): Likewise.
* m4/posix_spawn.m4 (gl_POSIX_SPAWN_SECURE,
gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE,
gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2,
gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN): Likewise.
* m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_INFINITE,
gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_A,
gl_PRINTF_DIRECTIVE_F, gl_PRINTF_FLAG_ZERO, gl_SNPRINTF_TRUNCATION_C99,
gl_SNPRINTF_RETVAL_C99, gl_SNPRINTF_DIRECTIVE_N,
gl_VSNPRINTF_ZEROSIZE_C99): Likewise.
* m4/pthread_rwlock_rdlock.m4 (gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER):
Likewise.
* m4/putenv.m4 (gl_FUNC_PUTENV): Likewise.
* m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise.
* m4/remainder.m4 (gl_FUNC_REMAINDER): Likewise.
* m4/remainderf.m4 (gl_FUNC_REMAINDERF): Likewise.
* m4/remainderl.m4 (gl_FUNC_REMAINDERL, gl_FUNC_REMAINDERL_WORKS):
Likewise.
* m4/rintl.m4 (gl_FUNC_RINTL): Likewise.
* m4/round.m4 (gl_FUNC_ROUND): Likewise.
* m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise.
* m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise.
* m4/setenv.m4 (gl_FUNC_SETENV): Likewise.
* m4/setlocale_null.m4 (gl_FUNC_SETLOCALE_NULL): Likewise.
* m4/signbit.m4 (gl_SIGNBIT): Likewise.
* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Likewise.
* m4/strerror.m4 (gl_FUNC_STRERROR, gl_FUNC_STRERROR_0): Likewise.
* m4/strtod.m4 (gl_FUNC_STRTOD): Likewise.
* m4/strtold.m4 (gl_FUNC_STRTOLD): Likewise.
* m4/trunc.m4 (gl_FUNC_TRUNC): Likewise.
* m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise.
* m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise.
* m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Likewise.
* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise.

Download

m4/iconv_open-utf.m4

# iconv_open-utf.m4 serial 5
dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

# A placeholder to ensure that this m4 file gets included by aclocal.
AC_DEFUN([gl_FUNC_ICONV_OPEN_UTF], [])

AC_DEFUN([gl_FUNC_ICONV_OPEN_UTF_SUPPORT],
[
  dnl This macro relies on am_cv_func_iconv and gl_func_iconv_gnu from
  dnl gl_FUNC_ICONV_OPEN, but is called from within gl_FUNC_ICONV_OPEN.
  dnl *Not* AC_REQUIRE([gl_FUNC_ICONV_OPEN]).
  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
  AC_REQUIRE([gl_ICONV_H_DEFAULTS])
  if test "$am_cv_func_iconv" = yes; then
    AC_CACHE_CHECK([whether iconv supports conversion between UTF-8 and UTF-{16,32}{BE,LE}],
      [gl_cv_func_iconv_supports_utf],
      [
        save_LIBS="$LIBS"
        LIBS="$LIBS $LIBICONV"
        AC_RUN_IFELSE(
          [AC_LANG_SOURCE([[
#include <iconv.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
int main ()
{
  int result = 0;
  /* Test conversion from UTF-8 to UTF-16BE with no errors.  */
  {
    static const char input[] =
      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
    static const char expected[] =
      "\000J\000a\000p\000a\000n\000e\000s\000e\000 \000(\145\345\147\054\212\236\000)\000 \000[\330\065\335\015\330\065\335\036\330\065\335\055\000]";
    iconv_t cd;
    cd = iconv_open ("UTF-16BE", "UTF-8");
    if (cd == (iconv_t)(-1))
      result |= 1;
    else
      {
        char buf[100];
        const char *inptr;
        size_t inbytesleft;
        char *outptr;
        size_t outbytesleft;
        size_t res;
        inptr = input;
        inbytesleft = sizeof (input) - 1;
        outptr = buf;
        outbytesleft = sizeof (buf);
        res = iconv (cd,
                     (ICONV_CONST char **) &inptr, &inbytesleft,
                     &outptr, &outbytesleft);
        if (!(res == 0 && inbytesleft == 0))
          result |= 1;
        else if (!(outptr == buf + (sizeof (expected) - 1)))
          result |= 1;
        else if (!(memcmp (buf, expected, sizeof (expected) - 1) == 0))
          result |= 1;
        else if (!(iconv_close (cd) == 0))
          result |= 1;
      }
  }
  /* Test conversion from UTF-8 to UTF-16LE with no errors.  */
  {
    static const char input[] =
      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
    static const char expected[] =
      "J\000a\000p\000a\000n\000e\000s\000e\000 \000(\000\345\145\054\147\236\212)\000 \000[\000\065\330\015\335\065\330\036\335\065\330\055\335]\000";
    iconv_t cd;
    cd = iconv_open ("UTF-16LE", "UTF-8");
    if (cd == (iconv_t)(-1))
      result |= 2;
    else
      {
        char buf[100];
        const char *inptr;
        size_t inbytesleft;
        char *outptr;
        size_t outbytesleft;
        size_t res;
        inptr = input;
        inbytesleft = sizeof (input) - 1;
        outptr = buf;
        outbytesleft = sizeof (buf);
        res = iconv (cd,
                     (ICONV_CONST char **) &inptr, &inbytesleft,
                     &outptr, &outbytesleft);
        if (!(res == 0 && inbytesleft == 0))
          result |= 2;
        else if (!(outptr == buf + (sizeof (expected) - 1)))
          result |= 2;
        else if (!(memcmp (buf, expected, sizeof (expected) - 1) == 0))
          result |= 2;
        else if (!(iconv_close (cd) == 0))
          result |= 2;
      }
  }
  /* Test conversion from UTF-8 to UTF-32BE with no errors.  */
  {
    static const char input[] =
      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
    static const char expected[] =
      "\000\000\000J\000\000\000a\000\000\000p\000\000\000a\000\000\000n\000\000\000e\000\000\000s\000\000\000e\000\000\000 \000\000\000(\000\000\145\345\000\000\147\054\000\000\212\236\000\000\000)\000\000\000 \000\000\000[\000\001\325\015\000\001\325\036\000\001\325\055\000\000\000]";
    iconv_t cd;
    cd = iconv_open ("UTF-32BE", "UTF-8");
    if (cd == (iconv_t)(-1))
      result |= 4;
    else
      {
        char buf[100];
        const char *inptr;
        size_t inbytesleft;
        char *outptr;
        size_t outbytesleft;
        size_t res;
        inptr = input;
        inbytesleft = sizeof (input) - 1;
        outptr = buf;
        outbytesleft = sizeof (buf);
        res = iconv (cd,
                     (ICONV_CONST char **) &inptr, &inbytesleft,
                     &outptr, &outbytesleft);
        if (!(res == 0 && inbytesleft == 0))
          result |= 4;
        else if (!(outptr == buf + (sizeof (expected) - 1)))
          result |= 4;
        else if (!(memcmp (buf, expected, sizeof (expected) - 1) == 0))
          result |= 4;
        else if (!(iconv_close (cd) == 0))
          result |= 4;
      }
  }
  /* Test conversion from UTF-8 to UTF-32LE with no errors.  */
  {
    static const char input[] =
      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
    static const char expected[] =
      "J\000\000\000a\000\000\000p\000\000\000a\000\000\000n\000\000\000e\000\000\000s\000\000\000e\000\000\000 \000\000\000(\000\000\000\345\145\000\000\054\147\000\000\236\212\000\000)\000\000\000 \000\000\000[\000\000\000\015\325\001\000\036\325\001\000\055\325\001\000]\000\000\000";
    iconv_t cd;
    cd = iconv_open ("UTF-32LE", "UTF-8");
    if (cd == (iconv_t)(-1))
      result |= 8;
    else
      {
        char buf[100];
        const char *inptr;
        size_t inbytesleft;
        char *outptr;
        size_t outbytesleft;
        size_t res;
        inptr = input;
        inbytesleft = sizeof (input) - 1;
        outptr = buf;
        outbytesleft = sizeof (buf);
        res = iconv (cd,
                     (ICONV_CONST char **) &inptr, &inbytesleft,
                     &outptr, &outbytesleft);
        if (!(res == 0 && inbytesleft == 0))
          result |= 8;
        else if (!(outptr == buf + (sizeof (expected) - 1)))
          result |= 8;
        else if (!(memcmp (buf, expected, sizeof (expected) - 1) == 0))
          result |= 8;
        else if (!(iconv_close (cd) == 0))
          result |= 8;
      }
  }
  /* Test conversion from UTF-16BE to UTF-8 with no errors.
     This test fails on NetBSD 3.0.  */
  {
    static const char input[] =
      "\000J\000a\000p\000a\000n\000e\000s\000e\000 \000(\145\345\147\054\212\236\000)\000 \000[\330\065\335\015\330\065\335\036\330\065\335\055\000]";
    static const char expected[] =
      "Japanese (\346\227\245\346\234\254\350\252\236) [\360\235\224\215\360\235\224\236\360\235\224\255]";
    iconv_t cd;
    cd = iconv_open ("UTF-8", "UTF-16BE");
    if (cd == (iconv_t)(-1))
      result |= 16;
    else
      {
        char buf[100];
        const char *inptr;
        size_t inbytesleft;
        char *outptr;
        size_t outbytesleft;
        size_t res;
        inptr = input;
        inbytesleft = sizeof (input) - 1;
        outptr = buf;
        outbytesleft = sizeof (buf);
        res = iconv (cd,
                     (ICONV_CONST char **) &inptr, &inbytesleft,
                     &outptr, &outbytesleft);
        if (!(res == 0 && inbytesleft == 0))
          result |= 16;
        else if (!(outptr == buf + (sizeof (expected) - 1)))
          result |= 16;
        else if (!(memcmp (buf, expected, sizeof (expected) - 1) == 0))
          result |= 16;
        else if (!(iconv_close (cd) == 0))
          result |= 16;
      }
  }
  return result;
}]])],
          [gl_cv_func_iconv_supports_utf=yes],
          [gl_cv_func_iconv_supports_utf=no],
          [
           dnl We know that GNU libiconv, GNU libc, musl libc, and Solaris >= 9 do.
           dnl OSF/1 5.1 has these encodings, but inserts a BOM in the "to"
           dnl direction.
           gl_cv_func_iconv_supports_utf="$gl_cross_guess_normal"
           if test $gl_func_iconv_gnu = yes; then
             gl_cv_func_iconv_supports_utf="guessing yes"
           else
changequote(,)dnl
             case "$host_os" in
               *-musl* | midipix*)           gl_cv_func_iconv_supports_utf="guessing yes" ;;
               solaris2.9 | solaris2.1[0-9]) gl_cv_func_iconv_supports_utf="guessing yes" ;;
             esac
changequote([,])dnl
           fi
          ])
        LIBS="$save_LIBS"
      ])
  fi
])

Download

kc3-lang/gnulib/m4/iconv_open-utf.m4

Commit

m4/iconv_open-utf.m4