1.1 --- a/common/autoconf/generated-configure.sh Wed Feb 07 10:39:09 2018 -0800
1.2 +++ b/common/autoconf/generated-configure.sh Sun Mar 18 15:15:36 2018 -0700
1.3 @@ -1749,8 +1749,8 @@
1.4 --disable-precompiled-headers
1.5 disable using precompiled headers when compiling C++
1.6 [enabled]
1.7 - --disable-ccache disable using ccache to speed up recompilations
1.8 - [enabled]
1.9 + --enable-ccache enable using ccache to speed up recompilations
1.10 + [disabled]
1.11
1.12 Optional Packages:
1.13 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1.14 @@ -3776,7 +3776,7 @@
1.15
1.16
1.17 #
1.18 -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
1.19 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.20 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.21 #
1.22 # This code is free software; you can redistribute it and/or modify it
1.23 @@ -3912,7 +3912,7 @@
1.24 #CUSTOM_AUTOCONF_INCLUDE
1.25
1.26 # Do not change or remove the following line, it is needed for consistency checks:
1.27 -DATE_WHEN_GENERATED=1515659624
1.28 +DATE_WHEN_GENERATED=1521218818
1.29
1.30 ###############################################################################
1.31 #
1.32 @@ -36392,18 +36392,26 @@
1.33
1.34 # Check whether --enable-ccache was given.
1.35 if test "${enable_ccache+set}" = set; then :
1.36 - enableval=$enable_ccache; ENABLE_CCACHE=${enable_ccache}
1.37 -else
1.38 - ENABLE_CCACHE=yes
1.39 -fi
1.40 -
1.41 - if test "x$ENABLE_CCACHE" = xyes; then
1.42 + enableval=$enable_ccache;
1.43 +fi
1.44 +
1.45 +
1.46 + CCACHE=
1.47 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking is ccache enabled" >&5
1.48 +$as_echo_n "checking is ccache enabled... " >&6; }
1.49 + ENABLE_CCACHE=$enable_ccache
1.50 + if test "x$enable_ccache" = xyes; then
1.51 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.52 +$as_echo "yes" >&6; }
1.53 OLD_PATH="$PATH"
1.54 if test "x$TOOLS_DIR" != x; then
1.55 PATH=$TOOLS_DIR:$PATH
1.56 fi
1.57 - # Extract the first word of "ccache", so it can be a program name with args.
1.58 -set dummy ccache; ac_word=$2
1.59 +
1.60 + for ac_prog in ccache
1.61 +do
1.62 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.63 +set dummy $ac_prog; ac_word=$2
1.64 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.65 $as_echo_n "checking for $ac_word... " >&6; }
1.66 if ${ac_cv_path_CCACHE+:} false; then :
1.67 @@ -36442,13 +36450,34 @@
1.68 fi
1.69
1.70
1.71 + test -n "$CCACHE" && break
1.72 +done
1.73 +
1.74 +
1.75 + if test "x$CCACHE" = x; then
1.76 + if test "xccache" = x; then
1.77 + PROG_NAME=ccache
1.78 + else
1.79 + PROG_NAME=ccache
1.80 + fi
1.81 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.82 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.83 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.84 + fi
1.85 +
1.86 +
1.87 + CCACHE_STATUS="enabled"
1.88 PATH="$OLD_PATH"
1.89 - else
1.90 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ccache" >&5
1.91 -$as_echo_n "checking for ccache... " >&6; }
1.92 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5
1.93 -$as_echo "explicitly disabled" >&6; }
1.94 - CCACHE=
1.95 + elif test "x$enable_ccache" = xno; then
1.96 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, explicitly disabled" >&5
1.97 +$as_echo "no, explicitly disabled" >&6; }
1.98 + elif test "x$enable_ccache" = x; then
1.99 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.100 +$as_echo "no" >&6; }
1.101 + else
1.102 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
1.103 +$as_echo "unknown" >&6; }
1.104 + as_fn_error $? "--enable-ccache does not accept any parameters" "$LINENO" 5
1.105 fi
1.106
1.107
1.108 @@ -36463,12 +36492,15 @@
1.109 # When using a non home ccache directory, assume the use is to share ccache files
1.110 # with other users. Thus change the umask.
1.111 SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
1.112 - fi
1.113 - CCACHE_FOUND=""
1.114 + if test "x$CCACHE" = x; then
1.115 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-ccache-dir has no meaning when ccache is not enabled" >&5
1.116 +$as_echo "$as_me: WARNING: --with-ccache-dir has no meaning when ccache is not enabled" >&2;}
1.117 + fi
1.118 + fi
1.119 +
1.120 if test "x$CCACHE" != x; then
1.121
1.122 if test "x$CCACHE" != x; then
1.123 - CCACHE_FOUND="true"
1.124 # Only use ccache if it is 3.1.4 or later, which supports
1.125 # precompiled headers.
1.126 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
1.127 @@ -36478,6 +36510,7 @@
1.128 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
1.129 $as_echo "no, disabling ccache" >&6; }
1.130 CCACHE=
1.131 + CCACHE_STATUS="disabled"
1.132 else
1.133 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.134 $as_echo "yes" >&6; }
1.135 @@ -36510,6 +36543,7 @@
1.136 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccaching of precompiled headers" >&5
1.137 $as_echo "no, disabling ccaching of precompiled headers" >&6; }
1.138 CCACHE=
1.139 + CCACHE_STATUS="disabled"
1.140 fi
1.141 fi
1.142 fi
1.143 @@ -36586,14 +36620,6 @@
1.144 IS_RECONFIGURE=no
1.145 fi
1.146
1.147 - if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
1.148 - HIDE_PERFORMANCE_HINTS=yes
1.149 - else
1.150 - HIDE_PERFORMANCE_HINTS=no
1.151 - # Hide it the next time around...
1.152 - $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
1.153 - fi
1.154 -
1.155
1.156 # At the end, call the custom hook. (Dummy macro if no custom sources available)
1.157
1.158 @@ -37896,22 +37922,6 @@
1.159
1.160 # Finally output some useful information to the user
1.161
1.162 - if test "x$CCACHE_FOUND" != x; then
1.163 - if test "x$HAS_GOOD_CCACHE" = x; then
1.164 - CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
1.165 - CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
1.166 - else
1.167 - CCACHE_STATUS="installed and in use"
1.168 - fi
1.169 - else
1.170 - if test "x$GCC" = xyes; then
1.171 - CCACHE_STATUS="not installed (consider installing)"
1.172 - CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
1.173 - else
1.174 - CCACHE_STATUS="not available for your system"
1.175 - fi
1.176 - fi
1.177 -
1.178 printf "\n"
1.179 printf "====================================================\n"
1.180 printf "A new configuration has been successfully created in\n"
1.181 @@ -37942,46 +37952,11 @@
1.182 printf "Build performance summary:\n"
1.183 printf "* Cores to use: $JOBS\n"
1.184 printf "* Memory limit: $MEMORY_SIZE MB\n"
1.185 - printf "* ccache status: $CCACHE_STATUS\n"
1.186 + if test "x$CCACHE_STATUS" != "x"; then
1.187 + printf "* ccache status: $CCACHE_STATUS\n"
1.188 + fi
1.189 printf "\n"
1.190
1.191 - if test "x$CCACHE_HELP_MSG" != x && test "x$HIDE_PERFORMANCE_HINTS" = "xno"; then
1.192 - printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n"
1.193 - printf "$CCACHE_HELP_MSG\n"
1.194 -
1.195 - # Print a helpful message on how to acquire the necessary build dependency.
1.196 - # ccache is the help tag: freetype, cups, pulse, alsa etc
1.197 - MISSING_DEPENDENCY=ccache
1.198 -
1.199 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.200 - cygwin_help $MISSING_DEPENDENCY
1.201 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.202 - msys_help $MISSING_DEPENDENCY
1.203 - else
1.204 - PKGHANDLER_COMMAND=
1.205 -
1.206 - case $PKGHANDLER in
1.207 - apt-get)
1.208 - apt_help $MISSING_DEPENDENCY ;;
1.209 - yum)
1.210 - yum_help $MISSING_DEPENDENCY ;;
1.211 - port)
1.212 - port_help $MISSING_DEPENDENCY ;;
1.213 - pkgutil)
1.214 - pkgutil_help $MISSING_DEPENDENCY ;;
1.215 - pkgadd)
1.216 - pkgadd_help $MISSING_DEPENDENCY ;;
1.217 - esac
1.218 -
1.219 - if test "x$PKGHANDLER_COMMAND" != x; then
1.220 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.221 - fi
1.222 - fi
1.223 -
1.224 - printf "$HELP_MSG\n"
1.225 - printf "\n"
1.226 - fi
1.227 -
1.228 if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xyes"; then
1.229 printf "NOTE: You have requested to build more than one version of the JVM, which\n"
1.230 printf "will result in longer build times.\n"
