jdk8-mips64-public: comparison common/autoconf/generated-configure.sh

-:67122a315e79
+:28b247535e18
 --enable-sjavac         use sjavac to do fast incremental compiles
 [disabled]
 --disable-precompiled-headers
 disable using precompiled headers when compiling C++
 [enabled]
---disable-ccache        disable using ccache to speed up recompilations
+--enable-ccache         enable using ccache to speed up recompilations
-[enabled]
+[disabled]
 Optional Packages:
 --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
 --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
 --with-custom-make-dir  use this directory for custom build/make files
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this
 # definitions. It is replaced with custom functionality when building
 # custom sources.
 #CUSTOM_AUTOCONF_INCLUDE
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1515659624
+DATE_WHEN_GENERATED=1521218818
 ###############################################################################
 #
 # Initialization / Boot-strapping
 #
 # Setup use of ccache, if available
 # Check whether --enable-ccache was given.
 if test "${enable_ccache+set}" = set; then :
-enableval=$enable_ccache; ENABLE_CCACHE=${enable_ccache}
+enableval=$enable_ccache;
-else
+fi
-ENABLE_CCACHE=yes
-fi
+CCACHE=
-if test "x$ENABLE_CCACHE" = xyes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking is ccache enabled" >&5
+$as_echo_n "checking is ccache enabled... " >&6; }
+ENABLE_CCACHE=$enable_ccache
+if test "x$enable_ccache" = xyes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 OLD_PATH="$PATH"
 if test "x$TOOLS_DIR" != x; then
 PATH=$TOOLS_DIR:$PATH
 fi
-# Extract the first word of "ccache", so it can be a program name with args.
-set dummy ccache; ac_word=$2
+for ac_prog in ccache
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_CCACHE+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
+test -n "$CCACHE" && break
+done
+if test "x$CCACHE" = x; then
+if test "xccache" = x; then
+PROG_NAME=ccache
+else
+PROG_NAME=ccache
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+as_fn_error $? "Cannot continue" "$LINENO" 5
+fi
+CCACHE_STATUS="enabled"
 PATH="$OLD_PATH"
+elif test "x$enable_ccache" = xno; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, explicitly disabled" >&5
+$as_echo "no, explicitly disabled" >&6; }
+elif test "x$enable_ccache" = x; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ccache" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
-$as_echo_n "checking for ccache... " >&6; }
+$as_echo "unknown" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5
+as_fn_error $? "--enable-ccache does not accept any parameters" "$LINENO" 5
-$as_echo "explicitly disabled" >&6; }
-CCACHE=
 fi
 # Check whether --with-ccache-dir was given.
 if test "x$with_ccache_dir" != x; then
 # When using a non home ccache directory, assume the use is to share ccache files
 # with other users. Thus change the umask.
 SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
-fi
+if test "x$CCACHE" = x; then
-CCACHE_FOUND=""
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-ccache-dir has no meaning when ccache is not enabled" >&5
+$as_echo "$as_me: WARNING: --with-ccache-dir has no meaning when ccache is not enabled" >&2;}
+fi
+fi
 if test "x$CCACHE" != x; then
 if test "x$CCACHE" != x; then
-CCACHE_FOUND="true"
 # Only use ccache if it is 3.1.4 or later, which supports
 # 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`
 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; }
 CCACHE=
+CCACHE_STATUS="disabled"
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C-compiler supports ccache precompiled headers" >&5
 $as_echo_n "checking if C-compiler supports ccache precompiled headers... " >&6; }
 $as_echo "yes" >&6; }
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccaching of precompiled headers" >&5
 $as_echo "no, disabling ccaching of precompiled headers" >&6; }
 CCACHE=
+CCACHE_STATUS="disabled"
 fi
 fi
 fi
 if test "x$CCACHE" != x; then
 # Since we can't properly handle the dependencies for this, warn the user about the situation
 if test -e $OUTPUT_ROOT/spec.gmk; then
 IS_RECONFIGURE=yes
 else
 IS_RECONFIGURE=no
-fi
-if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
-HIDE_PERFORMANCE_HINTS=yes
-else
-HIDE_PERFORMANCE_HINTS=no
-# Hide it the next time around...
-$TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
 fi
 # At the end, call the custom hook. (Dummy macro if no custom sources available)
 # Finally output some useful information to the user
 # Finally output some useful information to the user
-if test "x$CCACHE_FOUND" != x; then
-if  test "x$HAS_GOOD_CCACHE" = x; then
-CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
-CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
-else
-CCACHE_STATUS="installed and in use"
-fi
-else
-if test "x$GCC" = xyes; then
-CCACHE_STATUS="not installed (consider installing)"
-CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
-else
-CCACHE_STATUS="not available for your system"
-fi
-fi
 printf "\n"
 printf "====================================================\n"
 printf "A new configuration has been successfully created in\n"
 printf "$OUTPUT_ROOT\n"
 if test "x$CONFIGURE_COMMAND_LINE" != x; then
 printf "\n"
 printf "Build performance summary:\n"
 printf "* Cores to use:   $JOBS\n"
 printf "* Memory limit:   $MEMORY_SIZE MB\n"
-printf "* ccache status:  $CCACHE_STATUS\n"
+if test "x$CCACHE_STATUS" != "x"; then
+printf "* ccache status:  $CCACHE_STATUS\n"
+fi
 printf "\n"
-if test "x$CCACHE_HELP_MSG" != x && test "x$HIDE_PERFORMANCE_HINTS" = "xno"; then
-printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n"
-printf "$CCACHE_HELP_MSG\n"
-# Print a helpful message on how to acquire the necessary build dependency.
-# ccache is the help tag: freetype, cups, pulse, alsa etc
-MISSING_DEPENDENCY=ccache
-if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-cygwin_help $MISSING_DEPENDENCY
-elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-msys_help $MISSING_DEPENDENCY
-else
-PKGHANDLER_COMMAND=
-case $PKGHANDLER in
-apt-get)
-apt_help     $MISSING_DEPENDENCY ;;
-yum)
-yum_help     $MISSING_DEPENDENCY ;;
-port)
-port_help    $MISSING_DEPENDENCY ;;
-pkgutil)
-pkgutil_help $MISSING_DEPENDENCY ;;
-pkgadd)
-pkgadd_help  $MISSING_DEPENDENCY ;;
-esac
-if test "x$PKGHANDLER_COMMAND" != x; then
-HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-fi
-fi
-printf "$HELP_MSG\n"
-printf "\n"
-fi
 if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xyes"; then
 printf "NOTE: You have requested to build more than one version of the JVM, which\n"
 printf "will result in longer build times.\n"
 printf "\n"

Mercurial > jdk8-mips64-public / file comparison

comparison: common/autoconf/generated-configure.sh

common/autoconf/generated-configure.sh