608f8749a1
Reduce the time required for ./configure to perform the needed
KABI checks by allowing kbuild to compile multiple test cases in
parallel. This was accomplished by splitting each test's source
code from the logic handling whether that code could be compiled
or not.
By introducing this split it's possible to minimize the number of
times kbuild needs to be invoked. As importantly, it means all of
the tests can be built in parallel. This does require a little extra
care since we expect some tests to fail, so the --keep-going (-k)
option must be provided otherwise some tests may not get compiled.
Furthermore, since a failure during the kbuild modpost phase will
result in an early exit; the final linking phase is limited to tests
which passed the initial compilation and produced an object file.
Once everything has been built the configure script proceeds as
previously. The only significant difference is that it now merely
needs to test for the existence of a .ko file to determine the
result of a given test. This vastly speeds up the entire process.
New test cases should use ZFS_LINUX_TEST_SRC to declare their test
source code and ZFS_LINUX_TEST_RESULT to check the result. All of
the existing kernel-*.m4 files have been updated accordingly, see
config/kernel-current-time.m4 for a basic example. The legacy
ZFS_LINUX_TRY_COMPILE macro has been kept to handle special cases
but it's use is not encouraged.
master (secs) patched (secs)
------------- ----------------
autogen.sh 61 68
configure 137 24 (~17% of current run time)
make -j $(nproc) 44 44
make rpms 287 150
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8547
Closes #9132
Closes #9341
288 lines
9.5 KiB
Plaintext
288 lines
9.5 KiB
Plaintext
# iconv.m4 serial 21
|
|
dnl Copyright (C) 2000-2002, 2007-2014, 2016-2019 Free Software Foundation,
|
|
dnl 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.
|
|
|
|
dnl From Bruno Haible.
|
|
|
|
AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
|
|
[
|
|
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
|
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
AC_REQUIRE([AC_LIB_RPATH])
|
|
|
|
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
|
dnl accordingly.
|
|
AC_LIB_LINKFLAGS_BODY([iconv])
|
|
])
|
|
|
|
AC_DEFUN([AM_ICONV_LINK],
|
|
[
|
|
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
|
dnl those with the standalone portable GNU libiconv installed).
|
|
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
|
|
|
|
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
|
dnl accordingly.
|
|
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
|
|
|
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
|
|
dnl because if the user has installed libiconv and not disabled its use
|
|
dnl via --without-libiconv-prefix, he wants to use it. The first
|
|
dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
|
|
am_save_CPPFLAGS="$CPPFLAGS"
|
|
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
|
|
|
|
AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
|
|
am_cv_func_iconv="no, consider installing GNU libiconv"
|
|
am_cv_lib_iconv=no
|
|
AC_LINK_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[
|
|
#include <stdlib.h>
|
|
#include <iconv.h>
|
|
]],
|
|
[[iconv_t cd = iconv_open("","");
|
|
iconv(cd,NULL,NULL,NULL,NULL);
|
|
iconv_close(cd);]])],
|
|
[am_cv_func_iconv=yes])
|
|
if test "$am_cv_func_iconv" != yes; then
|
|
am_save_LIBS="$LIBS"
|
|
LIBS="$LIBS $LIBICONV"
|
|
AC_LINK_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[
|
|
#include <stdlib.h>
|
|
#include <iconv.h>
|
|
]],
|
|
[[iconv_t cd = iconv_open("","");
|
|
iconv(cd,NULL,NULL,NULL,NULL);
|
|
iconv_close(cd);]])],
|
|
[am_cv_lib_iconv=yes]
|
|
[am_cv_func_iconv=yes])
|
|
LIBS="$am_save_LIBS"
|
|
fi
|
|
])
|
|
if test "$am_cv_func_iconv" = yes; then
|
|
AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
|
|
dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
|
|
dnl Solaris 10.
|
|
am_save_LIBS="$LIBS"
|
|
if test $am_cv_lib_iconv = yes; then
|
|
LIBS="$LIBS $LIBICONV"
|
|
fi
|
|
am_cv_func_iconv_works=no
|
|
for ac_iconv_const in '' 'const'; do
|
|
AC_RUN_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[
|
|
#include <iconv.h>
|
|
#include <string.h>
|
|
|
|
#ifndef ICONV_CONST
|
|
# define ICONV_CONST $ac_iconv_const
|
|
#endif
|
|
]],
|
|
[[int result = 0;
|
|
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
|
|
returns. */
|
|
{
|
|
iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
|
|
if (cd_utf8_to_88591 != (iconv_t)(-1))
|
|
{
|
|
static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
|
|
char buf[10];
|
|
ICONV_CONST char *inptr = input;
|
|
size_t inbytesleft = strlen (input);
|
|
char *outptr = buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t res = iconv (cd_utf8_to_88591,
|
|
&inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if (res == 0)
|
|
result |= 1;
|
|
iconv_close (cd_utf8_to_88591);
|
|
}
|
|
}
|
|
/* Test against Solaris 10 bug: Failures are not distinguishable from
|
|
successful returns. */
|
|
{
|
|
iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
|
|
if (cd_ascii_to_88591 != (iconv_t)(-1))
|
|
{
|
|
static ICONV_CONST char input[] = "\263";
|
|
char buf[10];
|
|
ICONV_CONST char *inptr = input;
|
|
size_t inbytesleft = strlen (input);
|
|
char *outptr = buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t res = iconv (cd_ascii_to_88591,
|
|
&inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if (res == 0)
|
|
result |= 2;
|
|
iconv_close (cd_ascii_to_88591);
|
|
}
|
|
}
|
|
/* Test against AIX 6.1..7.1 bug: Buffer overrun. */
|
|
{
|
|
iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
|
|
if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
{
|
|
static ICONV_CONST char input[] = "\304";
|
|
static char buf[2] = { (char)0xDE, (char)0xAD };
|
|
ICONV_CONST char *inptr = input;
|
|
size_t inbytesleft = 1;
|
|
char *outptr = buf;
|
|
size_t outbytesleft = 1;
|
|
size_t res = iconv (cd_88591_to_utf8,
|
|
&inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
|
|
result |= 4;
|
|
iconv_close (cd_88591_to_utf8);
|
|
}
|
|
}
|
|
#if 0 /* This bug could be worked around by the caller. */
|
|
/* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
|
|
{
|
|
iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
|
|
if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
{
|
|
static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
|
char buf[50];
|
|
ICONV_CONST char *inptr = input;
|
|
size_t inbytesleft = strlen (input);
|
|
char *outptr = buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t res = iconv (cd_88591_to_utf8,
|
|
&inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if ((int)res > 0)
|
|
result |= 8;
|
|
iconv_close (cd_88591_to_utf8);
|
|
}
|
|
}
|
|
#endif
|
|
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
|
|
provided. */
|
|
{
|
|
/* Try standardized names. */
|
|
iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
|
|
/* Try IRIX, OSF/1 names. */
|
|
iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
|
|
/* Try AIX names. */
|
|
iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
|
|
/* Try HP-UX names. */
|
|
iconv_t cd4 = iconv_open ("utf8", "eucJP");
|
|
if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
|
|
&& cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
|
|
result |= 16;
|
|
if (cd1 != (iconv_t)(-1))
|
|
iconv_close (cd1);
|
|
if (cd2 != (iconv_t)(-1))
|
|
iconv_close (cd2);
|
|
if (cd3 != (iconv_t)(-1))
|
|
iconv_close (cd3);
|
|
if (cd4 != (iconv_t)(-1))
|
|
iconv_close (cd4);
|
|
}
|
|
return result;
|
|
]])],
|
|
[am_cv_func_iconv_works=yes], ,
|
|
[case "$host_os" in
|
|
aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
|
*) am_cv_func_iconv_works="guessing yes" ;;
|
|
esac])
|
|
test "$am_cv_func_iconv_works" = no || break
|
|
done
|
|
LIBS="$am_save_LIBS"
|
|
])
|
|
case "$am_cv_func_iconv_works" in
|
|
*no) am_func_iconv=no am_cv_lib_iconv=no ;;
|
|
*) am_func_iconv=yes ;;
|
|
esac
|
|
else
|
|
am_func_iconv=no am_cv_lib_iconv=no
|
|
fi
|
|
if test "$am_func_iconv" = yes; then
|
|
AC_DEFINE([HAVE_ICONV], [1],
|
|
[Define if you have the iconv() function and it works.])
|
|
fi
|
|
if test "$am_cv_lib_iconv" = yes; then
|
|
AC_MSG_CHECKING([how to link with libiconv])
|
|
AC_MSG_RESULT([$LIBICONV])
|
|
else
|
|
dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
|
|
dnl either.
|
|
CPPFLAGS="$am_save_CPPFLAGS"
|
|
LIBICONV=
|
|
LTLIBICONV=
|
|
fi
|
|
AC_SUBST([LIBICONV])
|
|
AC_SUBST([LTLIBICONV])
|
|
])
|
|
|
|
dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
|
|
dnl avoid warnings like
|
|
dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
|
|
dnl This is tricky because of the way 'aclocal' is implemented:
|
|
dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
|
|
dnl Otherwise aclocal's initial scan pass would miss the macro definition.
|
|
dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
|
|
dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
|
|
dnl warnings.
|
|
m4_define([gl_iconv_AC_DEFUN],
|
|
m4_version_prereq([2.64],
|
|
[[AC_DEFUN_ONCE(
|
|
[$1], [$2])]],
|
|
[m4_ifdef([gl_00GNULIB],
|
|
[[AC_DEFUN_ONCE(
|
|
[$1], [$2])]],
|
|
[[AC_DEFUN(
|
|
[$1], [$2])]])]))
|
|
gl_iconv_AC_DEFUN([AM_ICONV],
|
|
[
|
|
AM_ICONV_LINK
|
|
if test "$am_cv_func_iconv" = yes; then
|
|
AC_MSG_CHECKING([for iconv declaration])
|
|
AC_CACHE_VAL([am_cv_proto_iconv], [
|
|
AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[
|
|
#include <stdlib.h>
|
|
#include <iconv.h>
|
|
extern
|
|
#ifdef __cplusplus
|
|
"C"
|
|
#endif
|
|
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
|
|
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
|
#else
|
|
size_t iconv();
|
|
#endif
|
|
]],
|
|
[[]])],
|
|
[am_cv_proto_iconv_arg1=""],
|
|
[am_cv_proto_iconv_arg1="const"])
|
|
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
|
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
|
AC_MSG_RESULT([$am_cv_proto_iconv])
|
|
else
|
|
dnl When compiling GNU libiconv on a system that does not have iconv yet,
|
|
dnl pick the POSIX compliant declaration without 'const'.
|
|
am_cv_proto_iconv_arg1=""
|
|
fi
|
|
AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
|
|
[Define as const if the declaration of iconv() needs const.])
|
|
dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
|
|
m4_ifdef([gl_ICONV_H_DEFAULTS],
|
|
[AC_REQUIRE([gl_ICONV_H_DEFAULTS])
|
|
if test -n "$am_cv_proto_iconv_arg1"; then
|
|
ICONV_CONST="const"
|
|
fi
|
|
])
|
|
])
|