CI: Fixes, part 2
cover CI: Fixes, part 2
Work to fix a few build system checks, and to strip the obsolete contents of the build containers, prior to adding new containers (will be part 3).
Andrew Cooper (6):
build: Regenerate ./configure with Autoconf 2.71
build: Fix the version of python checked for by ./configure
CI: Refresh the Coverity Github Action configuration
build: Drop openssl as a build dependency
build: Drop libiconv as a build dependecy
build: Drop xorg-x11 as a build dependency
.cirrus.yml | 2 +- .github/workflows/coverity.yml | 36 +- README | 2 - .../build/debian/bookworm-arm64v8.dockerfile | 2 - .../build/debian/bookworm-i386.dockerfile | 2 - automation/build/debian/bookworm.dockerfile | 2 - .../build/debian/jessie-i386.dockerfile | 2 - automation/build/debian/jessie.dockerfile | 2 - .../build/debian/stretch-i386.dockerfile | 2 - automation/build/debian/stretch.dockerfile | 2 - automation/build/fedora/29.dockerfile | 1 - automation/build/ubuntu/bionic.dockerfile | 2 - automation/build/ubuntu/focal.dockerfile | 2 - automation/build/ubuntu/trusty.dockerfile | 2 - automation/build/ubuntu/xenial.dockerfile | 2 - .../kernel/5.19-arm64v8.dockerfile | 1 - .../tests-artifacts/kernel/6.1.19.dockerfile | 1 - config/Tools.mk.in | 1 - configure | 1006 +-- docs/configure | 990 +-- stubdom/configure | 2293 ++++-- tools/config.h.in | 15 +- tools/configure | 6397 +++++++++-------- tools/configure.ac | 4 +- 24 files changed, 6136 insertions(+), 4635 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/6 build: Regenerate ./configure with Autoconf 2.71
This is the version now found in Debian Bookworm.
---
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Oleksii Kurochko <[email protected]>
This was last done by commit de333b694591 ("configure: Regenerate with autoconf 2.69")
I've got a local container with Debian Bullseye that has 2.69, but I'm tempted to simply backport this patch if we ever need to change anything about autoconf on the older trees
--- configure | 1006 +++---- docs/configure | 990 +++---- stubdom/configure | 2293 ++++++++++------ tools/config.h.in | 15 +- tools/configure | 6481 +++++++++++++++++++++++++-------------------- 5 files changed, 6174 insertions(+), 4611 deletions(-)
configure +560 -446
@@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.19. +# Generated by GNU Autoconf 2.71 for Xen Hypervisor 4.19. # # Report bugs to <[email protected]>. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation
@@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #(
@@ -33,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #((
@@ -96,8 +92,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS
@@ -109,30 +109,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves.
@@ -154,20 +134,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #(
@@ -187,41 +169,52 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi
@@ -229,14 +222,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also
@@ -254,18 +254,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell [email protected] and + printf "%s\n" "$0: Please tell [email protected] and $0: [email protected] about your system, including $0: any error possibly output before this message. Then $0: install a modern shell, or manually run the script
@@ -293,6 +294,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking.
@@ -310,6 +312,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # -------------
@@ -324,7 +334,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs"
@@ -333,7 +343,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q
@@ -372,12 +382,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2
@@ -389,18 +400,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ----------------------------------------
@@ -412,9 +432,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error
@@ -441,7 +461,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q
@@ -485,7 +505,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall
@@ -499,6 +519,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*)
@@ -512,6 +536,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file
@@ -751,8 +782,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;;
@@ -793,9 +822,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt"
@@ -819,9 +848,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt"
@@ -1032,9 +1061,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt"
@@ -1048,9 +1077,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt"
@@ -1094,9 +1123,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;;
@@ -1112,7 +1141,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi
@@ -1176,7 +1205,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q
@@ -1351,9 +1380,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1381,7 +1410,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1389,7 +1419,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done
@@ -1399,9 +1429,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Xen Hypervisor configure 4.19 -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF
@@ -1411,14 +1441,34 @@ fi ## ------------------------ ## ## Autoconf initialization. ## ## ------------------------ ## +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Xen Hypervisor $as_me 4.19, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log
@@ -1451,8 +1501,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS
@@ -1487,7 +1541,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1522,11 +1576,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo
@@ -1537,8 +1593,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #(
@@ -1562,7 +1618,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo
@@ -1570,14 +1626,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo
@@ -1585,15 +1641,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo
@@ -1601,8 +1657,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1616,63 +1672,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi
@@ -1682,19 +1723,117 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi + +# Auxiliary files required by this configure script. +ac_aux_files="config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false
@@ -1705,12 +1844,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *)
@@ -1719,24 +1858,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in
@@ -1746,11 +1885,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ##
@@ -1767,55 +1907,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_files="$ac_config_files config/Toplevel.mk config/Paths.mk" -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -1834,21 +1949,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -1941,16 +2057,15 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen -cat >>confdefs.h <<_ACEOF -#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" -_ACEOF +printf "%s\n" "#define XEN_CONFIG_DIR \"$XEN_CONFIG_DIR\"" >>confdefs.h # Check whether --with-initddir was given. -if test "${with_initddir+set}" = set; then : +if test ${with_initddir+y} +then : withval=$with_initddir; initddir_path=$withval -else +else $as_nop case "$host_os" in *linux*) if test -d $sysconfdir/rc.d/init.d ; then
@@ -1968,9 +2083,10 @@ fi # Check whether --with-sysconfig-leaf-dir was given. -if test "${with_sysconfig_leaf_dir+set}" = set; then : +if test ${with_sysconfig_leaf_dir+y} +then : withval=$with_sysconfig_leaf_dir; config_leaf_dir=$withval -else +else $as_nop config_leaf_dir=sysconfig if test ! -d /etc/sysconfig ; then config_leaf_dir=default ; fi fi
@@ -1980,52 +2096,55 @@ CONFIG_LEAF_DIR=$config_leaf_dir # Check whether --with-libexec-leaf-dir was given. -if test "${with_libexec_leaf_dir+set}" = set; then : +if test ${with_libexec_leaf_dir+y} +then : withval=$with_libexec_leaf_dir; libexec_subdir=$withval -else +else $as_nop libexec_subdir=$PACKAGE_TARNAME fi # Check whether --with-xen-scriptdir was given. -if test "${with_xen_scriptdir+set}" = set; then : +if test ${with_xen_scriptdir+y} +then : withval=$with_xen_scriptdir; xen_scriptdir_path=$withval -else +else $as_nop xen_scriptdir_path=$XEN_CONFIG_DIR/scripts fi XEN_SCRIPT_DIR=$xen_scriptdir_path -cat >>confdefs.h <<_ACEOF -#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" -_ACEOF +printf "%s\n" "#define XEN_SCRIPT_DIR \"$XEN_SCRIPT_DIR\"" >>confdefs.h # Check whether --with-xen-dumpdir was given. -if test "${with_xen_dumpdir+set}" = set; then : +if test ${with_xen_dumpdir+y} +then : withval=$with_xen_dumpdir; xen_dumpdir_path=$withval -else +else $as_nop xen_dumpdir_path=$localstatedir/lib/xen/dump fi # Check whether --with-rundir was given. -if test "${with_rundir+set}" = set; then : +if test ${with_rundir+y} +then : withval=$with_rundir; rundir_path=$withval -else +else $as_nop rundir_path=$localstatedir/run fi # Check whether --with-debugdir was given. -if test "${with_debugdir+set}" = set; then : +if test ${with_debugdir+y} +then : withval=$with_debugdir; debugdir_path=$withval -else +else $as_nop debugdir_path=$prefix/lib/debug fi
@@ -2044,9 +2163,7 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin -cat >>confdefs.h <<_ACEOF -#define LIBEXEC_BIN "$LIBEXEC_BIN" -_ACEOF +printf "%s\n" "#define LIBEXEC_BIN \"$LIBEXEC_BIN\"" >>confdefs.h LIBEXEC_LIB=${LIBEXEC}/lib
@@ -2055,41 +2172,31 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot -cat >>confdefs.h <<_ACEOF -#define XENFIRMWAREDIR "$XENFIRMWAREDIR" -_ACEOF +printf "%s\n" "#define XENFIRMWAREDIR \"$XENFIRMWAREDIR\"" >>confdefs.h XEN_RUN_DIR=$rundir_path/xen -cat >>confdefs.h <<_ACEOF -#define XEN_RUN_DIR "$XEN_RUN_DIR" -_ACEOF +printf "%s\n" "#define XEN_RUN_DIR \"$XEN_RUN_DIR\"" >>confdefs.h XEN_LOG_DIR=$localstatedir/log/xen -cat >>confdefs.h <<_ACEOF -#define XEN_LOG_DIR "$XEN_LOG_DIR" -_ACEOF +printf "%s\n" "#define XEN_LOG_DIR \"$XEN_LOG_DIR\"" >>confdefs.h XEN_RUN_STORED=$rundir_path/xenstored -cat >>confdefs.h <<_ACEOF -#define XEN_RUN_STORED "$XEN_RUN_STORED" -_ACEOF +printf "%s\n" "#define XEN_RUN_STORED \"$XEN_RUN_STORED\"" >>confdefs.h XEN_LIB_DIR=$localstatedir/lib/xen -cat >>confdefs.h <<_ACEOF -#define XEN_LIB_DIR "$XEN_LIB_DIR" -_ACEOF +printf "%s\n" "#define XEN_LIB_DIR \"$XEN_LIB_DIR\"" >>confdefs.h SHAREDIR=$prefix/share
@@ -2105,9 +2212,7 @@ case "$host_os" in esac -cat >>confdefs.h <<_ACEOF -#define XEN_LOCK_DIR "$XEN_LOCK_DIR" -_ACEOF +printf "%s\n" "#define XEN_LOCK_DIR \"$XEN_LOCK_DIR\"" >>confdefs.h XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
@@ -2116,9 +2221,7 @@ XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path -cat >>confdefs.h <<_ACEOF -#define XEN_DUMP_DIR "$XEN_DUMP_DIR" -_ACEOF +printf "%s\n" "#define XEN_DUMP_DIR \"$XEN_DUMP_DIR\"" >>confdefs.h DEBUG_DIR=$debugdir_path
@@ -2144,19 +2247,22 @@ esac # Check whether --enable-xen was given. -if test "${enable_xen+set}" = set; then : +if test ${enable_xen+y} +then : enableval=$enable_xen; -if test "x$enableval" = "xyes"; then : +if test "x$enableval" = "xyes" +then : xen=y SUBSYSTEMS="$SUBSYSTEMS xen" -else +else $as_nop -if test "x$enableval" = "xno"; then : +if test "x$enableval" = "xno" +then : xen=n
@@ -2167,7 +2273,7 @@ fi fi -else +else $as_nop xen=y
@@ -2177,7 +2283,8 @@ SUBSYSTEMS="$SUBSYSTEMS xen" fi -if test -e "xen/configure"; then : +if test -e "xen/configure" +then : if test "x$xen" = "xy" || test "x$xen" = "x" ; then subdirs="$subdirs xen"
@@ -2190,19 +2297,22 @@ fi # Check whether --enable-tools was given. -if test "${enable_tools+set}" = set; then : +if test ${enable_tools+y} +then : enableval=$enable_tools; -if test "x$enableval" = "xyes"; then : +if test "x$enableval" = "xyes" +then : tools=y SUBSYSTEMS="$SUBSYSTEMS tools" -else +else $as_nop -if test "x$enableval" = "xno"; then : +if test "x$enableval" = "xno" +then : tools=n
@@ -2213,7 +2323,7 @@ fi fi -else +else $as_nop tools=y
@@ -2223,7 +2333,8 @@ SUBSYSTEMS="$SUBSYSTEMS tools" fi -if test -e "tools/configure"; then : +if test -e "tools/configure" +then : if test "x$tools" = "xy" || test "x$tools" = "x" ; then subdirs="$subdirs tools"
@@ -2236,19 +2347,22 @@ fi # Check whether --enable-stubdom was given. -if test "${enable_stubdom+set}" = set; then : +if test ${enable_stubdom+y} +then : enableval=$enable_stubdom; -if test "x$enableval" = "xyes"; then : +if test "x$enableval" = "xyes" +then : stubdom=y SUBSYSTEMS="$SUBSYSTEMS stubdom" -else +else $as_nop -if test "x$enableval" = "xno"; then : +if test "x$enableval" = "xno" +then : stubdom=n
@@ -2259,16 +2373,17 @@ fi fi -else +else $as_nop -if test "x$arch_enable_stubdom" = "xy"; then : +if test "x$arch_enable_stubdom" = "xy" +then : stubdom=y SUBSYSTEMS="$SUBSYSTEMS stubdom" -else +else $as_nop stubdom=n
@@ -2279,7 +2394,8 @@ fi fi -if test -e "stubdom/configure"; then : +if test -e "stubdom/configure" +then : if test "x$stubdom" = "xy" || test "x$stubdom" = "x" ; then subdirs="$subdirs stubdom"
@@ -2292,19 +2408,22 @@ fi # Check whether --enable-docs was given. -if test "${enable_docs+set}" = set; then : +if test ${enable_docs+y} +then : enableval=$enable_docs; -if test "x$enableval" = "xyes"; then : +if test "x$enableval" = "xyes" +then : docs=y SUBSYSTEMS="$SUBSYSTEMS docs" -else +else $as_nop -if test "x$enableval" = "xno"; then : +if test "x$enableval" = "xno" +then : docs=n
@@ -2315,7 +2434,7 @@ fi fi -else +else $as_nop docs=y
@@ -2325,7 +2444,8 @@ SUBSYSTEMS="$SUBSYSTEMS docs" fi -if test -e "docs/configure"; then : +if test -e "docs/configure" +then : if test "x$docs" = "xy" || test "x$docs" = "x" ; then subdirs="$subdirs docs"
@@ -2372,8 +2492,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #(
@@ -2403,15 +2523,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else
@@ -2425,8 +2545,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache
@@ -2479,7 +2599,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -2495,8 +2615,8 @@ LTLIBOBJS=$ac_ltlibobjs ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL
@@ -2519,14 +2639,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #(
@@ -2536,46 +2658,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -2584,13 +2706,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #((
@@ -2599,8 +2714,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS
@@ -2612,30 +2731,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -2648,13 +2747,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking.
@@ -2681,18 +2781,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2
@@ -2704,12 +2806,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1`
@@ -2740,7 +2843,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q
@@ -2762,6 +2865,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*)
@@ -2775,6 +2882,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file
@@ -2816,7 +2929,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs"
@@ -2825,7 +2938,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q
@@ -2888,7 +3001,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by Xen Hypervisor $as_me 4.19, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS
@@ -2938,14 +3051,16 @@ Report bugs to <[email protected]>. Xen Hypervisor home page: <https://www.xen.org/>." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ Xen Hypervisor config.status 4.19 -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it."
@@ -2982,21 +3097,21 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;;
@@ -3024,7 +3139,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@"
@@ -3038,7 +3153,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF
@@ -3064,7 +3179,7 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files fi # Have a temporary directory for convenience. Make it in the build tree
@@ -3292,7 +3407,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done
@@ -3300,17 +3415,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac
@@ -3327,7 +3442,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q
@@ -3351,9 +3466,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -3406,8 +3521,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack='
@@ -3449,9 +3564,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin"
@@ -3537,7 +3652,7 @@ if test "$no_recursion" != yes; then ;; *) case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append ac_sub_configure_args " '$ac_arg'" ;; esac
@@ -3547,7 +3662,7 @@ if test "$no_recursion" != yes; then # in subdir configurations. ac_arg="--prefix=$prefix" case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
@@ -3568,17 +3683,17 @@ if test "$no_recursion" != yes; then test -d "$srcdir/$ac_dir" || continue ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" - $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 - $as_echo "$ac_msg" >&6 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 + printf "%s\n" "$ac_msg" >&6 as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -3608,17 +3723,15 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" - # Check for guested configure; otherwise get Cygnus style configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then ac_sub_configure=$ac_srcdir/configure.gnu elif test -f "$ac_srcdir/configure"; then ac_sub_configure=$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.in"; then - # This should be Cygnus configure. - ac_sub_configure=$ac_aux_dir/configure else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 -$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 +printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} ac_sub_configure= fi
@@ -3631,8 +3744,8 @@ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
@@ -3643,7 +3756,8 @@ $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cach done fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi +
docs/configure +511 -479
1,036 lines not on this page · raw message
stubdom/configure +1504 -789
2,293 lines not on this page · raw message
tools/configure +3593 -2888
6,481 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.39.2
Part of the diff is not shown here. View the raw message.
Re: [PATCH for-4.19 1/6] build: Regenerate ./configure with Autoconf 2.71
Quoted 3 lines · Andrew Cooper
This is the version now found in Debian Bookworm.
Signed-off-by Andrew Cooper <[email protected]>
Thanks, Roger.
PATCH 2/6 build: Fix the version of python checked for by ./configure
In reply to Andrew CooperWe previously upped the minimum python version to 2.6, but neglected to reflect this in ./configure
---
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Oleksii Kurochko <[email protected]>
--- tools/configure | 8 ++++---- tools/configure.ac | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
tools/configure +4 -4
@@ -8298,15 +8298,15 @@ if test x"${PYTHONPATH}" = x"no" then as_fn_error $? "Unable to find $PYTHON, please install $PYTHON" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python version >= 2.6 " >&5 -printf %s "checking for python version >= 2.6 ... " >&6; } -`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 6)"))'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python version >= 2.7 " >&5 +printf %s "checking for python version >= 2.7 ... " >&6; } +`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 7)"))'` if test "$?" != "0" then python_version=`$PYTHON -V 2>&1` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - as_fn_error $? "$python_version is too old, minimum required version is 2.6" "$LINENO" 5 + as_fn_error $? "$python_version is too old, minimum required version is 2.7" "$LINENO" 5 else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; }
tools/configure.ac +1 -1
@@ -385,7 +385,7 @@ PYTHONPATH=$PYTHON PYTHON=`basename $PYTHONPATH` AX_PATH_PROG_OR_FAIL([PYTHONPATH], [$PYTHON]) -AX_CHECK_PYTHON_VERSION([2], [6]) +AX_CHECK_PYTHON_VERSION([2], [7]) AS_IF([test "$cross_compiling" != yes], [ AX_CHECK_PYTHON_DEVEL()
Signature · 1 line
2.39.2
Re: [PATCH for-4.19 2/6] build: Fix the version of python checked for by ./configure
Quoted 4 lines · Andrew Cooper
We previously upped the minimum python version to 2.6, but neglected to reflect this in ./configure
Fixes 2a353c048c68 ("tools: Don't use distutils in configure or Makefile")
Judging from the description of that earlier patch and from what you're actually changing, s/2.6/2.7/ above?
Jan
Quoted 51 lines
Signed-off-by Andrew Cooper <[email protected]>---
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Oleksii Kurochko <[email protected]>--- tools/configure | 8 ++++---- tools/configure.ac | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)tools/configure +4
-4@@ -8298,15 +8298,15 @@ if test x"${PYTHONPATH}" = x"no" then as_fn_error $? "Unable to find $PYTHON, please install $PYTHON" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python version >= 2.6 " >&5 -printf %s "checking for python version >= 2.6 ... " >&6; } -`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 6)"))'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python version >= 2.7 " >&5 +printf %s "checking for python version >= 2.7 ... " >&6; } +`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 7)"))'` if test "$?" != "0" then python_version=`$PYTHON -V 2>&1` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - as_fn_error $? "$python_version is too old, minimum required version is 2.6" "$LINENO" 5 + as_fn_error $? "$python_version is too old, minimum required version is 2.7" "$LINENO" 5 else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; }tools/configure.ac +1
-1@@ -385,7 +385,7 @@ PYTHONPATH=$PYTHON PYTHON=`basename $PYTHONPATH` AX_PATH_PROG_OR_FAIL([PYTHONPATH], [$PYTHON]) -AX_CHECK_PYTHON_VERSION([2], [6]) +AX_CHECK_PYTHON_VERSION([2], [7]) AS_IF([test "$cross_compiling" != yes], [ AX_CHECK_PYTHON_DEVEL()
Re: [PATCH for-4.19 2/6] build: Fix the version of python checked for by ./configure
Quoted 7 lines · Jan Beulich
Quoted 4 lines · Andrew Cooper
We previously upped the minimum python version to 2.6, but neglected to reflect this in ./configure
Fixes 2a353c048c68 ("tools: Don't use distutils in configure or Makefile")Judging from the description of that earlier patch and from what you're actually changing, s/2.6/2.7/ above?
Oops yes. Fixed.
Thanks.
~Andrew
Re: [PATCH for-4.19 2/6] build: Fix the version of python checked for by ./configure
In reply to Andrew CooperQuoted 5 lines · Andrew Cooper
We previously upped the minimum python version to 2.6, but neglected to reflect this in ./configure
Fixes 2a353c048c68 ("tools: Don't use distutils in configure or Makefile")Signed-off-by Andrew Cooper <[email protected]>
With the version in the commit log changed to 2.7 as noticed by Jan:
Thanks, Roger.
PATCH 3/6 CI: Refresh the Coverity Github Action configuration
In reply to Andrew CooperUpdate to Ubuntu 24.04, and checkout@v4 as v2 is deprecated.
The build step goes out of it's way to exclude docs and stubdom (but include plain MiniOS), so disable those at the ./configure stage.
Refresh the package list. libbz2-dev was in there twice, and e2fslibs-dev is a a transitional package to libext2fs-dev. I'm not aware of libtool ever having been a Xen dependency.
---
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Oleksii Kurochko <[email protected]>
--- .github/workflows/coverity.yml | 36 ++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
.github/workflows/coverity.yml +24 -12
@@ -8,27 +8,39 @@ on: jobs: coverity: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Install build dependencies run: | - sudo apt-get install -y wget git gawk \ - libbz2-dev build-essential \ - zlib1g-dev libncurses5-dev iasl \ - libbz2-dev e2fslibs-dev uuid-dev ocaml \ - ocaml-findlib libyajl-dev \ - autoconf libtool liblzma-dev \ - python3-dev golang libsystemd-dev + sudo apt-get install -y \ + build-essential \ + git-core \ + golang \ + iasl \ + libbz2-dev \ + libext2fs-dev \ + liblzma-dev \ + libncurses5-dev \ + libyajl-dev \ + libzstd-dev \ + ocaml \ + ocaml-findlib \ + python3-dev \ + uuid-dev \ + zlib1g-dev \ - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: staging - name: Configure Xen run: | - ./configure --with-system-qemu=/bin/true \ - --with-system-seabios=/bin/true \ - --with-system-ovmf=/bin/true + ./configure \ + --disable-docs \ + --disable-stubdom \ + --with-system-qemu=/bin/true \ + --with-system-seabios=/bin/true \ + --with-system-ovmf=/bin/true \ - name: Pre build stuff run: |
Signature · 1 line
2.39.2
Re: [PATCH for-4.19 3/6] CI: Refresh the Coverity Github Action configuration
Quoted 4 lines · Andrew Cooper
Update to Ubuntu 24.04, and checkout@v4 as v2 is deprecated.
The build step goes out of it's way to exclude docs and stubdom (but include plain MiniOS), so disable those at the ./configure stage.
Since we now disable those at configure time, could the build step be switched to a plain make build?
Thanks, Roger.
Re: [PATCH for-4.19 3/6] CI: Refresh the Coverity Github Action configuration
Quoted 7 lines · Roger Pau Monné
Quoted 4 lines · Andrew Cooper
Update to Ubuntu 24.04, and checkout@v4 as v2 is deprecated.
The build step goes out of it's way to exclude docs and stubdom (but include plain MiniOS), so disable those at the ./configure stage.
Since we now disable those at configure time, could the build step be switched to a plain
make build?
Yeah, that works.
https://github.com/andyhhp/xen/actions/runs/9840942508/job/27166367683
The job failed with I put an explicit exit 1 at the end to avoid uploading to Coverity. This action doesn't have a dry-run option.
I'll send out a v2.
~Andrew
PATCH v2 3/6 CI: Refresh the Coverity Github Action configuration
In reply to Andrew CooperUpdate to Ubuntu 24.04, and checkout@v4 as v2 is deprecated.
The build step goes out of it's way to exclude docs and stubdom (but include plain MiniOS), so disable those at the ./configure stage and simplify the build step somewhat.
Refresh the package list. libbz2-dev was in there twice, and e2fslibs-dev is a a transitional package to libext2fs-dev. I'm not aware of libtool ever having been a Xen dependency.
---
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Oleksii Kurochko <[email protected]>
v2:
* Simplify the build step too.
https://github.com/andyhhp/xen/actions/runs/9840942508/job/27166367683 (manually terminated with an exit 1 because there's no --dry-run mode.)
--- .github/workflows/coverity.yml | 38 ++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-)
.github/workflows/coverity.yml +25 -13
@@ -8,27 +8,39 @@ on: jobs: coverity: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Install build dependencies run: | - sudo apt-get install -y wget git gawk \ - libbz2-dev build-essential \ - zlib1g-dev libncurses5-dev iasl \ - libbz2-dev e2fslibs-dev uuid-dev ocaml \ - ocaml-findlib libyajl-dev \ - autoconf libtool liblzma-dev \ - python3-dev golang libsystemd-dev + sudo apt-get install -y \ + build-essential \ + git-core \ + golang \ + iasl \ + libbz2-dev \ + libext2fs-dev \ + liblzma-dev \ + libncurses5-dev \ + libyajl-dev \ + libzstd-dev \ + ocaml \ + ocaml-findlib \ + python3-dev \ + uuid-dev \ + zlib1g-dev \ - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: staging - name: Configure Xen run: | - ./configure --with-system-qemu=/bin/true \ - --with-system-seabios=/bin/true \ - --with-system-ovmf=/bin/true + ./configure \ + --disable-docs \ + --disable-stubdom \ + --with-system-qemu=/bin/true \ + --with-system-seabios=/bin/true \ + --with-system-ovmf=/bin/true \ - name: Pre build stuff run: |
@@ -36,7 +48,7 @@ jobs: - uses: vapier/coverity-scan-action@v1 with: - command: make -j`nproc` build-xen build-tools && make -j`nproc` -C extras/mini-os/ + command: make -j`nproc` build && make -j`nproc` -C extras/mini-os/ project: XenProject email: ${{ secrets.COVERITY_SCAN_EMAIL }} token: ${{ secrets.COVERITY_SCAN_TOKEN }}
Signature · 1 line
2.39.2
Re: [PATCH for-4.19 v2 3/6] CI: Refresh the Coverity Github Action configuration
Quoted 11 lines · Andrew Cooper
Update to Ubuntu 24.04, and checkout@v4 as v2 is deprecated.
The build step goes out of it's way to exclude docs and stubdom (but include plain MiniOS), so disable those at the ./configure stage and simplify the build step somewhat.
Refresh the package list. libbz2-dev was in there twice, and e2fslibs-dev is a a transitional package to libext2fs-dev. I'm not aware of libtool ever having been a Xen dependency.
Signed-off-by Andrew Cooper <[email protected]>
Thanks, Roger.
PATCH 4/6 build: Drop openssl as a build dependency
In reply to Andrew CooperThe final user was blktap1, removed in Xen 4.6.
---
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Oleksii Kurochko <[email protected]>
--- README | 1 - automation/build/debian/bookworm-arm64v8.dockerfile | 1 - automation/build/debian/bookworm-i386.dockerfile | 1 - automation/build/debian/bookworm.dockerfile | 1 - automation/build/debian/jessie-i386.dockerfile | 1 - automation/build/debian/jessie.dockerfile | 1 - automation/build/debian/stretch-i386.dockerfile | 1 - automation/build/debian/stretch.dockerfile | 1 - automation/build/fedora/29.dockerfile | 1 - automation/build/ubuntu/bionic.dockerfile | 1 - automation/build/ubuntu/focal.dockerfile | 1 - automation/build/ubuntu/trusty.dockerfile | 1 - automation/build/ubuntu/xenial.dockerfile | 1 - automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile | 1 - automation/tests-artifacts/kernel/6.1.19.dockerfile | 1 - 15 files changed, 15 deletions(-)
README +0 -1
@@ -52,7 +52,6 @@ provided by your OS distributor: * Development install of zlib (e.g., zlib-dev) * Development install of Python 2.7 or later (e.g., python-dev) * Development install of curses (e.g., libncurses-dev) - * Development install of openssl (e.g., openssl-dev) * Development install of x11 (e.g. xorg-x11-dev) * Development install of uuid (e.g. uuid-dev) * Development install of yajl (e.g. libyajl-dev)
automation/build/debian/bookworm-arm64v8.dockerfile +0 -1
@@ -15,7 +15,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python3-dev \ python3-setuptools \ xorg-dev \
automation/build/debian/bookworm-i386.dockerfile +0 -1
@@ -17,7 +17,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python3-dev \ python3-setuptools \ xorg-dev \
automation/build/debian/bookworm.dockerfile +0 -1
@@ -15,7 +15,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python3-dev \ python3-setuptools \ xorg-dev \
automation/build/debian/jessie-i386.dockerfile +0 -1
@@ -24,7 +24,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python-dev \ xorg-dev \ uuid-dev \
automation/build/debian/jessie.dockerfile +0 -1
@@ -22,7 +22,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python-dev \ xorg-dev \ uuid-dev \
automation/build/debian/stretch-i386.dockerfile +0 -1
@@ -24,7 +24,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python-dev \ python3-dev \ xorg-dev \
automation/build/debian/stretch.dockerfile +0 -1
@@ -22,7 +22,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python-dev \ python3-dev \ xorg-dev \
automation/build/fedora/29.dockerfile +0 -1
@@ -10,7 +10,6 @@ RUN dnf -y install \ gcc-c++ \ ncurses-devel \ zlib-devel \ - openssl-devel \ python-devel \ python3-devel \ libuuid-devel \
automation/build/ubuntu/bionic.dockerfile +0 -1
@@ -15,7 +15,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python-dev \ python3-dev \ xorg-dev \
automation/build/ubuntu/focal.dockerfile +0 -1
@@ -15,7 +15,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python3-dev \ python3-setuptools \ xorg-dev \
automation/build/ubuntu/trusty.dockerfile +0 -1
@@ -15,7 +15,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python-dev \ python3-dev \ xorg-dev \
automation/build/ubuntu/xenial.dockerfile +0 -1
@@ -15,7 +15,6 @@ RUN apt-get update && \ build-essential \ zlib1g-dev \ libncurses5-dev \ - libssl-dev \ python-dev \ python3-dev \ xorg-dev \
automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile +0 -1
@@ -14,7 +14,6 @@ WORKDIR /build RUN apt-get update && \ apt-get --quiet --yes install \ build-essential \ - libssl-dev \ bc \ curl \ flex \
automation/tests-artifacts/kernel/6.1.19.dockerfile +0 -1
@@ -14,7 +14,6 @@ WORKDIR /build RUN apt-get update && \ apt-get --quiet --yes install \ build-essential \ - libssl-dev \ bc \ curl \ flex \
Signature · 1 line
2.39.2
Re: [PATCH for-4.19 4/6] build: Drop openssl as a build dependency
Quoted 4 lines · Andrew Cooper
The final user was blktap1, removed in Xen 4.6.
Fixes f6bcc035084a ("tools: remove blktap1")Signed-off-by Andrew Cooper <[email protected]>
Thanks, Roger.
PATCH 5/6 build: Drop libiconv as a build dependecy
In reply to Andrew CooperThe 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.
---
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Oleksii Kurochko <[email protected]>
--- .cirrus.yml | 2 +- config/Tools.mk.in | 1 - tools/configure | 44 -------------------------------------------- tools/configure.ac | 2 -- 4 files changed, 1 insertion(+), 48 deletions(-)
.cirrus.yml +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
config/Tools.mk.in +0 -1
@@ -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@
tools/configure +0 -44
56 lines not on this page · raw message
tools/configure.ac +0 -2
@@ -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])])
Signature · 1 line
2.39.2
Re: [PATCH for-4.19 5/6] build: Drop libiconv as a build dependecy
Quoted 7 lines · Andrew Cooper
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 2a556b63a22d ("Drop blktap2")Signed-off-by Andrew Cooper <[email protected]>
Thanks, Roger.
PATCH 6/6 build: Drop xorg-x11 as a build dependency
In reply to Andrew CooperThe history on this one is complicated. The note to README was added in commit 1f95747a4f16 ("Add openssl-dev and xorg-x11-dev to README") in 2007.
At the time, there was a vendered version of Qemu in xen.git with a local modification using <X11/keysymdef.h> to access the monitor console over VNC.
The final reference to keysymdef.h was dropped in commit 85896a7c4dc7 ("build:
add autoconf to replace custom checks in tools/check") in 2012. The next prior mention was in 2009 with commit a8ccb671c377 ("tools: fix x11 check") noting that x11 was not a direct dependcy of Xen; it was transitive through SDL for Qemu for source-based distros.
These days its only the Debian based dockerfiles which install xorg-x11, and Qemu builds fine in these and others without x11.
---
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Oleksii Kurochko <[email protected]>
This in particular should shrink the size of the containers somewhat.
--- README | 1 - automation/build/debian/bookworm-arm64v8.dockerfile | 1 - automation/build/debian/bookworm-i386.dockerfile | 1 - automation/build/debian/bookworm.dockerfile | 1 - automation/build/debian/jessie-i386.dockerfile | 1 - automation/build/debian/jessie.dockerfile | 1 - automation/build/debian/stretch-i386.dockerfile | 1 - automation/build/debian/stretch.dockerfile | 1 - automation/build/ubuntu/bionic.dockerfile | 1 - automation/build/ubuntu/focal.dockerfile | 1 - automation/build/ubuntu/trusty.dockerfile | 1 - automation/build/ubuntu/xenial.dockerfile | 1 - 12 files changed, 12 deletions(-)
README +0 -1
@@ -52,7 +52,6 @@ provided by your OS distributor: * Development install of zlib (e.g., zlib-dev) * Development install of Python 2.7 or later (e.g., python-dev) * Development install of curses (e.g., libncurses-dev) - * Development install of x11 (e.g. xorg-x11-dev) * Development install of uuid (e.g. uuid-dev) * Development install of yajl (e.g. libyajl-dev) * Development install of libaio (e.g. libaio-dev) version 0.3.107 or
automation/build/debian/bookworm-arm64v8.dockerfile +0 -1
@@ -17,7 +17,6 @@ RUN apt-get update && \ libncurses5-dev \ python3-dev \ python3-setuptools \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/debian/bookworm-i386.dockerfile +0 -1
@@ -19,7 +19,6 @@ RUN apt-get update && \ libncurses5-dev \ python3-dev \ python3-setuptools \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/debian/bookworm.dockerfile +0 -1
@@ -17,7 +17,6 @@ RUN apt-get update && \ libncurses5-dev \ python3-dev \ python3-setuptools \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/debian/jessie-i386.dockerfile +0 -1
@@ -25,7 +25,6 @@ RUN apt-get update && \ zlib1g-dev \ libncurses5-dev \ python-dev \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/debian/jessie.dockerfile +0 -1
@@ -23,7 +23,6 @@ RUN apt-get update && \ zlib1g-dev \ libncurses5-dev \ python-dev \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/debian/stretch-i386.dockerfile +0 -1
@@ -26,7 +26,6 @@ RUN apt-get update && \ libncurses5-dev \ python-dev \ python3-dev \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/debian/stretch.dockerfile +0 -1
@@ -24,7 +24,6 @@ RUN apt-get update && \ libncurses5-dev \ python-dev \ python3-dev \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/ubuntu/bionic.dockerfile +0 -1
@@ -17,7 +17,6 @@ RUN apt-get update && \ libncurses5-dev \ python-dev \ python3-dev \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/ubuntu/focal.dockerfile +0 -1
@@ -17,7 +17,6 @@ RUN apt-get update && \ libncurses5-dev \ python3-dev \ python3-setuptools \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/ubuntu/trusty.dockerfile +0 -1
@@ -17,7 +17,6 @@ RUN apt-get update && \ libncurses5-dev \ python-dev \ python3-dev \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
automation/build/ubuntu/xenial.dockerfile +0 -1
@@ -17,7 +17,6 @@ RUN apt-get update && \ libncurses5-dev \ python-dev \ python3-dev \ - xorg-dev \ uuid-dev \ libyajl-dev \ libaio-dev \
Signature · 1 line
2.39.2
Re: [PATCH for-4.19 6/6] build: Drop xorg-x11 as a build dependency
Quoted 12 lines · Andrew Cooper
The history on this one is complicated. The note to README was added in commit
1f95747a4f16("Add openssl-dev and xorg-x11-dev to README") in 2007.At the time, there was a vendered version of Qemu in xen.git with a local modification using <
X11/keysymdef.h> to access the monitor console over VNC.The final reference to
keysymdef.hwas dropped in commit85896a7c4dc7("build:
add autoconf to replace custom checks intools/check") in 2012. The next prior mention was in 2009 with commita8ccb671c377("tools: fix x11 check") noting that x11 was not a direct dependcy of Xen; it was transitive through SDL for Qemu for source-based distros.
Quoted 4 lines
These days its only the Debian based dockerfiles which install xorg-x11, and Qemu builds fine in these and others without x11.
Signed-off-by Andrew Cooper <[email protected]>
There may be one more past dependency, but I'm not sure since I don't know the package split in the distros you touch files for. In unmodified_drivers/ (removed in 4.14) there was a use of the lndir utility coming (on SUSE distros) in xorg-x11-util-devel. Then again unmodified_drivers/ may never have been of any interest to gitlab-CI.
Jan
Re: [PATCH for-4.19 6/6] build: Drop xorg-x11 as a build dependency
Quoted 16 lines · Jan Beulich
Quoted 15 lines · Andrew Cooper
The history on this one is complicated. The note to README was added in commit
1f95747a4f16("Add openssl-dev and xorg-x11-dev to README") in 2007.At the time, there was a vendered version of Qemu in xen.git with a local modification using <
X11/keysymdef.h> to access the monitor console over VNC.The final reference to
keysymdef.hwas dropped in commit85896a7c4dc7("build:
add autoconf to replace custom checks intools/check") in 2012. The next prior mention was in 2009 with commita8ccb671c377("tools: fix x11 check") noting that x11 was not a direct dependcy of Xen; it was transitive through SDL for Qemu for source-based distros.These days its only the Debian based dockerfiles which install xorg-x11, and Qemu builds fine in these and others without x11.
Quoted 6 lines
Quoted 1 line
Signed-off-by Andrew Cooper <[email protected]>There may be one more past dependency, but I'm not sure since I don't know the package split in the distros you touch files for. In unmodified_drivers/ (removed in 4.14) there was a use of the lndir utility coming (on SUSE distros) in xorg-x11-util-devel. Then again unmodified_drivers/ may never have been of any interest to gitlab-CI.
Huh. I've not come across lndir before, but we've got an opencoded forms of it in several places. (tools/include, and tools/firmware/xen-dir, maybe others.)
Still - as a build dependency, it should be the main xorg package, not the *-dev{el} package. Whether a dev{el} package pulls in the main package is distro-dependent.
4.15 is the oldest tree we test in Gitlab CI, and I don't believe we built unmodified_drivers/ in prior versions either.
Either way - I don't think this alters the outcome of the patch. I can add a paragraph to the commit message noting that there might have been another unspecified dependency on xorg ?
~Andrew
Re: [PATCH for-4.19 6/6] build: Drop xorg-x11 as a build dependency
Quoted 24 lines · Andrew Cooper
Quoted 16 lines · Jan Beulich
Quoted 15 lines · Andrew Cooper
The history on this one is complicated. The note to README was added in commit
1f95747a4f16("Add openssl-dev and xorg-x11-dev to README") in 2007.At the time, there was a vendered version of Qemu in xen.git with a local modification using <
X11/keysymdef.h> to access the monitor console over VNC.The final reference to
keysymdef.hwas dropped in commit85896a7c4dc7("build:
add autoconf to replace custom checks intools/check") in 2012. The next prior mention was in 2009 with commita8ccb671c377("tools: fix x11 check") noting that x11 was not a direct dependcy of Xen; it was transitive through SDL for Qemu for source-based distros.These days its only the Debian based dockerfiles which install xorg-x11, and Qemu builds fine in these and others without x11.
Quoted 6 lines
Quoted 1 line
Signed-off-by Andrew Cooper <[email protected]>There may be one more past dependency, but I'm not sure since I don't know the package split in the distros you touch files for. In unmodified_drivers/ (removed in 4.14) there was a use of the lndir utility coming (on SUSE distros) in xorg-x11-util-devel. Then again unmodified_drivers/ may never have been of any interest to gitlab-CI.
Quoted 7 lines
Huh. I've not come across lndir before, but we've got an opencoded forms of it in several places. (
tools/include, andtools/firmware/xen-dir, maybe others.)Still - as a build dependency, it should be the main xorg package, not the *-dev{el} package. Whether a dev{el} package pulls in the main package is distro-dependent.
Just to mention it: It is the -devel package where this script lives (for our distros at least), not the main one. I don't expect any -devel would be pulled in by any main package?
Quoted 2 lines
4.15 is the oldest tree we test in Gitlab CI, and I don't believe we built unmodified_drivers/ in prior versions either.
Oh, sure, I didn't mean to indicate any change would be necessary, except ...
Quoted 3 lines
Either way - I don't think this alters the outcome of the patch. I can add a paragraph to the commit message noting that there might have been another unspecified dependency on xorg ?
... perhaps mention of this (yet later removed) dependency we had.
Jan
Re: [PATCH for-4.19 6/6] build: Drop xorg-x11 as a build dependency
In reply to Andrew CooperQuoted 12 lines · Andrew Cooper
The history on this one is complicated. The note to README was added in commit
1f95747a4f16("Add openssl-dev and xorg-x11-dev to README") in 2007.At the time, there was a vendered version of Qemu in xen.git with a local modification using <
X11/keysymdef.h> to access the monitor console over VNC.The final reference to
keysymdef.hwas dropped in commit85896a7c4dc7("build:
add autoconf to replace custom checks intools/check") in 2012. The next prior mention was in 2009 with commita8ccb671c377("tools: fix x11 check") noting that x11 was not a direct dependcy of Xen; it was transitive through SDL for Qemu for source-based distros.
Quoted 4 lines
These days its only the Debian based dockerfiles which install xorg-x11, and Qemu builds fine in these and others without x11.
Signed-off-by Andrew Cooper <[email protected]>
Thanks, Roger.
Quoted 38 lines · Andrew Cooper
Work to fix a few build system checks, and to strip the obsolete contents of
the build containers, prior to adding new containers (will be part 3).Andrew Cooper (6):
build: Regenerate ./configure with Autoconf 2.71
build: Fix the version of python checked for by ./configure
CI: Refresh the Coverity Github Action configuration
build: Drop openssl as a build dependency
build: Drop libiconv as a build dependecy
build: Drop xorg-x11 as a build dependency.cirrus.yml | 2 +- .github/workflows/coverity.yml | 36 +- README | 2 - .../build/debian/bookworm-arm64v8.dockerfile | 2 - .../build/debian/bookworm-i386.dockerfile | 2 - automation/build/debian/bookworm.dockerfile | 2 - .../build/debian/jessie-i386.dockerfile | 2 - automation/build/debian/jessie.dockerfile | 2 - .../build/debian/stretch-i386.dockerfile | 2 - automation/build/debian/stretch.dockerfile | 2 - automation/build/fedora/29.dockerfile | 1 - automation/build/ubuntu/bionic.dockerfile | 2 - automation/build/ubuntu/focal.dockerfile | 2 - automation/build/ubuntu/trusty.dockerfile | 2 - automation/build/ubuntu/xenial.dockerfile | 2 - .../kernel/5.19-arm64v8.dockerfile | 1 - .../tests-artifacts/kernel/6.1.19.dockerfile | 1 - config/Tools.mk.in | 1 - configure | 1006 +-- docs/configure | 990 +-- stubdom/configure | 2293 ++++-- tools/config.h.in | 15 +- tools/configure | 6397 +++++++++------ --
tools/configure.ac | 4 +-
Quoted 2 lines
24 files changed, 6136 insertions(+), 4635 deletions(-)
~ Oleksii