--- old/make/autoconf/generated-configure.sh 2018-01-23 23:09:33.812297200 +0900 +++ new/make/autoconf/generated-configure.sh 2018-01-23 23:09:33.010714000 +0900 @@ -1096,6 +1096,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -1385,6 +1386,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1637,6 +1639,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1774,7 +1785,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1927,6 +1938,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -5176,7 +5188,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1513805283 +DATE_WHEN_GENERATED=1516716346 ############################################################################### # @@ -15720,6 +15732,10 @@ VAR_OS=windows VAR_OS_ENV=windows.msys ;; + *wsl*) + VAR_OS=windows + VAR_OS_ENV=windows.wsl + ;; *aix*) VAR_OS=aix VAR_OS_TYPE=unix @@ -15907,6 +15923,10 @@ VAR_OS=windows VAR_OS_ENV=windows.msys ;; + *wsl*) + VAR_OS=windows + VAR_OS_ENV=windows.wsl + ;; *aix*) VAR_OS=aix VAR_OS_TYPE=unix @@ -16559,8 +16579,19 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSYS_ROOT_PATH" >&5 $as_echo "$MSYS_ROOT_PATH" >&6; } WINDOWS_ENV_ROOT_PATH="$MSYS_ROOT_PATH" + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking wsl kernel" >&5 +$as_echo_n "checking wsl kernel... " >&6; } + WSL_KERNEL_VERSION=`$UNAME -r` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WSL_KERNEL_VERSION" >&5 +$as_echo "$WSL_KERNEL_VERSION" >&6; } + + WINDOWS_ENV_VENDOR='wsl' + WINDOWS_ENV_VERSION="$WSL_KERNEL_VERSION" + + WINDOWS_ENV_ROOT_PATH="/mnt/c" else - as_fn_error $? "Unknown Windows environment. Neither cygwin nor msys was detected." "$LINENO" 5 + as_fn_error $? "Unknown Windows environment: $OPENJDK_BUILD_OS_ENV " "$LINENO" 5 fi # Test if windows or unix (cygwin/msys) find is first in path. @@ -17939,6 +17970,8 @@ MAKE_EXPECTED_ENV='cygwin' elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then MAKE_EXPECTED_ENV='msys' + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + MAKE_EXPECTED_ENV='.' else as_fn_error $? "Unknown Windows environment" "$LINENO" 5 fi @@ -18323,6 +18356,8 @@ MAKE_EXPECTED_ENV='cygwin' elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then MAKE_EXPECTED_ENV='msys' + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + MAKE_EXPECTED_ENV='.' else as_fn_error $? "Unknown Windows environment" "$LINENO" 5 fi @@ -18712,6 +18747,8 @@ MAKE_EXPECTED_ENV='cygwin' elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then MAKE_EXPECTED_ENV='msys' + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + MAKE_EXPECTED_ENV='.' else as_fn_error $? "Unknown Windows environment" "$LINENO" 5 fi @@ -19095,6 +19132,8 @@ MAKE_EXPECTED_ENV='cygwin' elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then MAKE_EXPECTED_ENV='msys' + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + MAKE_EXPECTED_ENV='.' else as_fn_error $? "Unknown Windows environment" "$LINENO" 5 fi @@ -19501,6 +19540,8 @@ MAKE_EXPECTED_ENV='cygwin' elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then MAKE_EXPECTED_ENV='msys' + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + MAKE_EXPECTED_ENV='.' else as_fn_error $? "Unknown Windows environment" "$LINENO" 5 fi @@ -19885,6 +19926,8 @@ MAKE_EXPECTED_ENV='cygwin' elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then MAKE_EXPECTED_ENV='msys' + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + MAKE_EXPECTED_ENV='.' else as_fn_error $? "Unknown Windows environment" "$LINENO" 5 fi @@ -20274,6 +20317,8 @@ MAKE_EXPECTED_ENV='cygwin' elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then MAKE_EXPECTED_ENV='msys' + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + MAKE_EXPECTED_ENV='.' else as_fn_error $? "Unknown Windows environment" "$LINENO" 5 fi @@ -20657,6 +20702,8 @@ MAKE_EXPECTED_ENV='cygwin' elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then MAKE_EXPECTED_ENV='msys' + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + MAKE_EXPECTED_ENV='.' else as_fn_error $? "Unknown Windows environment" "$LINENO" 5 fi @@ -21088,6 +21135,8 @@ MAKE_EXPECTED_ENV='cygwin' elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then MAKE_EXPECTED_ENV='msys' + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then + MAKE_EXPECTED_ENV='.' else as_fn_error $? "Unknown Windows environment" "$LINENO" 5 fi