From ba22ac05daa9a03d368f236d7d663a00d838c2df Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 15 Sep 2016 15:12:52 -0500 Subject: [PATCH] build: update to latest gnulib In particular, pull in gnulib's fix for the broken SIZE_MAX on s390. * .gnulib: Update to latest. * bootstrap: Resync to upstream. Signed-off-by: Eric Blake --- .gnulib | 2 +- bootstrap | 38 ++++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.gnulib b/.gnulib index e89b4a7aef..5ddd9d713d 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit e89b4a7aefce9cb02963920712ba7cdd13641644 +Subproject commit 5ddd9d713d58d6c6d10494a28ceee6988d20ff98 diff --git a/bootstrap b/bootstrap index f060bab83e..5d3c2898cf 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2016-01-24.06; # UTC +scriptversion=2016-11-03.18; # UTC # Bootstrap this package from checked-out sources. @@ -418,28 +418,30 @@ sort_ver() { # sort -V is not generally available done } +get_version_sed=' +# Move version to start of line. +s/.*[v ]\([0-9]\)/\1/ + +# Skip lines that do not start with version. +/^[0-9]/!d + +# Remove characters after the version. +s/[^.a-z0-9-].*// + +# The first component must be digits only. +s/^\([0-9]*\)[a-z-].*/\1/ + +#the following essentially does s/5.005/5.5/ +s/\.0*\([1-9]\)/.\1/g +p +q' + get_version() { app=$1 $app --version >/dev/null 2>&1 || { $app --version; return 1; } - $app --version 2>&1 | - sed -n '# Move version to start of line. - s/.*[v ]\([0-9]\)/\1/ - - # Skip lines that do not start with version. - /^[0-9]/!d - - # Remove characters after the version. - s/[^.a-z0-9-].*// - - # The first component must be digits only. - s/^\([0-9]*\)[a-z-].*/\1/ - - #the following essentially does s/5.005/5.5/ - s/\.0*\([1-9]\)/.\1/g - p - q' + $app --version 2>&1 | sed -n "$get_version_sed" } check_versions() {