tools: Drop gettext as a build dependency

It has not been a dependency since at least 4.13.  Remove its mandatory check
from ./configure.

Annotate the dependency in the CI dockerfiles, and drop them from CirrusCI and
TravisCI.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
This commit is contained in:
Andrew Cooper committed 2021-04-09 10:31:17 +01:00
1 parent 11ba6936d3
commit e21a6a4f96
24 files changed
+20 -54

No files matched your search

+1 -1
View File
@@ -4,7 +4,7 @@ freebsd_template: &FREEBSD_TEMPLATE
APPEND_LIB: /usr/local/lib
APPEND_INCLUDES: /usr/local/include
install_script: pkg install -y seabios gettext-tools gmake
install_script: pkg install -y seabios gmake
pkgconf python libiconv bison perl5
yajl lzo2 pixman argp-standalone
libxml2 glib git
-1
View File
@@ -54,7 +54,6 @@ addons:
- pkg-config
- flex
- bison
- gettext
- acpica-tools
- bin86
- bcc
-1
View File
@@ -63,7 +63,6 @@ provided by your OS distributor:
* bridge-utils package (/sbin/brctl)
* iproute package (/sbin/ip)
* GNU bison and GNU flex
* GNU gettext
* ACPI ASL compiler (iasl)
In addition to the above there are a number of optional build
@@ -22,6 +22,7 @@ RUN \
apk add dev86 && \
apk add dtc-dev && \
apk add gcc && \
# gettext for Xen < 4.13
apk add gettext && \
apk add git && \
apk add iasl && \
+1
View File
@@ -23,6 +23,7 @@ RUN \
apk add gcc && \
apk add g++ && \
apk add clang && \
# gettext for Xen < 4.13
apk add gettext && \
apk add git && \
apk add iasl && \
+1
View File
@@ -26,6 +26,7 @@ RUN rpm --rebuilddb && \
python-devel \
libuuid-devel \
pkgconfig \
# gettext for Xen < 4.13
gettext \
flex \
bison \
+1
View File
@@ -24,6 +24,7 @@ RUN yum -y install \
python-devel \
libuuid-devel \
pkgconfig \
# gettext for Xen < 4.13
gettext \
flex \
bison \
@@ -28,6 +28,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
@@ -26,6 +26,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
@@ -29,6 +29,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
@@ -27,6 +27,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
@@ -27,6 +27,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
libfdt-dev \
@@ -29,6 +29,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
@@ -27,6 +27,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
+1
View File
@@ -17,6 +17,7 @@ RUN dnf -y install \
python3-devel \
libuuid-devel \
pkgconfig \
# gettext for Xen < 4.13
gettext \
flex \
bison \
@@ -22,6 +22,7 @@ RUN zypper install -y --no-recommends \
flex \
gcc \
gcc-c++ \
# gettext-tools for Xen < 4.13
gettext-tools \
git \
glib2-devel \
@@ -22,6 +22,7 @@ RUN zypper install -y --no-recommends \
flex \
gcc \
gcc-c++ \
# gettext-tools for Xen < 4.13
gettext-tools \
git \
glib2-devel \
@@ -27,6 +27,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
+1
View File
@@ -26,6 +26,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
@@ -27,6 +27,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
@@ -27,6 +27,7 @@ RUN apt-get update && \
pkg-config \
flex \
bison \
# gettext for Xen < 4.13
gettext \
acpica-tools \
bin86 \
@@ -19,6 +19,7 @@ RUN \
apk add dbus && \
apk add bash && \
apk add python2 && \
# gettext for Xen < 4.13
apk add gettext && \
apk add zlib && \
apk add ncurses && \
-49
View File
@@ -689,7 +689,6 @@ INSTALL_PROGRAM
SET_MAKE
AWK
IASL
XGETTEXT
FLEX
BISON
PERL
@@ -847,7 +846,6 @@ PYTHON
PERL
BISON
FLEX
XGETTEXT
AS86
LD86
BCC
@@ -1597,7 +1595,6 @@ Some influential environment variables:
PERL Path to Perl parser
BISON Path to Bison parser generator
FLEX Path to Flex lexical analyser generator
XGETTEXT Path to xgetttext tool
AS86 Path to as86 tool
LD86 Path to ld86 tool
BCC Path to bcc tool
@@ -4738,7 +4735,6 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"
# Checks for programs.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -7846,51 +7842,6 @@ fi
if ! $rump; then
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_XGETTEXT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
[\\/]* | ?:[\\/]*)
ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT="no"
;;
esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
$as_echo "$XGETTEXT" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test x"${XGETTEXT}" = x"no"
then
as_fn_error $? "Unable to find xgettext, please install xgettext" "$LINENO" 5
fi
case "$host_cpu" in
i[3456]86|x86_64|aarch64)
# Extract the first word of "iasl", so it can be a program name with args.
-2
View File
@@ -298,7 +298,6 @@ AC_ARG_VAR([PYTHON], [Path to the Python parser])
AC_ARG_VAR([PERL], [Path to Perl parser])
AC_ARG_VAR([BISON], [Path to Bison parser generator])
AC_ARG_VAR([FLEX], [Path to Flex lexical analyser generator])
AC_ARG_VAR([XGETTEXT], [Path to xgetttext tool])
AC_ARG_VAR([AS86], [Path to as86 tool])
AC_ARG_VAR([LD86], [Path to ld86 tool])
AC_ARG_VAR([BCC], [Path to bcc tool])
@@ -381,7 +380,6 @@ AS_IF([test "$cross_compiling" != yes], [
if ! $rump; then
AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext])
dnl as86, ld86, bcc and iasl are only required when the host system is x86*.
dnl "host" here means the platform on which the hypervisor and tools is
dnl going to run, not the platform on which we are building (known as
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.