jdk-sandbox: comparison common/autoconf/generated-configure.sh

equal deleted inserted replaced

-:63fbc565bba5
+:98ce0879ab4c
 HOTSPOT_TOPDIR
 JAXWS_TOPDIR
 JAXP_TOPDIR
 CORBA_TOPDIR
 LANGTOOLS_TOPDIR
+JAVA_TOOL_FLAGS_SMALL
 JAVA_FLAGS_SMALL
 JAVA_FLAGS_BIG
 JAVA_FLAGS
 JAVAC_FLAGS
 BOOT_JDK_SOURCETARGET
 OTOOL
 LDD
 ZIP
 UNZIP
 FIND_DELETE
+OUTPUT_SYNC
+OUTPUT_SYNC_SUPPORTED
 MAKE
 CHECK_TOOLSDIR_MAKE
 CHECK_TOOLSDIR_GMAKE
 CHECK_MAKE
 CHECK_GMAKE
 with_tools_dir
 with_toolchain_path
 with_extra_path
 with_sdk_name
 with_conf_name
+with_output_sync
 with_builddeps_conf
 with_builddeps_server
 with_builddeps_dir
 with_builddeps_group
 enable_headful
 toolchain binaries (compilers etc)
 --with-extra-path       prepend these directories to the default path
 --with-sdk-name         use the platform SDK of the given name. [macosx]
 --with-conf-name        use this as the name of the configuration [generated
 from important configuration options]
+--with-output-sync      set make output sync type if supported by make.
+[recurse]
 --with-builddeps-conf   use this configuration file for the builddeps
 --with-builddeps-server download and use build dependencies from this server
 url
 --with-builddeps-dir    store downloaded build dependencies here
 [/localhome/builddeps]
 # Check if we have found a usable version of make
 # $1: the path to a potential make binary (or empty)
 # $2: the description on how we found this
 # Goes looking for a usable version of GNU make.
 # 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=1405336663
+DATE_WHEN_GENERATED=1407143049
 ###############################################################################
 #
 # Initialization / Boot-strapping
 #
 fi
 # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
 if test "x$OPENJDK_TARGET_OS_API" = xposix; then
-OPENJDK_TARGET_OS_API_DIR="solaris"
+OPENJDK_TARGET_OS_API_DIR="unix"
 fi
 if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
 OPENJDK_TARGET_OS_API_DIR="windows"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&5
 $as_echo "$as_me: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&6;}
+# Check if make supports the output sync option and if so, setup using it.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if make --output-sync is supported" >&5
+$as_echo_n "checking if make --output-sync is supported... " >&6; }
+if $MAKE --version -O > /dev/null 2>&1; then
+OUTPUT_SYNC_SUPPORTED=true
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for output-sync value" >&5
+$as_echo_n "checking for output-sync value... " >&6; }
+# Check whether --with-output-sync was given.
+if test "${with_output_sync+set}" = set; then :
+withval=$with_output_sync; OUTPUT_SYNC=$with_output_sync
+fi
+if test "x$OUTPUT_SYNC" = "x"; then
+OUTPUT_SYNC=none
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_SYNC" >&5
+$as_echo "$OUTPUT_SYNC" >&6; }
+if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then
+as_fn_error $? "Make did not the support the value $OUTPUT_SYNC as output sync type." "$LINENO" 5
+fi
+else
+OUTPUT_SYNC_SUPPORTED=false
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 # Test if find supports -delete
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
 $as_echo_n "checking if find supports -delete... " >&6; }
 FIND_DELETE="-delete"
 withval=$with_cacerts_file;
 fi
 if test "x$with_cacerts_file" != x; then
 CACERTS_FILE=$with_cacerts_file
-else
-CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
 fi
 ###############################################################################
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs_small" >&5
 $as_echo "$boot_jdk_jvmargs_small" >&6; }
 JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
+JAVA_TOOL_FLAGS_SMALL=""
+for f in $JAVA_FLAGS_SMALL; do
+JAVA_TOOL_FLAGS_SMALL="$JAVA_TOOL_FLAGS_SMALL -J$f"
+done
 ###############################################################################
 #
 LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
 fi
 # Setup some hard coded includes
 COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
--I${JDK_OUTPUTDIR}/include \
+-I${JDK_TOPDIR}/src/java.base/share/native/include \
--I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
+-I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
--I${JDK_TOPDIR}/src/share/javavm/export \
+-I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_API_DIR/native/include"
--I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
--I${JDK_TOPDIR}/src/share/native/common \
--I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
 # The shared libraries are compiled using the picflag.
 CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
 CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
 $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
-if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
 ENABLE_INTREE_EC=yes
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
 ENABLE_INTREE_EC=no

changeset 25854	98ce0879ab4c
parent 25616	5730ea123552
child 25882	bd4315f0084b