mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
build: Drop libiconv as a build dependecy
The final user was blktap2, removed in Xen 4.13.
Strip out the ./configure check for it, and stop explicitly installing it in
the FreeBSD testing.
Fixes: 2a556b63a2 ("Drop blktap2")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
This commit is contained in:
Andrew Cooper committed
1 parent
cb3a371469
commit
47f465d485
4 files changed
+1
-48
No files matched your search
+1
-1
@@ -5,7 +5,7 @@ freebsd_template: &FREEBSD_TEMPLATE
|
||||
APPEND_INCLUDES: /usr/local/include
|
||||
|
||||
install_script: pkg install -y seabios gmake ninja bash
|
||||
pkgconf python libiconv bison perl5
|
||||
pkgconf python bison perl5
|
||||
yajl lzo2 pixman argp-standalone
|
||||
libxml2 glib git
|
||||
|
||||
|
||||
@@ -61,7 +61,6 @@ LINUX_BACKEND_MODULES := @LINUX_BACKEND_MODULES@
|
||||
#System options
|
||||
ZLIB_CFLAGS := @ZLIB_CFLAGS@
|
||||
ZLIB_LIBS := @ZLIB_LIBS@
|
||||
CONFIG_LIBICONV := @libiconv@
|
||||
EXTFS_LIBS := @EXTFS_LIBS@
|
||||
CURSES_LIBS := @CURSES_LIBS@
|
||||
TINFO_LIBS := @TINFO_LIBS@
|
||||
|
||||
Vendored
-44
@@ -659,7 +659,6 @@ libnl
|
||||
LIBNL3_LIBS
|
||||
LIBNL3_CFLAGS
|
||||
argp_ldflags
|
||||
libiconv
|
||||
PTHREAD_LIBS
|
||||
PTHREAD_LDFLAGS
|
||||
PTHREAD_CFLAGS
|
||||
@@ -9741,49 +9740,6 @@ else $as_nop
|
||||
as_fn_error $? "Could not find zlib" "$LINENO" 5
|
||||
fi
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
|
||||
printf %s "checking for libiconv_open in -liconv... " >&6; }
|
||||
if test ${ac_cv_lib_iconv_libiconv_open+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-liconv $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char libiconv_open ();
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
return libiconv_open ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"
|
||||
then :
|
||||
ac_cv_lib_iconv_libiconv_open=yes
|
||||
else $as_nop
|
||||
ac_cv_lib_iconv_libiconv_open=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
|
||||
printf "%s\n" "$ac_cv_lib_iconv_libiconv_open" >&6; }
|
||||
if test "x$ac_cv_lib_iconv_libiconv_open" = xyes
|
||||
then :
|
||||
libiconv="y"
|
||||
else $as_nop
|
||||
libiconv="n"
|
||||
fi
|
||||
|
||||
|
||||
ac_fn_c_check_header_compile "$LINENO" "argp.h" "ac_cv_header_argp_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_argp_h" = xyes
|
||||
then :
|
||||
|
||||
@@ -444,8 +444,6 @@ AX_CHECK_PTHREAD
|
||||
AC_CHECK_LIB([yajl], [yajl_alloc], [],
|
||||
[AC_MSG_ERROR([Could not find yajl])])
|
||||
AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])])
|
||||
AC_CHECK_LIB([iconv], [libiconv_open], [libiconv="y"], [libiconv="n"])
|
||||
AC_SUBST(libiconv)
|
||||
AC_CHECK_HEADER([argp.h], [
|
||||
AC_CHECK_LIB([argp], [argp_usage], [argp_ldflags="-largp"])
|
||||
], [AC_MSG_ERROR([Could not find argp])])
|
||||
|
||||