RFR: JDK-8062223: Upgrading to ccache 1.3.10 disables the use of ccache

Steven Loomis steven.loomis at oracle.com
Fri Feb 27 17:14:52 UTC 2015


Bug:https://bugs.openjdk.java.net/browse/JDK-8074048
webrev:  cr.openjdk.java.net has decided it doesn't like me, till it is 
fixed trivial change is below


----------------

--- old/common/autoconf/build-performance.m4    2015-02-27 
09:09:47.974447669 -0800
+++ new/common/autoconf/build-performance.m4    2015-02-27 
09:09:47.884403256 -0800
@@ -215,7 +215,7 @@
    if test "x$CCACHE" != x; then
      if test "x$USE_PRECOMPILED_HEADER" = "x1"; then
        HAS_BAD_CCACHE=[`$ECHO $CCACHE_VERSION | \
-          $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]'`]
+          $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]$'`]
        if test "x$HAS_BAD_CCACHE" != "x"; then
          AC_MSG_ERROR([Precompiled headers requires ccache 3.1.4 or 
later, found $CCACHE_VERSION])
        fi
--- old/common/autoconf/generated-configure.sh    2015-02-27 
09:09:48.373644566 -0800
+++ new/common/autoconf/generated-configure.sh    2015-02-27 
09:09:48.246581895 -0800
@@ -4393,7 +4393,7 @@
  #CUSTOM_AUTOCONF_INCLUDE

  # Do not change or remove the following line, it is needed for 
consistency checks:
-DATE_WHEN_GENERATED=1424202275
+DATE_WHEN_GENERATED=1424990238

  ###############################################################################
  #
@@ -51700,7 +51700,7 @@
    if test "x$CCACHE" != x; then
      if test "x$USE_PRECOMPILED_HEADER" = "x1"; then
        HAS_BAD_CCACHE=`$ECHO $CCACHE_VERSION | \
-          $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]'`
+          $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]$'`
        if test "x$HAS_BAD_CCACHE" != "x"; then
          as_fn_error $? "Precompiled headers requires ccache 3.1.4 or 
later, found $CCACHE_VERSION" "$LINENO" 5
        fi
--- old/closed/autoconf/generated-configure.sh    2015-02-27 
09:09:49.216060073 -0800
+++ new/closed/autoconf/generated-configure.sh    2015-02-27 
09:09:49.108006777 -0800
@@ -4717,7 +4717,7 @@


  # Do not change or remove the following line, it is needed for 
consistency checks:
-DATE_WHEN_GENERATED=1424202275
+DATE_WHEN_GENERATED=1424990238

  ###############################################################################
  #
@@ -52342,7 +52342,7 @@
    if test "x$CCACHE" != x; then
      if test "x$USE_PRECOMPILED_HEADER" = "x1"; then
        HAS_BAD_CCACHE=`$ECHO $CCACHE_VERSION | \
-          $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]'`
+          $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]$'`
        if test "x$HAS_BAD_CCACHE" != "x"; then
          as_fn_error $? "Precompiled headers requires ccache 3.1.4 or 
later, found $CCACHE_VERSION" "$LINENO" 5
        fi



More information about the build-dev mailing list