summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Bennée2021-02-02 14:39:52 +0100
committerAlex Bennée2021-02-08 10:41:00 +0100
commit2df52b9bfdf0c4f4fc4103e837d6f59488832795 (patch)
treee17a409ef8e6a659f392411461bd4fb858e67007
parenttests/docker: add a docker-exec-copy-test (diff)
downloadqemu-2df52b9bfdf0c4f4fc4103e837d6f59488832795.tar.gz
qemu-2df52b9bfdf0c4f4fc4103e837d6f59488832795.tar.xz
qemu-2df52b9bfdf0c4f4fc4103e837d6f59488832795.zip
configure: make version_ge more tolerant of shady version input
When checking GDB versions we have to tolerate all sorts of random distro extensions to the version string. While we already attempt to do some of that before we call version_ge is makes sense to try and regularise the first input by stripping extraneous -'s. While we at it convert the old-style shell quoting into a cleaner form t shut up my editors linter lest it confuse me by underlining the whole line. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Tested-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20210202134001.25738-8-alex.bennee@linaro.org>
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index a34f91171d..36036aa2f2 100755
--- a/configure
+++ b/configure
@@ -198,8 +198,8 @@ has() {
}
version_ge () {
- local_ver1=`echo $1 | tr . ' '`
- local_ver2=`echo $2 | tr . ' '`
+ local_ver1=$(expr "$1" : '\([0-9.]*\)' | tr . ' ')
+ local_ver2=$(echo "$2" | tr . ' ')
while true; do
set x $local_ver1
local_first=${2-0}