# HG changeset patch # User andrew # Date 1461455759 -3600 # Node ID 6a70821528ba139062da755d8237c2dbc9ffdf02 # Parent e02d4e69a2a21813c960372e9b13a4c021cbc7d4 PR2933: Support ccache 3.2 and later Summary: Extend regular expression to allow >= 3.2 Contributed-by: James Le Cuirot diff -r e02d4e69a2a2 -r 6a70821528ba common/autoconf/build-performance.m4 --- a/common/autoconf/build-performance.m4 Wed Apr 20 03:38:59 2016 +0100 +++ b/common/autoconf/build-performance.m4 Sun Apr 24 00:55:59 2016 +0100 @@ -199,7 +199,7 @@ # Only use ccache if it is 3.1.4 or later, which supports # precompiled headers. AC_MSG_CHECKING([if ccache supports precompiled headers]) - HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null` + HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.[456789]|[2-9])") 2> /dev/null` if test "x$HAS_GOOD_CCACHE" = x; then AC_MSG_RESULT([no, disabling ccache]) CCACHE= diff -r e02d4e69a2a2 -r 6a70821528ba common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Wed Apr 20 03:38:59 2016 +0100 +++ b/common/autoconf/generated-configure.sh Sun Apr 24 00:55:59 2016 +0100 @@ -3919,7 +3919,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1459480380 +DATE_WHEN_GENERATED=1461455467 ############################################################################### # @@ -35764,7 +35764,7 @@ # precompiled headers. { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5 $as_echo_n "checking if ccache supports precompiled headers... " >&6; } - HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null` + HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.456789|2-9)") 2> /dev/null` if test "x$HAS_GOOD_CCACHE" = x; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 $as_echo "no, disabling ccache" >&6; }