View | Details | Raw Unified | Return to bug 205751 | Differences between
and this patch

Collapse All | Expand All

(-)patch-bsd (-2 / +2 lines)
Lines 40-46 Link Here
40
     AC_MSG_CHECKING([if ccache supports precompiled headers])
40
     AC_MSG_CHECKING([if ccache supports precompiled headers])
41
-    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null`
41
-    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null`
42
-    if test "x$HAS_GOOD_CCACHE" = x; then
42
-    if test "x$HAS_GOOD_CCACHE" = x; then
43
+    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split($3, a, "."); if (a@<:@1@:>@ >= 3 && (a@<:@2@:>@ > 1 || (a@<:@2@:>@ == 1 && a@<:@3@:>@ >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
43
+    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split(@$|@3, a, "."); if (a@<:@1@:>@ >= 3 && (a@<:@2@:>@ > 1 || (a@<:@2@:>@ == 1 && a@<:@3@:>@ >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
44
+    if test "x$HAS_GOOD_CCACHE" = xyes; then
44
+    if test "x$HAS_GOOD_CCACHE" = xyes; then
45
       AC_MSG_RESULT([no, disabling ccache])
45
       AC_MSG_RESULT([no, disabling ccache])
46
       CCACHE=
46
       CCACHE=
Lines 593-599 Link Here
593
 $as_echo_n "checking if ccache supports precompiled headers... " >&6; }
593
 $as_echo_n "checking if ccache supports precompiled headers... " >&6; }
594
-    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
594
-    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
595
-    if test "x$HAS_GOOD_CCACHE" = x; then
595
-    if test "x$HAS_GOOD_CCACHE" = x; then
596
+    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split(, a, "."); if (a[1] >= 3 && (a[2] > 1 || (a[2] == 1 && a[3] >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
596
+    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split($3, a, "."); if (a[1] >= 3 && (a[2] > 1 || (a[2] == 1 && a[3] >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
597
+    if test "x$HAS_GOOD_CCACHE" = xyes; then
597
+    if test "x$HAS_GOOD_CCACHE" = xyes; then
598
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
598
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
599
 $as_echo "no, disabling ccache" >&6; }
599
 $as_echo "no, disabling ccache" >&6; }

Return to bug 205751