Xen project Mailing List

[Xen-devel] [PATCH v2 4/4] configure: rerun autoconf

From: Doug Goldstein <cardoe@xxxxxxxxxx>

Date: Thu, 18 Feb 2016 20:57:05 -0600

Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>, Wei Liu <wei.liu2@xxxxxxxxxx>, Doug Goldstein <cardoe@xxxxxxxxxx>, Ian Campbell <ian.campbell@xxxxxxxxxx>, Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>

Delivery-date: Fri, 19 Feb 2016 02:57:37 +0000

List-id: Xen developer discussion <xen-devel.lists.xen.org>

Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx> --- CC: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> CC: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> CC: Ian Campbell <ian.campbell@xxxxxxxxxx> CC: Wei Liu <wei.liu2@xxxxxxxxxx> Before these changes I was seeing the following errors: https://travis-ci.org/cardoe/xen/jobs/110174912 https://travis-ci.org/cardoe/xen/jobs/110196932#L1435 (you have to expand the 'cat tools/config.log' and go down to line 1435). The goal here is to enabling building the toolstack in Travis. This series gets us to this: https://travis-ci.org/cardoe/xen/jobs/110210149#L3536 But Andrew Cooper has provided a patch to solve that issue in 'hvmloader: Use xen/errno.h rather than the host systems errno.h' change since v1: - don't screw up the white space --- tools/configure | 295 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 148 insertions(+), 147 deletions(-) diff --git a/tools/configure b/tools/configure index cd41b26..0244591 100755 --- a/tools/configure +++ b/tools/configure @@ -682,9 +682,6 @@ INSTALL_PROGRAM SET_MAKE AWK IASL -BCC -LD86 -AS86 XGETTEXT BASH XML @@ -704,6 +701,9 @@ qemu_xen_systemd qemu_xen_path qemu_xen rombios +BCC +LD86 +AS86 qemu_traditional blktap2 LINUX_BACKEND_MODULES @@ -3348,7 +3348,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3394,7 +3394,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3418,7 +3418,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3463,7 +3463,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3487,7 +3487,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -4242,6 +4242,141 @@ fi if test "x$enable_rombios" = "xyes"; then : + # Extract the first word of "as86", so it can be a program name with args. +set dummy as86; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_AS86+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $AS86 in + [\\/]* | ?:[\\/]*) + ac_cv_path_AS86="$AS86" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_AS86="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_AS86" && ac_cv_path_AS86="no" + ;; +esac +fi +AS86=$ac_cv_path_AS86 +if test -n "$AS86"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS86" >&5 +$as_echo "$AS86" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test x"${AS86}" = x"no" +then + as_fn_error $? "Unable to find as86, please install as86" "$LINENO" 5 +fi + # Extract the first word of "ld86", so it can be a program name with args. +set dummy ld86; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LD86+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LD86 in + [\\/]* | ?:[\\/]*) + ac_cv_path_LD86="$LD86" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LD86="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_LD86" && ac_cv_path_LD86="no" + ;; +esac +fi +LD86=$ac_cv_path_LD86 +if test -n "$LD86"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD86" >&5 +$as_echo "$LD86" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test x"${LD86}" = x"no" +then + as_fn_error $? "Unable to find ld86, please install ld86" "$LINENO" 5 +fi + # Extract the first word of "bcc", so it can be a program name with args. +set dummy bcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_BCC+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $BCC in + [\\/]* | ?:[\\/]*) + ac_cv_path_BCC="$BCC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_BCC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_BCC" && ac_cv_path_BCC="no" + ;; +esac +fi +BCC=$ac_cv_path_BCC +if test -n "$BCC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BCC" >&5 +$as_echo "$BCC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test x"${BCC}" = x"no" +then + as_fn_error $? "Unable to find bcc, please install bcc" "$LINENO" 5 +fi $as_echo "#define HAVE_ROMBIOS 1" >>confdefs.h @@ -7150,9 +7285,9 @@ if test x"$pyconfig" = x"no"; then : print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`" CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \ print distutils.sysconfig.get_config_var("CFLAGS")'`" - LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + PYTHON_LIBS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ print distutils.sysconfig.get_config_var("LIBS")'`" - LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ + PYTHON_LIBS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ print distutils.sysconfig.get_config_var("SYSLIBS")'`" LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \ print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\ @@ -7166,6 +7301,7 @@ else CPPFLAGS="$CFLAGS `$PYTHON-config --cflags`" LDFLAGS="$LDFLAGS `$PYTHON-config --ldflags`" + PYTHON_LIBS="$LIBS `$PYTHON-config --libs`" fi @@ -7184,7 +7320,7 @@ if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpython$ac_python_version $LIBS" +LIBS="-lpython$ac_python_version $PYTHON_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7227,7 +7363,7 @@ else fi CPPFLAGS=$ac_previous_cppflags -LDLFAGS=$ac_previous_ldflags +LDFLAGS=$ac_previous_ldflags { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Python setup.py brokenly enables -D_FORTIFY_SOURCE" >&5 @@ -7315,141 +7451,6 @@ then fi case "$host_cpu" in i[3456]86|x86_64) - # Extract the first word of "as86", so it can be a program name with args. -set dummy as86; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_AS86+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $AS86 in - [\\/]* | ?:[\\/]*) - ac_cv_path_AS86="$AS86" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_AS86="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_AS86" && ac_cv_path_AS86="no" - ;; -esac -fi -AS86=$ac_cv_path_AS86 -if test -n "$AS86"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS86" >&5 -$as_echo "$AS86" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test x"${AS86}" = x"no" -then - as_fn_error $? "Unable to find as86, please install as86" "$LINENO" 5 -fi - # Extract the first word of "ld86", so it can be a program name with args. -set dummy ld86; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LD86+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $LD86 in - [\\/]* | ?:[\\/]*) - ac_cv_path_LD86="$LD86" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LD86="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_LD86" && ac_cv_path_LD86="no" - ;; -esac -fi -LD86=$ac_cv_path_LD86 -if test -n "$LD86"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD86" >&5 -$as_echo "$LD86" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test x"${LD86}" = x"no" -then - as_fn_error $? "Unable to find ld86, please install ld86" "$LINENO" 5 -fi - # Extract the first word of "bcc", so it can be a program name with args. -set dummy bcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_BCC+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $BCC in - [\\/]* | ?:[\\/]*) - ac_cv_path_BCC="$BCC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_BCC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_BCC" && ac_cv_path_BCC="no" - ;; -esac -fi -BCC=$ac_cv_path_BCC -if test -n "$BCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BCC" >&5 -$as_echo "$BCC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test x"${BCC}" = x"no" -then - as_fn_error $? "Unable to find bcc, please install bcc" "$LINENO" 5 -fi # Extract the first word of "iasl", so it can be a program name with args. set dummy iasl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -- 2.4.10 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.