Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Sun, 16 Dec 2012 22:02:35 -0800
- author
- lana
- date
- Sun, 16 Dec 2012 22:02:35 -0800
- changeset 546
- 2ed5be3dd506
- parent 536
- fb1bf5e5bc9e
- parent 535
- e9ec00893bb4
- child 547
- a0779b1e9a4d
Merge
1.1 --- a/.hgtags Thu Dec 06 15:38:31 2012 -0800 1.2 +++ b/.hgtags Sun Dec 16 22:02:35 2012 -0800 1.3 @@ -188,3 +188,5 @@ 1.4 1c8370a55b305d35353346202bde042ba9e8a9fd jdk8-b64 1.5 b772de306dc24c17f7bd1398531ddeb58723b804 jdk8-b65 1.6 13bb8c326e7b7b0b19d78c8088033e3932e3f7ca jdk8-b66 1.7 +9a6ec97ec45c1a62d5233cefa91e8390e380e13a jdk8-b67 1.8 +cdb401a60cea6ad5ef3f498725ed1decf8dda1ea jdk8-b68
2.1 --- a/common/autoconf/basics.m4 Thu Dec 06 15:38:31 2012 -0800 2.2 +++ b/common/autoconf/basics.m4 Sun Dec 16 22:02:35 2012 -0800 2.3 @@ -129,7 +129,7 @@ 2.4 if test "x$READLINK_TESTED" != yes; then 2.5 # On MacOSX there is a readlink tool with a different 2.6 # purpose than the GNU readlink tool. Check the found readlink. 2.7 - ISGNU=`$READLINK --help 2>&1 | $GREP GNU` 2.8 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 2.9 if test "x$ISGNU" = x; then 2.10 # A readlink that we do not know how to use. 2.11 # Are there other non-GNU readlinks out there? 2.12 @@ -141,20 +141,24 @@ 2.13 if test "x$READLINK" != x; then 2.14 $1=`$READLINK -f [$]$1` 2.15 else 2.16 + # Save the current directory for restoring afterwards 2.17 STARTDIR=$PWD 2.18 COUNTER=0 2.19 sym_link_dir=`$DIRNAME [$]$1` 2.20 sym_link_file=`$BASENAME [$]$1` 2.21 + # Use the system pwd and not the shell builtin to resolve directory symlinks 2.22 + cd $sym_link_dir 2.23 + cd `$THEPWDCMD` 2.24 + sym_link_dir=`$THEPWDCMD` 2.25 + # Resolve file symlinks 2.26 while test $COUNTER -lt 20; do 2.27 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 2.28 if test "x$ISLINK" == x; then 2.29 # This is not a symbolic link! We are done! 2.30 break 2.31 fi 2.32 - # The link might be relative! We have to use cd to travel safely. 2.33 - cd $sym_link_dir 2.34 - # ... and we must get the to the absolute path, not one using symbolic links. 2.35 - cd `pwd -P` 2.36 + # Again resolve directory symlinks since the target of the just found 2.37 + # link could be in a different directory 2.38 cd `$DIRNAME $ISLINK` 2.39 sym_link_dir=`$THEPWDCMD` 2.40 sym_link_file=`$BASENAME $ISLINK` 2.41 @@ -286,7 +290,7 @@ 2.42 # Where is the source? It is located two levels above the configure script. 2.43 CURDIR="$PWD" 2.44 cd "$AUTOCONF_DIR/../.." 2.45 -SRC_ROOT="`pwd`" 2.46 +SRC_ROOT="`$THEPWDCMD`" 2.47 2.48 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 2.49 PATH_SEP=";"
3.1 --- a/common/autoconf/generated-configure.sh Thu Dec 06 15:38:31 2012 -0800 3.2 +++ b/common/autoconf/generated-configure.sh Sun Dec 16 22:02:35 2012 -0800 3.3 @@ -708,6 +708,7 @@ 3.4 ac_ct_PROPER_COMPILER_CXX 3.5 PROPER_COMPILER_CXX 3.6 POTENTIAL_CXX 3.7 +TOOLS_DIR_CXX 3.8 OBJEXT 3.9 EXEEXT 3.10 ac_ct_CC 3.11 @@ -718,6 +719,7 @@ 3.12 ac_ct_PROPER_COMPILER_CC 3.13 PROPER_COMPILER_CC 3.14 POTENTIAL_CC 3.15 +TOOLS_DIR_CC 3.16 BUILD_LD 3.17 BUILD_CXX 3.18 BUILD_CC 3.19 @@ -3672,7 +3674,7 @@ 3.20 #CUSTOM_AUTOCONF_INCLUDE 3.21 3.22 # Do not change or remove the following line, it is needed for consistency checks: 3.23 -DATE_WHEN_GENERATED=1354106772 3.24 +DATE_WHEN_GENERATED=1355221914 3.25 3.26 ############################################################################### 3.27 # 3.28 @@ -6903,7 +6905,7 @@ 3.29 if test "x$READLINK_TESTED" != yes; then 3.30 # On MacOSX there is a readlink tool with a different 3.31 # purpose than the GNU readlink tool. Check the found readlink. 3.32 - ISGNU=`$READLINK --help 2>&1 | $GREP GNU` 3.33 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 3.34 if test "x$ISGNU" = x; then 3.35 # A readlink that we do not know how to use. 3.36 # Are there other non-GNU readlinks out there? 3.37 @@ -6915,20 +6917,24 @@ 3.38 if test "x$READLINK" != x; then 3.39 SCRIPT=`$READLINK -f $SCRIPT` 3.40 else 3.41 + # Save the current directory for restoring afterwards 3.42 STARTDIR=$PWD 3.43 COUNTER=0 3.44 sym_link_dir=`$DIRNAME $SCRIPT` 3.45 sym_link_file=`$BASENAME $SCRIPT` 3.46 + # Use the system pwd and not the shell builtin to resolve directory symlinks 3.47 + cd $sym_link_dir 3.48 + cd `$THEPWDCMD` 3.49 + sym_link_dir=`$THEPWDCMD` 3.50 + # Resolve file symlinks 3.51 while test $COUNTER -lt 20; do 3.52 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.53 if test "x$ISLINK" == x; then 3.54 # This is not a symbolic link! We are done! 3.55 break 3.56 fi 3.57 - # The link might be relative! We have to use cd to travel safely. 3.58 - cd $sym_link_dir 3.59 - # ... and we must get the to the absolute path, not one using symbolic links. 3.60 - cd `pwd -P` 3.61 + # Again resolve directory symlinks since the target of the just found 3.62 + # link could be in a different directory 3.63 cd `$DIRNAME $ISLINK` 3.64 sym_link_dir=`$THEPWDCMD` 3.65 sym_link_file=`$BASENAME $ISLINK` 3.66 @@ -6944,7 +6950,7 @@ 3.67 # Where is the source? It is located two levels above the configure script. 3.68 CURDIR="$PWD" 3.69 cd "$AUTOCONF_DIR/../.." 3.70 -SRC_ROOT="`pwd`" 3.71 +SRC_ROOT="`$THEPWDCMD`" 3.72 3.73 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 3.74 PATH_SEP=";" 3.75 @@ -7593,7 +7599,7 @@ 3.76 if test "x$READLINK_TESTED" != yes; then 3.77 # On MacOSX there is a readlink tool with a different 3.78 # purpose than the GNU readlink tool. Check the found readlink. 3.79 - ISGNU=`$READLINK --help 2>&1 | $GREP GNU` 3.80 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 3.81 if test "x$ISGNU" = x; then 3.82 # A readlink that we do not know how to use. 3.83 # Are there other non-GNU readlinks out there? 3.84 @@ -7605,20 +7611,24 @@ 3.85 if test "x$READLINK" != x; then 3.86 NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR` 3.87 else 3.88 + # Save the current directory for restoring afterwards 3.89 STARTDIR=$PWD 3.90 COUNTER=0 3.91 sym_link_dir=`$DIRNAME $NOSYM_CURDIR` 3.92 sym_link_file=`$BASENAME $NOSYM_CURDIR` 3.93 + # Use the system pwd and not the shell builtin to resolve directory symlinks 3.94 + cd $sym_link_dir 3.95 + cd `$THEPWDCMD` 3.96 + sym_link_dir=`$THEPWDCMD` 3.97 + # Resolve file symlinks 3.98 while test $COUNTER -lt 20; do 3.99 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.100 if test "x$ISLINK" == x; then 3.101 # This is not a symbolic link! We are done! 3.102 break 3.103 fi 3.104 - # The link might be relative! We have to use cd to travel safely. 3.105 - cd $sym_link_dir 3.106 - # ... and we must get the to the absolute path, not one using symbolic links. 3.107 - cd `pwd -P` 3.108 + # Again resolve directory symlinks since the target of the just found 3.109 + # link could be in a different directory 3.110 cd `$DIRNAME $ISLINK` 3.111 sym_link_dir=`$THEPWDCMD` 3.112 sym_link_file=`$BASENAME $ISLINK` 3.113 @@ -11707,7 +11717,7 @@ 3.114 if test "x$READLINK_TESTED" != yes; then 3.115 # On MacOSX there is a readlink tool with a different 3.116 # purpose than the GNU readlink tool. Check the found readlink. 3.117 - ISGNU=`$READLINK --help 2>&1 | $GREP GNU` 3.118 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 3.119 if test "x$ISGNU" = x; then 3.120 # A readlink that we do not know how to use. 3.121 # Are there other non-GNU readlinks out there? 3.122 @@ -11719,20 +11729,24 @@ 3.123 if test "x$READLINK" != x; then 3.124 BINARY=`$READLINK -f $BINARY` 3.125 else 3.126 + # Save the current directory for restoring afterwards 3.127 STARTDIR=$PWD 3.128 COUNTER=0 3.129 sym_link_dir=`$DIRNAME $BINARY` 3.130 sym_link_file=`$BASENAME $BINARY` 3.131 + # Use the system pwd and not the shell builtin to resolve directory symlinks 3.132 + cd $sym_link_dir 3.133 + cd `$THEPWDCMD` 3.134 + sym_link_dir=`$THEPWDCMD` 3.135 + # Resolve file symlinks 3.136 while test $COUNTER -lt 20; do 3.137 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.138 if test "x$ISLINK" == x; then 3.139 # This is not a symbolic link! We are done! 3.140 break 3.141 fi 3.142 - # The link might be relative! We have to use cd to travel safely. 3.143 - cd $sym_link_dir 3.144 - # ... and we must get the to the absolute path, not one using symbolic links. 3.145 - cd `pwd -P` 3.146 + # Again resolve directory symlinks since the target of the just found 3.147 + # link could be in a different directory 3.148 cd `$DIRNAME $ISLINK` 3.149 sym_link_dir=`$THEPWDCMD` 3.150 sym_link_file=`$BASENAME $ISLINK` 3.151 @@ -15827,7 +15841,14 @@ 3.152 fi 3.153 3.154 if test -d "$WIN_SDK_BASE"; then 3.155 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.156 + # There have been cases of partial or broken SDK installations. A missing 3.157 + # lib dir is not going to work. 3.158 + if test ! -d "$WIN_SDK_BASE/../lib"; then 3.159 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.160 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.161 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5 3.162 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;} 3.163 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.164 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.165 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.166 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" 3.167 @@ -15862,7 +15883,14 @@ 3.168 fi 3.169 3.170 if test -d "$WIN_SDK_BASE"; then 3.171 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.172 + # There have been cases of partial or broken SDK installations. A missing 3.173 + # lib dir is not going to work. 3.174 + if test ! -d "$WIN_SDK_BASE/../lib"; then 3.175 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.176 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.177 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5 3.178 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;} 3.179 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.180 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.181 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.182 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" 3.183 @@ -15897,7 +15925,14 @@ 3.184 fi 3.185 3.186 if test -d "$WIN_SDK_BASE"; then 3.187 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.188 + # There have been cases of partial or broken SDK installations. A missing 3.189 + # lib dir is not going to work. 3.190 + if test ! -d "$WIN_SDK_BASE/../lib"; then 3.191 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.192 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.193 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5 3.194 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;} 3.195 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.196 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.197 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.198 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" 3.199 @@ -15931,7 +15966,14 @@ 3.200 fi 3.201 3.202 if test -d "$WIN_SDK_BASE"; then 3.203 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.204 + # There have been cases of partial or broken SDK installations. A missing 3.205 + # lib dir is not going to work. 3.206 + if test ! -d "$WIN_SDK_BASE/../lib"; then 3.207 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.208 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.209 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5 3.210 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;} 3.211 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.212 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.213 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.214 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" 3.215 @@ -15964,7 +16006,14 @@ 3.216 fi 3.217 3.218 if test -d "$WIN_SDK_BASE"; then 3.219 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.220 + # There have been cases of partial or broken SDK installations. A missing 3.221 + # lib dir is not going to work. 3.222 + if test ! -d "$WIN_SDK_BASE/../lib"; then 3.223 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.224 +$as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.225 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: Installation is broken, lib dir is missing. Ignoring" >&5 3.226 +$as_echo "$as_me: Warning: Installation is broken, lib dir is missing. Ignoring" >&6;} 3.227 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 3.228 { $as_echo "$as_me:${as_lineno-$LINENO}: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&5 3.229 $as_echo "$as_me: Found Windows SDK installation at $WIN_SDK_BASE using $METHOD" >&6;} 3.230 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" 3.231 @@ -16434,8 +16483,9 @@ 3.232 else 3.233 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.234 $as_echo "ok" >&6; } 3.235 - VS_INCLUDE="$INCLUDE" 3.236 - VS_LIB="$LIB" 3.237 + # Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk. 3.238 + VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'` 3.239 + VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'` 3.240 VS_PATH="$PATH" 3.241 3.242 3.243 @@ -17738,10 +17788,65 @@ 3.244 3.245 COMPILER_NAME=C 3.246 3.247 - # Do a first initial attempt at searching the list of compiler names. 3.248 + CC= 3.249 + # If TOOLS_DIR is set, check for all compiler names in there first 3.250 + # before checking the rest of the PATH. 3.251 + if test -n "$TOOLS_DIR"; then 3.252 + PATH_save="$PATH" 3.253 + PATH="$TOOLS_DIR" 3.254 + for ac_prog in $COMPILER_CHECK_LIST 3.255 +do 3.256 + # Extract the first word of "$ac_prog", so it can be a program name with args. 3.257 +set dummy $ac_prog; ac_word=$2 3.258 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.259 +$as_echo_n "checking for $ac_word... " >&6; } 3.260 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 3.261 + $as_echo_n "(cached) " >&6 3.262 +else 3.263 + case $TOOLS_DIR_CC in 3.264 + [\\/]* | ?:[\\/]*) 3.265 + ac_cv_path_TOOLS_DIR_CC="$TOOLS_DIR_CC" # Let the user override the test with a path. 3.266 + ;; 3.267 + *) 3.268 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.269 +for as_dir in $PATH 3.270 +do 3.271 + IFS=$as_save_IFS 3.272 + test -z "$as_dir" && as_dir=. 3.273 + for ac_exec_ext in '' $ac_executable_extensions; do 3.274 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.275 + ac_cv_path_TOOLS_DIR_CC="$as_dir/$ac_word$ac_exec_ext" 3.276 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.277 + break 2 3.278 + fi 3.279 +done 3.280 + done 3.281 +IFS=$as_save_IFS 3.282 + 3.283 + ;; 3.284 +esac 3.285 +fi 3.286 +TOOLS_DIR_CC=$ac_cv_path_TOOLS_DIR_CC 3.287 +if test -n "$TOOLS_DIR_CC"; then 3.288 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOOLS_DIR_CC" >&5 3.289 +$as_echo "$TOOLS_DIR_CC" >&6; } 3.290 +else 3.291 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.292 +$as_echo "no" >&6; } 3.293 +fi 3.294 + 3.295 + 3.296 + test -n "$TOOLS_DIR_CC" && break 3.297 +done 3.298 + 3.299 + CC=$TOOLS_DIR_CC 3.300 + PATH="$PATH_save" 3.301 + fi 3.302 + 3.303 # AC_PATH_PROGS can't be run multiple times with the same variable, 3.304 # so create a new name for this run. 3.305 - for ac_prog in $COMPILER_CHECK_LIST 3.306 + if test "x$CC" = x; then 3.307 + for ac_prog in $COMPILER_CHECK_LIST 3.308 do 3.309 # Extract the first word of "$ac_prog", so it can be a program name with args. 3.310 set dummy $ac_prog; ac_word=$2 3.311 @@ -17786,9 +17891,10 @@ 3.312 test -n "$POTENTIAL_CC" && break 3.313 done 3.314 3.315 - CC=$POTENTIAL_CC 3.316 - 3.317 - if test "x$$CC" = x; then 3.318 + CC=$POTENTIAL_CC 3.319 + fi 3.320 + 3.321 + if test "x$CC" = x; then 3.322 3.323 # Print a helpful message on how to acquire the necessary build dependency. 3.324 # devkit is the help tag: freetyp2, cups, pulse, alsa etc 3.325 @@ -18082,7 +18188,7 @@ 3.326 if test "x$READLINK_TESTED" != yes; then 3.327 # On MacOSX there is a readlink tool with a different 3.328 # purpose than the GNU readlink tool. Check the found readlink. 3.329 - ISGNU=`$READLINK --help 2>&1 | $GREP GNU` 3.330 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 3.331 if test "x$ISGNU" = x; then 3.332 # A readlink that we do not know how to use. 3.333 # Are there other non-GNU readlinks out there? 3.334 @@ -18094,20 +18200,24 @@ 3.335 if test "x$READLINK" != x; then 3.336 TEST_COMPILER=`$READLINK -f $TEST_COMPILER` 3.337 else 3.338 + # Save the current directory for restoring afterwards 3.339 STARTDIR=$PWD 3.340 COUNTER=0 3.341 sym_link_dir=`$DIRNAME $TEST_COMPILER` 3.342 sym_link_file=`$BASENAME $TEST_COMPILER` 3.343 + # Use the system pwd and not the shell builtin to resolve directory symlinks 3.344 + cd $sym_link_dir 3.345 + cd `$THEPWDCMD` 3.346 + sym_link_dir=`$THEPWDCMD` 3.347 + # Resolve file symlinks 3.348 while test $COUNTER -lt 20; do 3.349 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.350 if test "x$ISLINK" == x; then 3.351 # This is not a symbolic link! We are done! 3.352 break 3.353 fi 3.354 - # The link might be relative! We have to use cd to travel safely. 3.355 - cd $sym_link_dir 3.356 - # ... and we must get the to the absolute path, not one using symbolic links. 3.357 - cd `pwd -P` 3.358 + # Again resolve directory symlinks since the target of the just found 3.359 + # link could be in a different directory 3.360 cd `$DIRNAME $ISLINK` 3.361 sym_link_dir=`$THEPWDCMD` 3.362 sym_link_file=`$BASENAME $ISLINK` 3.363 @@ -18504,7 +18614,7 @@ 3.364 if test "x$READLINK_TESTED" != yes; then 3.365 # On MacOSX there is a readlink tool with a different 3.366 # purpose than the GNU readlink tool. Check the found readlink. 3.367 - ISGNU=`$READLINK --help 2>&1 | $GREP GNU` 3.368 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 3.369 if test "x$ISGNU" = x; then 3.370 # A readlink that we do not know how to use. 3.371 # Are there other non-GNU readlinks out there? 3.372 @@ -18516,20 +18626,24 @@ 3.373 if test "x$READLINK" != x; then 3.374 PROPER_COMPILER_CC=`$READLINK -f $PROPER_COMPILER_CC` 3.375 else 3.376 + # Save the current directory for restoring afterwards 3.377 STARTDIR=$PWD 3.378 COUNTER=0 3.379 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC` 3.380 sym_link_file=`$BASENAME $PROPER_COMPILER_CC` 3.381 + # Use the system pwd and not the shell builtin to resolve directory symlinks 3.382 + cd $sym_link_dir 3.383 + cd `$THEPWDCMD` 3.384 + sym_link_dir=`$THEPWDCMD` 3.385 + # Resolve file symlinks 3.386 while test $COUNTER -lt 20; do 3.387 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.388 if test "x$ISLINK" == x; then 3.389 # This is not a symbolic link! We are done! 3.390 break 3.391 fi 3.392 - # The link might be relative! We have to use cd to travel safely. 3.393 - cd $sym_link_dir 3.394 - # ... and we must get the to the absolute path, not one using symbolic links. 3.395 - cd `pwd -P` 3.396 + # Again resolve directory symlinks since the target of the just found 3.397 + # link could be in a different directory 3.398 cd `$DIRNAME $ISLINK` 3.399 sym_link_dir=`$THEPWDCMD` 3.400 sym_link_file=`$BASENAME $ISLINK` 3.401 @@ -19221,10 +19335,65 @@ 3.402 3.403 COMPILER_NAME=C++ 3.404 3.405 - # Do a first initial attempt at searching the list of compiler names. 3.406 + CXX= 3.407 + # If TOOLS_DIR is set, check for all compiler names in there first 3.408 + # before checking the rest of the PATH. 3.409 + if test -n "$TOOLS_DIR"; then 3.410 + PATH_save="$PATH" 3.411 + PATH="$TOOLS_DIR" 3.412 + for ac_prog in $COMPILER_CHECK_LIST 3.413 +do 3.414 + # Extract the first word of "$ac_prog", so it can be a program name with args. 3.415 +set dummy $ac_prog; ac_word=$2 3.416 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.417 +$as_echo_n "checking for $ac_word... " >&6; } 3.418 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 3.419 + $as_echo_n "(cached) " >&6 3.420 +else 3.421 + case $TOOLS_DIR_CXX in 3.422 + [\\/]* | ?:[\\/]*) 3.423 + ac_cv_path_TOOLS_DIR_CXX="$TOOLS_DIR_CXX" # Let the user override the test with a path. 3.424 + ;; 3.425 + *) 3.426 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.427 +for as_dir in $PATH 3.428 +do 3.429 + IFS=$as_save_IFS 3.430 + test -z "$as_dir" && as_dir=. 3.431 + for ac_exec_ext in '' $ac_executable_extensions; do 3.432 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.433 + ac_cv_path_TOOLS_DIR_CXX="$as_dir/$ac_word$ac_exec_ext" 3.434 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.435 + break 2 3.436 + fi 3.437 +done 3.438 + done 3.439 +IFS=$as_save_IFS 3.440 + 3.441 + ;; 3.442 +esac 3.443 +fi 3.444 +TOOLS_DIR_CXX=$ac_cv_path_TOOLS_DIR_CXX 3.445 +if test -n "$TOOLS_DIR_CXX"; then 3.446 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOOLS_DIR_CXX" >&5 3.447 +$as_echo "$TOOLS_DIR_CXX" >&6; } 3.448 +else 3.449 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.450 +$as_echo "no" >&6; } 3.451 +fi 3.452 + 3.453 + 3.454 + test -n "$TOOLS_DIR_CXX" && break 3.455 +done 3.456 + 3.457 + CXX=$TOOLS_DIR_CXX 3.458 + PATH="$PATH_save" 3.459 + fi 3.460 + 3.461 # AC_PATH_PROGS can't be run multiple times with the same variable, 3.462 # so create a new name for this run. 3.463 - for ac_prog in $COMPILER_CHECK_LIST 3.464 + if test "x$CXX" = x; then 3.465 + for ac_prog in $COMPILER_CHECK_LIST 3.466 do 3.467 # Extract the first word of "$ac_prog", so it can be a program name with args. 3.468 set dummy $ac_prog; ac_word=$2 3.469 @@ -19269,9 +19438,10 @@ 3.470 test -n "$POTENTIAL_CXX" && break 3.471 done 3.472 3.473 - CXX=$POTENTIAL_CXX 3.474 - 3.475 - if test "x$$CXX" = x; then 3.476 + CXX=$POTENTIAL_CXX 3.477 + fi 3.478 + 3.479 + if test "x$CXX" = x; then 3.480 3.481 # Print a helpful message on how to acquire the necessary build dependency. 3.482 # devkit is the help tag: freetyp2, cups, pulse, alsa etc 3.483 @@ -19565,7 +19735,7 @@ 3.484 if test "x$READLINK_TESTED" != yes; then 3.485 # On MacOSX there is a readlink tool with a different 3.486 # purpose than the GNU readlink tool. Check the found readlink. 3.487 - ISGNU=`$READLINK --help 2>&1 | $GREP GNU` 3.488 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 3.489 if test "x$ISGNU" = x; then 3.490 # A readlink that we do not know how to use. 3.491 # Are there other non-GNU readlinks out there? 3.492 @@ -19577,20 +19747,24 @@ 3.493 if test "x$READLINK" != x; then 3.494 TEST_COMPILER=`$READLINK -f $TEST_COMPILER` 3.495 else 3.496 + # Save the current directory for restoring afterwards 3.497 STARTDIR=$PWD 3.498 COUNTER=0 3.499 sym_link_dir=`$DIRNAME $TEST_COMPILER` 3.500 sym_link_file=`$BASENAME $TEST_COMPILER` 3.501 + # Use the system pwd and not the shell builtin to resolve directory symlinks 3.502 + cd $sym_link_dir 3.503 + cd `$THEPWDCMD` 3.504 + sym_link_dir=`$THEPWDCMD` 3.505 + # Resolve file symlinks 3.506 while test $COUNTER -lt 20; do 3.507 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.508 if test "x$ISLINK" == x; then 3.509 # This is not a symbolic link! We are done! 3.510 break 3.511 fi 3.512 - # The link might be relative! We have to use cd to travel safely. 3.513 - cd $sym_link_dir 3.514 - # ... and we must get the to the absolute path, not one using symbolic links. 3.515 - cd `pwd -P` 3.516 + # Again resolve directory symlinks since the target of the just found 3.517 + # link could be in a different directory 3.518 cd `$DIRNAME $ISLINK` 3.519 sym_link_dir=`$THEPWDCMD` 3.520 sym_link_file=`$BASENAME $ISLINK` 3.521 @@ -19987,7 +20161,7 @@ 3.522 if test "x$READLINK_TESTED" != yes; then 3.523 # On MacOSX there is a readlink tool with a different 3.524 # purpose than the GNU readlink tool. Check the found readlink. 3.525 - ISGNU=`$READLINK --help 2>&1 | $GREP GNU` 3.526 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 3.527 if test "x$ISGNU" = x; then 3.528 # A readlink that we do not know how to use. 3.529 # Are there other non-GNU readlinks out there? 3.530 @@ -19999,20 +20173,24 @@ 3.531 if test "x$READLINK" != x; then 3.532 PROPER_COMPILER_CXX=`$READLINK -f $PROPER_COMPILER_CXX` 3.533 else 3.534 + # Save the current directory for restoring afterwards 3.535 STARTDIR=$PWD 3.536 COUNTER=0 3.537 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX` 3.538 sym_link_file=`$BASENAME $PROPER_COMPILER_CXX` 3.539 + # Use the system pwd and not the shell builtin to resolve directory symlinks 3.540 + cd $sym_link_dir 3.541 + cd `$THEPWDCMD` 3.542 + sym_link_dir=`$THEPWDCMD` 3.543 + # Resolve file symlinks 3.544 while test $COUNTER -lt 20; do 3.545 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.546 if test "x$ISLINK" == x; then 3.547 # This is not a symbolic link! We are done! 3.548 break 3.549 fi 3.550 - # The link might be relative! We have to use cd to travel safely. 3.551 - cd $sym_link_dir 3.552 - # ... and we must get the to the absolute path, not one using symbolic links. 3.553 - cd `pwd -P` 3.554 + # Again resolve directory symlinks since the target of the just found 3.555 + # link could be in a different directory 3.556 cd `$DIRNAME $ISLINK` 3.557 sym_link_dir=`$THEPWDCMD` 3.558 sym_link_file=`$BASENAME $ISLINK` 3.559 @@ -27642,34 +27820,34 @@ 3.560 # ENABLE_DEBUG_SYMBOLS 3.561 # This must be done after the toolchain is setup, since we're looking at objcopy. 3.562 # 3.563 -ENABLE_DEBUG_SYMBOLS=default 3.564 - 3.565 -# default on macosx is no... 3.566 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then 3.567 - ENABLE_DEBUG_SYMBOLS=no 3.568 -fi 3.569 - 3.570 # Check whether --enable-debug-symbols was given. 3.571 if test "${enable_debug_symbols+set}" = set; then : 3.572 - enableval=$enable_debug_symbols; ENABLE_DEBUG_SYMBOLS=${enable_debug_symbols} 3.573 + enableval=$enable_debug_symbols; 3.574 fi 3.575 3.576 3.577 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug symbols" >&5 3.578 $as_echo_n "checking if we should generate debug symbols... " >&6; } 3.579 3.580 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xyes" && test "x$OBJCOPY" = x; then 3.581 +if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then 3.582 # explicit enabling of enable-debug-symbols and can't find objcopy 3.583 # this is an error 3.584 as_fn_error $? "Unable to find objcopy, cannot enable debug-symbols" "$LINENO" 5 3.585 fi 3.586 3.587 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xdefault"; then 3.588 +if test "x$enable_debug_symbols" = "xyes"; then 3.589 + ENABLE_DEBUG_SYMBOLS=true 3.590 +elif test "x$enable_debug_symbols" = "xno"; then 3.591 + ENABLE_DEBUG_SYMBOLS=false 3.592 +else 3.593 + # default on macosx is false 3.594 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then 3.595 + ENABLE_DEBUG_SYMBOLS=false 3.596 # Default is on if objcopy is found, otherwise off 3.597 - if test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then 3.598 - ENABLE_DEBUG_SYMBOLS=yes 3.599 - else 3.600 - ENABLE_DEBUG_SYMBOLS=no 3.601 + elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then 3.602 + ENABLE_DEBUG_SYMBOLS=true 3.603 + else 3.604 + ENABLE_DEBUG_SYMBOLS=false 3.605 fi 3.606 fi 3.607 3.608 @@ -27679,25 +27857,21 @@ 3.609 # 3.610 # ZIP_DEBUGINFO_FILES 3.611 # 3.612 -ZIP_DEBUGINFO_FILES=yes 3.613 - 3.614 # Check whether --enable-zip-debug-info was given. 3.615 if test "${enable_zip_debug_info+set}" = set; then : 3.616 - enableval=$enable_zip_debug_info; ZIP_DEBUGINFO_FILES=${enable_zip_debug_info} 3.617 + enableval=$enable_zip_debug_info; 3.618 fi 3.619 3.620 3.621 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5 3.622 $as_echo_n "checking if we should zip debug-info files... " >&6; } 3.623 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP_DEBUGINFO_FILES" >&5 3.624 -$as_echo "$ZIP_DEBUGINFO_FILES" >&6; } 3.625 - 3.626 -# Hotspot wants ZIP_DEBUGINFO_FILES to be 1 for yes 3.627 -# use that... 3.628 -if test "x$ZIP_DEBUGINFO_FILES" = "xyes"; then 3.629 - ZIP_DEBUGINFO_FILES=1 3.630 -else 3.631 - ZIP_DEBUGINFO_FILES=0 3.632 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5 3.633 +$as_echo "${enable_zip_debug_info}" >&6; } 3.634 + 3.635 +if test "x${enable_zip_debug_info}" = "xno"; then 3.636 + ZIP_DEBUGINFO_FILES=false 3.637 +else 3.638 + ZIP_DEBUGINFO_FILES=true 3.639 fi 3.640 3.641
4.1 --- a/common/autoconf/hotspot-spec.gmk.in Thu Dec 06 15:38:31 2012 -0800 4.2 +++ b/common/autoconf/hotspot-spec.gmk.in Sun Dec 16 22:02:35 2012 -0800 4.3 @@ -97,6 +97,24 @@ 4.4 4.5 USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@ 4.6 4.7 +# Hotspot expects the variable FULL_DEBUG_SYMBOLS=1/0 to control debug symbols 4.8 +# creation. 4.9 +ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 4.10 + FULL_DEBUG_SYMBOLS=1 4.11 + # Ensure hotspot uses the objcopy that configure located 4.12 + ALT_OBJCOPY:=$(OBJCOPY) 4.13 +else 4.14 + FULL_DEBUG_SYMBOLS=0 4.15 +endif 4.16 + 4.17 +# Hotspot expects the variable ZIP_DEBUGINFO_FILES=1/0 and not true/false. 4.18 +ifeq ($(ZIP_DEBUGINFO_FILES)$(ENABLE_DEBUG_SYMBOLS), truetrue) 4.19 + ZIP_DEBUGINFO_FILES:=1 4.20 +endif 4.21 +ifeq ($(ZIP_DEBUGINFO_FILES), false) 4.22 + ZIP_DEBUGINFO_FILES:=0 4.23 +endif 4.24 + 4.25 # Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files. 4.26 # This is needed to get the LOG setting to work properly. 4.27 include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
5.1 --- a/common/autoconf/jdk-options.m4 Thu Dec 06 15:38:31 2012 -0800 5.2 +++ b/common/autoconf/jdk-options.m4 Sun Dec 16 22:02:35 2012 -0800 5.3 @@ -432,32 +432,30 @@ 5.4 # ENABLE_DEBUG_SYMBOLS 5.5 # This must be done after the toolchain is setup, since we're looking at objcopy. 5.6 # 5.7 -ENABLE_DEBUG_SYMBOLS=default 5.8 - 5.9 -# default on macosx is no... 5.10 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then 5.11 - ENABLE_DEBUG_SYMBOLS=no 5.12 -fi 5.13 - 5.14 AC_ARG_ENABLE([debug-symbols], 5.15 - [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])], 5.16 - [ENABLE_DEBUG_SYMBOLS=${enable_debug_symbols}], 5.17 -) 5.18 + [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])]) 5.19 5.20 AC_MSG_CHECKING([if we should generate debug symbols]) 5.21 5.22 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xyes" && test "x$OBJCOPY" = x; then 5.23 +if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then 5.24 # explicit enabling of enable-debug-symbols and can't find objcopy 5.25 # this is an error 5.26 AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols]) 5.27 fi 5.28 5.29 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xdefault"; then 5.30 +if test "x$enable_debug_symbols" = "xyes"; then 5.31 + ENABLE_DEBUG_SYMBOLS=true 5.32 +elif test "x$enable_debug_symbols" = "xno"; then 5.33 + ENABLE_DEBUG_SYMBOLS=false 5.34 +else 5.35 + # default on macosx is false 5.36 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then 5.37 + ENABLE_DEBUG_SYMBOLS=false 5.38 # Default is on if objcopy is found, otherwise off 5.39 - if test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then 5.40 - ENABLE_DEBUG_SYMBOLS=yes 5.41 + elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then 5.42 + ENABLE_DEBUG_SYMBOLS=true 5.43 else 5.44 - ENABLE_DEBUG_SYMBOLS=no 5.45 + ENABLE_DEBUG_SYMBOLS=false 5.46 fi 5.47 fi 5.48 5.49 @@ -466,22 +464,16 @@ 5.50 # 5.51 # ZIP_DEBUGINFO_FILES 5.52 # 5.53 -ZIP_DEBUGINFO_FILES=yes 5.54 - 5.55 AC_ARG_ENABLE([zip-debug-info], 5.56 - [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])], 5.57 - [ZIP_DEBUGINFO_FILES=${enable_zip_debug_info}], 5.58 -) 5.59 + [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])]) 5.60 5.61 AC_MSG_CHECKING([if we should zip debug-info files]) 5.62 -AC_MSG_RESULT([$ZIP_DEBUGINFO_FILES]) 5.63 +AC_MSG_RESULT([${enable_zip_debug_info}]) 5.64 5.65 -# Hotspot wants ZIP_DEBUGINFO_FILES to be 1 for yes 5.66 -# use that... 5.67 -if test "x$ZIP_DEBUGINFO_FILES" = "xyes"; then 5.68 - ZIP_DEBUGINFO_FILES=1 5.69 +if test "x${enable_zip_debug_info}" = "xno"; then 5.70 + ZIP_DEBUGINFO_FILES=false 5.71 else 5.72 - ZIP_DEBUGINFO_FILES=0 5.73 + ZIP_DEBUGINFO_FILES=true 5.74 fi 5.75 5.76 AC_SUBST(ENABLE_DEBUG_SYMBOLS)
6.1 --- a/common/autoconf/toolchain.m4 Thu Dec 06 15:38:31 2012 -0800 6.2 +++ b/common/autoconf/toolchain.m4 Sun Dec 16 22:02:35 2012 -0800 6.3 @@ -114,13 +114,25 @@ 6.4 [ 6.5 COMPILER_NAME=$2 6.6 6.7 - # Do a first initial attempt at searching the list of compiler names. 6.8 + $1= 6.9 + # If TOOLS_DIR is set, check for all compiler names in there first 6.10 + # before checking the rest of the PATH. 6.11 + if test -n "$TOOLS_DIR"; then 6.12 + PATH_save="$PATH" 6.13 + PATH="$TOOLS_DIR" 6.14 + AC_PATH_PROGS(TOOLS_DIR_$1, $3) 6.15 + $1=$TOOLS_DIR_$1 6.16 + PATH="$PATH_save" 6.17 + fi 6.18 + 6.19 # AC_PATH_PROGS can't be run multiple times with the same variable, 6.20 # so create a new name for this run. 6.21 - AC_PATH_PROGS(POTENTIAL_$1, $3) 6.22 - $1=$POTENTIAL_$1 6.23 + if test "x[$]$1" = x; then 6.24 + AC_PATH_PROGS(POTENTIAL_$1, $3) 6.25 + $1=$POTENTIAL_$1 6.26 + fi 6.27 6.28 - if test "x$[$]$1" = x; then 6.29 + if test "x[$]$1" = x; then 6.30 HELP_MSG_MISSING_DEPENDENCY([devkit]) 6.31 AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG]) 6.32 fi
7.1 --- a/common/autoconf/toolchain_windows.m4 Thu Dec 06 15:38:31 2012 -0800 7.2 +++ b/common/autoconf/toolchain_windows.m4 Sun Dec 16 22:02:35 2012 -0800 7.3 @@ -48,7 +48,12 @@ 7.4 METHOD="$2" 7.5 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE) 7.6 if test -d "$WIN_SDK_BASE"; then 7.7 - if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 7.8 + # There have been cases of partial or broken SDK installations. A missing 7.9 + # lib dir is not going to work. 7.10 + if test ! -d "$WIN_SDK_BASE/../lib"; then 7.11 + AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD]) 7.12 + AC_MSG_NOTICE([Warning: Installation is broken, lib dir is missing. Ignoring]) 7.13 + elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 7.14 AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD]) 7.15 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" 7.16 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 7.17 @@ -200,8 +205,9 @@ 7.18 AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.]) 7.19 else 7.20 AC_MSG_RESULT([ok]) 7.21 - VS_INCLUDE="$INCLUDE" 7.22 - VS_LIB="$LIB" 7.23 + # Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk. 7.24 + VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'` 7.25 + VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'` 7.26 VS_PATH="$PATH" 7.27 AC_SUBST(VS_INCLUDE) 7.28 AC_SUBST(VS_LIB)
8.1 --- a/common/makefiles/JavaCompilation.gmk Thu Dec 06 15:38:31 2012 -0800 8.2 +++ b/common/makefiles/JavaCompilation.gmk Sun Dec 16 22:02:35 2012 -0800 8.3 @@ -149,7 +149,7 @@ 8.4 $$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES)) \ 8.5 $$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES)))) 8.6 ifeq (,$$($1_SKIP_METAINF)) 8.7 - $1_DEPS+=$$(shell $(FIND) $$(addsuffix /META-INF,$$($1_SRCS)) -type f 2> /dev/null)) 8.8 + $1_DEPS+=$$(shell $(FIND) $$(addsuffix /META-INF,$$($1_SRCS)) -type f 2> /dev/null) 8.9 endif 8.10 endif 8.11 8.12 @@ -275,10 +275,12 @@ 8.13 # Explicitly excluded files can be given with absolute path. The patsubst solution 8.14 # isn't perfect but the likelyhood of an absolute path to match something in a src 8.15 # dir is very small. 8.16 + # If zip has nothing to do, it returns 12 and would fail the build. Check for 12 8.17 + # and only fail if it's not. 8.18 $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS) 8.19 $(MKDIR) -p $$(@D) 8.20 $(ECHO) Updating $$($1_NAME) 8.21 - $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))))$$(NEWLINE)) true 8.22 + $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true 8.23 $(TOUCH) $$@ 8.24 endef 8.25
9.1 --- a/common/makefiles/NativeCompilation.gmk Thu Dec 06 15:38:31 2012 -0800 9.2 +++ b/common/makefiles/NativeCompilation.gmk Sun Dec 16 22:02:35 2012 -0800 9.3 @@ -302,7 +302,7 @@ 9.4 endif 9.5 9.6 ifneq (,$$($1_DEBUG_SYMBOLS)) 9.7 - ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) 9.8 + ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 9.9 # Programs don't get the debug symbols added in the old build. It's not clear if 9.10 # this is intentional. 9.11 ifeq ($$($1_PROGRAM),) 9.12 @@ -394,7 +394,7 @@ 9.13 endif 9.14 9.15 ifneq (,$$($1_DEBUG_SYMBOLS)) 9.16 - ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) 9.17 + ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 9.18 ifeq ($(OPENJDK_TARGET_OS), windows) 9.19 $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \ 9.20 "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map" 9.21 @@ -429,7 +429,7 @@ 9.22 endif # Touch to not retrigger rule on rebuild 9.23 $(TOUCH) $$@ 9.24 9.25 - ifeq ($(ZIP_DEBUGINFO_FILES), 1) 9.26 + ifeq ($(ZIP_DEBUGINFO_FILES), true) 9.27 $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz 9.28 9.29 ifeq ($(OPENJDK_TARGET_OS), windows) 9.30 @@ -472,7 +472,7 @@ 9.31 ifneq (,$$($1_PROGRAM)) 9.32 # A executable binary has been specified, setup the target for it. 9.33 ifneq (,$$($1_DEBUG_SYMBOLS)) 9.34 - ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) 9.35 + ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 9.36 ifeq ($(OPENJDK_TARGET_OS), windows) 9.37 $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \ 9.38 "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map" 9.39 @@ -507,7 +507,7 @@ 9.40 endif 9.41 $(TOUCH) $$@ 9.42 9.43 - ifeq ($(ZIP_DEBUGINFO_FILES), 1) 9.44 + ifeq ($(ZIP_DEBUGINFO_FILES), true) 9.45 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz 9.46 9.47 ifeq ($(OPENJDK_TARGET_OS), windows)
