Skip to content

D
dragonwell8

openanolis / dragonwell8

通知 5
Star 3
Fork 0
D
dragonwell8
提交 987839ac 编写于 作者: K katleman
浏览文件
操作

Merge

上级 a1b50061 26ccd5fc
隐藏空白更改
内联 并排
Showing with 128 addition and 54 deletion
common/autoconf/basics.m4
浏览文件 @ 987839ac
...@@ -129,7 +129,7 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], ...@@ -129,7 +129,7 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
if test "x$READLINK_TESTED" != yes; then if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different # On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink. # purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --help 2>&1 | $GREP GNU` ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then if test "x$ISGNU" = x; then
# A readlink that we do not know how to use. # A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there? # Are there other non-GNU readlinks out there?
...@@ -141,20 +141,24 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], ...@@ -141,20 +141,24 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
if test "x$READLINK" != x; then if test "x$READLINK" != x; then
$1=`$READLINK -f [$]$1` $1=`$READLINK -f [$]$1`
else else
# Save the current directory for restoring afterwards
STARTDIR=$PWD STARTDIR=$PWD
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME [$]$1` sym_link_dir=`$DIRNAME [$]$1`
sym_link_file=`$BASENAME [$]$1` sym_link_file=`$BASENAME [$]$1`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done! # This is not a symbolic link! We are done!
break break
fi fi
# The link might be relative! We have to use cd to travel safely. # Again resolve directory symlinks since the target of the just found
cd $sym_link_dir # link could be in a different directory
# ... and we must get the to the absolute path, not one using symbolic links.
cd `pwd -P`
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
...@@ -286,7 +290,7 @@ AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD` ...@@ -286,7 +290,7 @@ AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
# Where is the source? It is located two levels above the configure script. # Where is the source? It is located two levels above the configure script.
CURDIR="$PWD" CURDIR="$PWD"
cd "$AUTOCONF_DIR/../.." cd "$AUTOCONF_DIR/../.."
SRC_ROOT="`pwd`" SRC_ROOT="`$THEPWDCMD`"
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
PATH_SEP=";" PATH_SEP=";"
......
common/autoconf/generated-configure.sh
浏览文件 @ 987839ac
...@@ -3672,7 +3672,7 @@ fi ...@@ -3672,7 +3672,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1354106772 DATE_WHEN_GENERATED=1354721616
############################################################################### ###############################################################################
# #
...@@ -6903,7 +6903,7 @@ SCRIPT="$0" ...@@ -6903,7 +6903,7 @@ SCRIPT="$0"
if test "x$READLINK_TESTED" != yes; then if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different # On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink. # purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --help 2>&1 | $GREP GNU` ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then if test "x$ISGNU" = x; then
# A readlink that we do not know how to use. # A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there? # Are there other non-GNU readlinks out there?
...@@ -6915,20 +6915,24 @@ SCRIPT="$0" ...@@ -6915,20 +6915,24 @@ SCRIPT="$0"
if test "x$READLINK" != x; then if test "x$READLINK" != x; then
SCRIPT=`$READLINK -f $SCRIPT` SCRIPT=`$READLINK -f $SCRIPT`
else else
# Save the current directory for restoring afterwards
STARTDIR=$PWD STARTDIR=$PWD
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $SCRIPT` sym_link_dir=`$DIRNAME $SCRIPT`
sym_link_file=`$BASENAME $SCRIPT` sym_link_file=`$BASENAME $SCRIPT`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done! # This is not a symbolic link! We are done!
break break
fi fi
# The link might be relative! We have to use cd to travel safely. # Again resolve directory symlinks since the target of the just found
cd $sym_link_dir # link could be in a different directory
# ... and we must get the to the absolute path, not one using symbolic links.
cd `pwd -P`
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
...@@ -6944,7 +6948,7 @@ AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD` ...@@ -6944,7 +6948,7 @@ AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
# Where is the source? It is located two levels above the configure script. # Where is the source? It is located two levels above the configure script.
CURDIR="$PWD" CURDIR="$PWD"
cd "$AUTOCONF_DIR/../.." cd "$AUTOCONF_DIR/../.."
SRC_ROOT="`pwd`" SRC_ROOT="`$THEPWDCMD`"
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
PATH_SEP=";" PATH_SEP=";"
...@@ -7593,7 +7597,7 @@ NOSYM_CURDIR="$CURDIR" ...@@ -7593,7 +7597,7 @@ NOSYM_CURDIR="$CURDIR"
if test "x$READLINK_TESTED" != yes; then if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different # On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink. # purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --help 2>&1 | $GREP GNU` ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then if test "x$ISGNU" = x; then
# A readlink that we do not know how to use. # A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there? # Are there other non-GNU readlinks out there?
...@@ -7605,20 +7609,24 @@ NOSYM_CURDIR="$CURDIR" ...@@ -7605,20 +7609,24 @@ NOSYM_CURDIR="$CURDIR"
if test "x$READLINK" != x; then if test "x$READLINK" != x; then
NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR` NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR`
else else
# Save the current directory for restoring afterwards
STARTDIR=$PWD STARTDIR=$PWD
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $NOSYM_CURDIR` sym_link_dir=`$DIRNAME $NOSYM_CURDIR`
sym_link_file=`$BASENAME $NOSYM_CURDIR` sym_link_file=`$BASENAME $NOSYM_CURDIR`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done! # This is not a symbolic link! We are done!
break break
fi fi
# The link might be relative! We have to use cd to travel safely. # Again resolve directory symlinks since the target of the just found
cd $sym_link_dir # link could be in a different directory
# ... and we must get the to the absolute path, not one using symbolic links.
cd `pwd -P`
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
...@@ -11707,7 +11715,7 @@ fi ...@@ -11707,7 +11715,7 @@ fi
if test "x$READLINK_TESTED" != yes; then if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different # On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink. # purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --help 2>&1 | $GREP GNU` ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then if test "x$ISGNU" = x; then
# A readlink that we do not know how to use. # A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there? # Are there other non-GNU readlinks out there?
...@@ -11719,20 +11727,24 @@ fi ...@@ -11719,20 +11727,24 @@ fi
if test "x$READLINK" != x; then if test "x$READLINK" != x; then
BINARY=`$READLINK -f $BINARY` BINARY=`$READLINK -f $BINARY`
else else
# Save the current directory for restoring afterwards
STARTDIR=$PWD STARTDIR=$PWD
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $BINARY` sym_link_dir=`$DIRNAME $BINARY`
sym_link_file=`$BASENAME $BINARY` sym_link_file=`$BASENAME $BINARY`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done! # This is not a symbolic link! We are done!
break break
fi fi
# The link might be relative! We have to use cd to travel safely. # Again resolve directory symlinks since the target of the just found
cd $sym_link_dir # link could be in a different directory
# ... and we must get the to the absolute path, not one using symbolic links.
cd `pwd -P`
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
...@@ -15827,7 +15839,14 @@ $as_echo "$as_me: Please point to the VC/bin directory within the Visual Studio ...@@ -15827,7 +15839,14 @@ $as_echo "$as_me: Please point to the VC/bin directory within the Visual Studio
fi fi
if test -d "$WIN_SDK_BASE"; then if test -d "$WIN_SDK_BASE"; then
if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then # There have been cases of partial or broken SDK installations. A missing
# lib dir is not going to work.
if test ! -d "$WIN_SDK_BASE/../lib"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
...@@ -15862,7 +15881,14 @@ $as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignori ...@@ -15862,7 +15881,14 @@ $as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignori
fi fi
if test -d "$WIN_SDK_BASE"; then if test -d "$WIN_SDK_BASE"; then
if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then # There have been cases of partial or broken SDK installations. A missing
# lib dir is not going to work.
if test ! -d "$WIN_SDK_BASE/../lib"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
...@@ -15897,7 +15923,14 @@ $as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignori ...@@ -15897,7 +15923,14 @@ $as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignori
fi fi
if test -d "$WIN_SDK_BASE"; then if test -d "$WIN_SDK_BASE"; then
if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then # There have been cases of partial or broken SDK installations. A missing
# lib dir is not going to work.
if test ! -d "$WIN_SDK_BASE/../lib"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
...@@ -15931,7 +15964,14 @@ $as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignori ...@@ -15931,7 +15964,14 @@ $as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignori
fi fi
if test -d "$WIN_SDK_BASE"; then if test -d "$WIN_SDK_BASE"; then
if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then # There have been cases of partial or broken SDK installations. A missing
# lib dir is not going to work.
if test ! -d "$WIN_SDK_BASE/../lib"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
...@@ -15964,7 +16004,14 @@ $as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignori ...@@ -15964,7 +16004,14 @@ $as_echo "$as_me: Warning: Installation is broken, SetEnv.Cmd is missing. Ignori
fi fi
if test -d "$WIN_SDK_BASE"; then if test -d "$WIN_SDK_BASE"; then
if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then # There have been cases of partial or broken SDK installations. A missing
# lib dir is not going to work.
if test ! -d "$WIN_SDK_BASE/../lib"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5
$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;}
elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5
$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;}
VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
...@@ -16434,8 +16481,9 @@ $as_echo "present but broken" >&6; } ...@@ -16434,8 +16481,9 @@ $as_echo "present but broken" >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; } $as_echo "ok" >&6; }
VS_INCLUDE="$INCLUDE" # Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk.
VS_LIB="$LIB" VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'`
VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'`
VS_PATH="$PATH" VS_PATH="$PATH"
...@@ -18082,7 +18130,7 @@ $as_echo_n "checking resolved symbolic links for CC... " >&6; } ...@@ -18082,7 +18130,7 @@ $as_echo_n "checking resolved symbolic links for CC... " >&6; }
if test "x$READLINK_TESTED" != yes; then if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different # On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink. # purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --help 2>&1 | $GREP GNU` ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then if test "x$ISGNU" = x; then
# A readlink that we do not know how to use. # A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there? # Are there other non-GNU readlinks out there?
...@@ -18094,20 +18142,24 @@ $as_echo_n "checking resolved symbolic links for CC... " >&6; } ...@@ -18094,20 +18142,24 @@ $as_echo_n "checking resolved symbolic links for CC... " >&6; }
if test "x$READLINK" != x; then if test "x$READLINK" != x; then
TEST_COMPILER=`$READLINK -f $TEST_COMPILER` TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
else else
# Save the current directory for restoring afterwards
STARTDIR=$PWD STARTDIR=$PWD
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $TEST_COMPILER` sym_link_dir=`$DIRNAME $TEST_COMPILER`
sym_link_file=`$BASENAME $TEST_COMPILER` sym_link_file=`$BASENAME $TEST_COMPILER`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done! # This is not a symbolic link! We are done!
break break
fi fi
# The link might be relative! We have to use cd to travel safely. # Again resolve directory symlinks since the target of the just found
cd $sym_link_dir # link could be in a different directory
# ... and we must get the to the absolute path, not one using symbolic links.
cd `pwd -P`
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
...@@ -18504,7 +18556,7 @@ $as_echo_n "checking for resolved symbolic links for CC... " >&6; } ...@@ -18504,7 +18556,7 @@ $as_echo_n "checking for resolved symbolic links for CC... " >&6; }
if test "x$READLINK_TESTED" != yes; then if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different # On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink. # purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --help 2>&1 | $GREP GNU` ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then if test "x$ISGNU" = x; then
# A readlink that we do not know how to use. # A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there? # Are there other non-GNU readlinks out there?
...@@ -18516,20 +18568,24 @@ $as_echo_n "checking for resolved symbolic links for CC... " >&6; } ...@@ -18516,20 +18568,24 @@ $as_echo_n "checking for resolved symbolic links for CC... " >&6; }
if test "x$READLINK" != x; then if test "x$READLINK" != x; then
PROPER_COMPILER_CC=`$READLINK -f $PROPER_COMPILER_CC` PROPER_COMPILER_CC=`$READLINK -f $PROPER_COMPILER_CC`
else else
# Save the current directory for restoring afterwards
STARTDIR=$PWD STARTDIR=$PWD
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC` sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
sym_link_file=`$BASENAME $PROPER_COMPILER_CC` sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done! # This is not a symbolic link! We are done!
break break
fi fi
# The link might be relative! We have to use cd to travel safely. # Again resolve directory symlinks since the target of the just found
cd $sym_link_dir # link could be in a different directory
# ... and we must get the to the absolute path, not one using symbolic links.
cd `pwd -P`
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
...@@ -19565,7 +19621,7 @@ $as_echo_n "checking resolved symbolic links for CXX... " >&6; } ...@@ -19565,7 +19621,7 @@ $as_echo_n "checking resolved symbolic links for CXX... " >&6; }
if test "x$READLINK_TESTED" != yes; then if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different # On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink. # purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --help 2>&1 | $GREP GNU` ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then if test "x$ISGNU" = x; then
# A readlink that we do not know how to use. # A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there? # Are there other non-GNU readlinks out there?
...@@ -19577,20 +19633,24 @@ $as_echo_n "checking resolved symbolic links for CXX... " >&6; } ...@@ -19577,20 +19633,24 @@ $as_echo_n "checking resolved symbolic links for CXX... " >&6; }
if test "x$READLINK" != x; then if test "x$READLINK" != x; then
TEST_COMPILER=`$READLINK -f $TEST_COMPILER` TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
else else
# Save the current directory for restoring afterwards
STARTDIR=$PWD STARTDIR=$PWD
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $TEST_COMPILER` sym_link_dir=`$DIRNAME $TEST_COMPILER`
sym_link_file=`$BASENAME $TEST_COMPILER` sym_link_file=`$BASENAME $TEST_COMPILER`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done! # This is not a symbolic link! We are done!
break break
fi fi
# The link might be relative! We have to use cd to travel safely. # Again resolve directory symlinks since the target of the just found
cd $sym_link_dir # link could be in a different directory
# ... and we must get the to the absolute path, not one using symbolic links.
cd `pwd -P`
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
...@@ -19987,7 +20047,7 @@ $as_echo_n "checking for resolved symbolic links for CXX... " >&6; } ...@@ -19987,7 +20047,7 @@ $as_echo_n "checking for resolved symbolic links for CXX... " >&6; }
if test "x$READLINK_TESTED" != yes; then if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different # On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink. # purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --help 2>&1 | $GREP GNU` ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then if test "x$ISGNU" = x; then
# A readlink that we do not know how to use. # A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there? # Are there other non-GNU readlinks out there?
...@@ -19999,20 +20059,24 @@ $as_echo_n "checking for resolved symbolic links for CXX... " >&6; } ...@@ -19999,20 +20059,24 @@ $as_echo_n "checking for resolved symbolic links for CXX... " >&6; }
if test "x$READLINK" != x; then if test "x$READLINK" != x; then
PROPER_COMPILER_CXX=`$READLINK -f $PROPER_COMPILER_CXX` PROPER_COMPILER_CXX=`$READLINK -f $PROPER_COMPILER_CXX`
else else
# Save the current directory for restoring afterwards
STARTDIR=$PWD STARTDIR=$PWD
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX` sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
sym_link_file=`$BASENAME $PROPER_COMPILER_CXX` sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done! # This is not a symbolic link! We are done!
break break
fi fi
# The link might be relative! We have to use cd to travel safely. # Again resolve directory symlinks since the target of the just found
cd $sym_link_dir # link could be in a different directory
# ... and we must get the to the absolute path, not one using symbolic links.
cd `pwd -P`
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
common/autoconf/toolchain_windows.m4
浏览文件 @ 987839ac
...@@ -48,7 +48,12 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT], ...@@ -48,7 +48,12 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT],
METHOD="$2" METHOD="$2"
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE) BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE)
if test -d "$WIN_SDK_BASE"; then if test -d "$WIN_SDK_BASE"; then
if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then # There have been cases of partial or broken SDK installations. A missing
# lib dir is not going to work.
if test ! -d "$WIN_SDK_BASE/../lib"; then
AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
AC_MSG_NOTICE([Warning: Installation is broken, lib dir is missing. Ignoring])
elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD]) AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
...@@ -200,8 +205,9 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV], ...@@ -200,8 +205,9 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.]) AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.])
else else
AC_MSG_RESULT([ok]) AC_MSG_RESULT([ok])
VS_INCLUDE="$INCLUDE" # Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk.
VS_LIB="$LIB" VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'`
VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'`
VS_PATH="$PATH" VS_PATH="$PATH"
AC_SUBST(VS_INCLUDE) AC_SUBST(VS_INCLUDE)
AC_SUBST(VS_LIB) AC_SUBST(VS_LIB)
......
common/makefiles/JavaCompilation.gmk
浏览文件 @ 987839ac
...@@ -149,7 +149,7 @@ define SetupArchive ...@@ -149,7 +149,7 @@ define SetupArchive
$$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES)) \ $$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES)) \
$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES)))) $$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
ifeq (,$$($1_SKIP_METAINF)) ifeq (,$$($1_SKIP_METAINF))
$1_DEPS+=$$(shell $(FIND) $$(addsuffix /META-INF,$$($1_SRCS)) -type f 2> /dev/null)) $1_DEPS+=$$(shell $(FIND) $$(addsuffix /META-INF,$$($1_SRCS)) -type f 2> /dev/null)
endif endif
endif endif
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或