|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen stable-4.14] tools: Drop gettext as a build dependency
commit b5e3e6294ffaffef0e371315e3b4bdf4b0c4f181
Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Mar 26 11:25:07 2021 +0000
Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Wed Apr 12 09:00:36 2023 +0100
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@xxxxxxxxxx>
Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
(cherry picked from commit e21a6a4f966a7e91cb0bb014dbe15d15cc0502ad)
---
.travis.yml | 1 -
README | 1 -
tools/configure | 49 -------------------------------------------------
tools/configure.ac | 2 --
4 files changed, 53 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 15ca9e9047..dd1cf4709a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,6 @@ addons:
- pkg-config
- flex
- bison
- - gettext
- acpica-tools
- bin86
- bcc
diff --git a/README b/README
index c7da4b06e2..6b726cfb68 100644
--- a/README
+++ b/README
@@ -60,7 +60,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)
* Libc multiarch package (e.g. libc6-dev-i386 / glibc-devel.i686).
Required when building on a 64-bit platform to build
diff --git a/tools/configure b/tools/configure
index f3f19c1a90..cf937c9b7a 100755
--- a/tools/configure
+++ b/tools/configure
@@ -685,7 +685,6 @@ INSTALL_PROGRAM
SET_MAKE
AWK
IASL
-XGETTEXT
BASH
FLEX
BISON
@@ -844,7 +843,6 @@ PERL
BISON
FLEX
BASH
-XGETTEXT
AS86
LD86
BCC
@@ -1590,7 +1588,6 @@ Some influential environment variables:
BISON Path to Bison parser generator
FLEX Path to Flex lexical analyser generator
BASH Path to bash shell
- XGETTEXT Path to xgetttext tool
AS86 Path to as86 tool
LD86 Path to ld86 tool
BCC Path to bcc tool
@@ -4718,7 +4715,6 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"
-
# Checks for programs.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -7826,51 +7822,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.
diff --git a/tools/configure.ac b/tools/configure.ac
index 9d126b7a14..1808cffafb 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -298,7 +298,6 @@ 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([BASH], [Path to bash shell])
-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
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.14
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |