jdk8-mips64-public: comparison common/autoconf/basics.m4

-:03e60e87d92a
+:c31e9dc1fe3d
 eval path="$path"
 if test ! -f "$path" && test ! -d "$path"; then
 AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
 fi
-$1="`cd "$path"; $THEPWDCMD`"
+$1="`cd "$path"; $THEPWDCMD -L`"
 fi
 ])
 # This will make sure the given variable points to a executable
 # with a full and proper path. This means:
 # Save the current directory for restoring afterwards
 STARTDIR=$PWD
 COUNTER=0
 sym_link_dir=`$DIRNAME [$]$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`
+# Use -P flag to resolve symlinks in directories.
-sym_link_dir=`$THEPWDCMD`
+cd `$THEPWDCMD -P`
+sym_link_dir=`$THEPWDCMD -P`
 # Resolve file symlinks
 while test $COUNTER -lt 20; do
 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 if test "x$ISLINK" == x; then
 # This is not a symbolic link! We are done!
 break
 fi
 # Again resolve directory symlinks since the target of the just found
 # link could be in a different directory
 cd `$DIRNAME $ISLINK`
-sym_link_dir=`$THEPWDCMD`
+sym_link_dir=`$THEPWDCMD -P`
 sym_link_file=`$BASENAME $ISLINK`
 let COUNTER=COUNTER+1
 done
 cd $STARTDIR
 $1=$sym_link_dir/$sym_link_file
 BASIC_REQUIRE_PROG(LS, ls)
 BASIC_REQUIRE_PROG(MKDIR, mkdir)
 BASIC_REQUIRE_PROG(MKTEMP, mktemp)
 BASIC_REQUIRE_PROG(MV, mv)
 BASIC_REQUIRE_PROG(PRINTF, printf)
-BASIC_REQUIRE_PROG(THEPWDCMD, pwd)
 BASIC_REQUIRE_PROG(RM, rm)
 BASIC_REQUIRE_PROG(SH, sh)
 BASIC_REQUIRE_PROG(SORT, sort)
 BASIC_REQUIRE_PROG(TAIL, tail)
 BASIC_REQUIRE_PROG(TAR, tar)
 BASIC_CHECK_NONEMPTY(NAWK)
 # Always force rm.
 RM="$RM -f"
+# pwd behaves differently on various platforms and some don't support the -L flag.
+# Always use the bash builtin pwd to get uniform behavior.
+THEPWDCMD=pwd
 # These are not required on all platforms
 AC_PATH_PROG(CYGPATH, cygpath)
 AC_PATH_PROG(READLINK, readlink)
 AC_PATH_PROG(DF, df)
 AC_PATH_PROG(SETFILE, SetFile)
 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
 AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
 [
 # Locate the directory of this script.
 SCRIPT="[$]0"
-BASIC_REMOVE_SYMBOLIC_LINKS(SCRIPT)
+AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
-AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
 # Where is the source? It is located two levels above the configure script.
 CURDIR="$PWD"
 cd "$AUTOCONF_DIR/../.."
-SRC_ROOT="`$THEPWDCMD`"
+SRC_ROOT="`$THEPWDCMD -L`"
 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
 PATH_SEP=";"
 BASIC_CHECK_PATHS_WINDOWS
 else
 AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
 	[use this as the name of the configuration @<:@generated from important configuration options@:>@])],
 [ CONF_NAME=${with_conf_name} ])
 # Test from where we are running configure, in or outside of src root.
-# To enable comparison of directories, CURDIR needs to be symlink free
+if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
-# just like SRC_ROOT already is
+|| test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
-NOSYM_CURDIR="$CURDIR"
+|| test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
-BASIC_REMOVE_SYMBOLIC_LINKS(NOSYM_CURDIR)
-if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \
-|| test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \
-|| test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
 # We are running configure from the src root.
 # Create a default ./build/target-variant-debuglevel output root.
 if test "x${CONF_NAME}" = x; then
 CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
 fi

Mercurial > jdk8-mips64-public / file comparison

comparison: common/autoconf/basics.m4

common/autoconf/basics.m4