1.1 --- a/common/autoconf/generated-configure.sh Mon Oct 14 18:53:53 2013 -0400
1.2 +++ b/common/autoconf/generated-configure.sh Wed Oct 16 11:55:44 2013 -0700
1.3 @@ -3112,7 +3112,7 @@
1.4 #
1.5
1.6 # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
1.7 -# If so, then append $1 to $2\
1.8 +# If so, then append $1 to $2 \
1.9 # Also set JVM_ARG_OK to true/false depending on outcome.
1.10
1.11
1.12 @@ -3441,74 +3441,74 @@
1.13
1.14
1.15 cygwin_help() {
1.16 - case $1 in
1.17 + case $1 in
1.18 unzip)
1.19 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
1.20 + PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
1.21 zip)
1.22 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
1.23 + PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
1.24 make)
1.25 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
1.26 + PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
1.27 * )
1.28 - break ;;
1.29 - esac
1.30 + break ;;
1.31 + esac
1.32 }
1.33
1.34 apt_help() {
1.35 - case $1 in
1.36 + case $1 in
1.37 devkit)
1.38 - PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
1.39 + PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
1.40 openjdk)
1.41 - PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
1.42 + PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
1.43 alsa)
1.44 - PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
1.45 + PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
1.46 cups)
1.47 - PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
1.48 + PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
1.49 freetype2)
1.50 - PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
1.51 + PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
1.52 pulse)
1.53 - PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
1.54 + PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
1.55 x11)
1.56 - PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
1.57 + PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
1.58 ccache)
1.59 - PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
1.60 + PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
1.61 * )
1.62 - break ;;
1.63 - esac
1.64 + break ;;
1.65 + esac
1.66 }
1.67
1.68 yum_help() {
1.69 - case $1 in
1.70 + case $1 in
1.71 devkit)
1.72 - PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
1.73 + PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
1.74 openjdk)
1.75 - PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
1.76 + PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
1.77 alsa)
1.78 - PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
1.79 + PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
1.80 cups)
1.81 - PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
1.82 + PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
1.83 freetype2)
1.84 - PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
1.85 + PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
1.86 pulse)
1.87 - PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
1.88 + PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
1.89 x11)
1.90 - PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
1.91 + PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
1.92 ccache)
1.93 - PKGHANDLER_COMMAND="sudo yum install ccache" ;;
1.94 + PKGHANDLER_COMMAND="sudo yum install ccache" ;;
1.95 * )
1.96 - break ;;
1.97 - esac
1.98 + break ;;
1.99 + esac
1.100 }
1.101
1.102 port_help() {
1.103 - PKGHANDLER_COMMAND=""
1.104 + PKGHANDLER_COMMAND=""
1.105 }
1.106
1.107 pkgutil_help() {
1.108 - PKGHANDLER_COMMAND=""
1.109 + PKGHANDLER_COMMAND=""
1.110 }
1.111
1.112 pkgadd_help() {
1.113 - PKGHANDLER_COMMAND=""
1.114 + PKGHANDLER_COMMAND=""
1.115 }
1.116
1.117
1.118 @@ -3662,8 +3662,8 @@
1.119 # doing anything else with these values.
1.120
1.121
1.122 - # Setup the legacy variables, for controlling the old makefiles.
1.123 - #
1.124 +# Setup the legacy variables, for controlling the old makefiles.
1.125 +#
1.126
1.127
1.128
1.129 @@ -3818,7 +3818,7 @@
1.130 #CUSTOM_AUTOCONF_INCLUDE
1.131
1.132 # Do not change or remove the following line, it is needed for consistency checks:
1.133 -DATE_WHEN_GENERATED=1381162713
1.134 +DATE_WHEN_GENERATED=1381407169
1.135
1.136 ###############################################################################
1.137 #
1.138 @@ -3831,26 +3831,26 @@
1.139
1.140 # Basic initialization that must happen first of all
1.141
1.142 -# Save the original command line. This is passed to us by the wrapper configure script.
1.143 -
1.144 -DATE_WHEN_CONFIGURED=`LANG=C date`
1.145 -
1.146 -{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuration created at $DATE_WHEN_CONFIGURED." >&5
1.147 + # Save the original command line. This is passed to us by the wrapper configure script.
1.148 +
1.149 + DATE_WHEN_CONFIGURED=`LANG=C date`
1.150 +
1.151 + { $as_echo "$as_me:${as_lineno-$LINENO}: Configuration created at $DATE_WHEN_CONFIGURED." >&5
1.152 $as_echo "$as_me: Configuration created at $DATE_WHEN_CONFIGURED." >&6;}
1.153 -{ $as_echo "$as_me:${as_lineno-$LINENO}: configure script generated at timestamp $DATE_WHEN_GENERATED." >&5
1.154 + { $as_echo "$as_me:${as_lineno-$LINENO}: configure script generated at timestamp $DATE_WHEN_GENERATED." >&5
1.155 $as_echo "$as_me: configure script generated at timestamp $DATE_WHEN_GENERATED." >&6;}
1.156
1.157
1.158
1.159 -# Start with tools that do not need have cross compilation support
1.160 -# and can be expected to be found in the default PATH. These tools are
1.161 -# used by configure. Nor are these tools expected to be found in the
1.162 -# devkit from the builddeps server either, since they are
1.163 -# needed to download the devkit.
1.164 -
1.165 -# First are all the simple required tools.
1.166 -
1.167 - for ac_prog in basename
1.168 + # Start with tools that do not need have cross compilation support
1.169 + # and can be expected to be found in the default PATH. These tools are
1.170 + # used by configure. Nor are these tools expected to be found in the
1.171 + # devkit from the builddeps server either, since they are
1.172 + # needed to download the devkit.
1.173 +
1.174 + # First are all the simple required tools.
1.175 +
1.176 + for ac_prog in basename
1.177 do
1.178 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.179 set dummy $ac_prog; ac_word=$2
1.180 @@ -3896,20 +3896,20 @@
1.181 done
1.182
1.183
1.184 - if test "x$BASENAME" = x; then
1.185 - if test "xbasename" = x; then
1.186 - PROG_NAME=basename
1.187 - else
1.188 - PROG_NAME=basename
1.189 - fi
1.190 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.191 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.192 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.193 - fi
1.194 -
1.195 -
1.196 -
1.197 - for ac_prog in bash
1.198 + if test "x$BASENAME" = x; then
1.199 + if test "xbasename" = x; then
1.200 + PROG_NAME=basename
1.201 + else
1.202 + PROG_NAME=basename
1.203 + fi
1.204 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.205 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.206 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.207 + fi
1.208 +
1.209 +
1.210 +
1.211 + for ac_prog in bash
1.212 do
1.213 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.214 set dummy $ac_prog; ac_word=$2
1.215 @@ -3955,20 +3955,20 @@
1.216 done
1.217
1.218
1.219 - if test "x$BASH" = x; then
1.220 - if test "xbash" = x; then
1.221 - PROG_NAME=bash
1.222 - else
1.223 - PROG_NAME=bash
1.224 - fi
1.225 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.226 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.227 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.228 - fi
1.229 -
1.230 -
1.231 -
1.232 - for ac_prog in cat
1.233 + if test "x$BASH" = x; then
1.234 + if test "xbash" = x; then
1.235 + PROG_NAME=bash
1.236 + else
1.237 + PROG_NAME=bash
1.238 + fi
1.239 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.240 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.241 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.242 + fi
1.243 +
1.244 +
1.245 +
1.246 + for ac_prog in cat
1.247 do
1.248 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.249 set dummy $ac_prog; ac_word=$2
1.250 @@ -4014,20 +4014,20 @@
1.251 done
1.252
1.253
1.254 - if test "x$CAT" = x; then
1.255 - if test "xcat" = x; then
1.256 - PROG_NAME=cat
1.257 - else
1.258 - PROG_NAME=cat
1.259 - fi
1.260 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.261 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.262 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.263 - fi
1.264 -
1.265 -
1.266 -
1.267 - for ac_prog in chmod
1.268 + if test "x$CAT" = x; then
1.269 + if test "xcat" = x; then
1.270 + PROG_NAME=cat
1.271 + else
1.272 + PROG_NAME=cat
1.273 + fi
1.274 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.275 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.276 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.277 + fi
1.278 +
1.279 +
1.280 +
1.281 + for ac_prog in chmod
1.282 do
1.283 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.284 set dummy $ac_prog; ac_word=$2
1.285 @@ -4073,20 +4073,20 @@
1.286 done
1.287
1.288
1.289 - if test "x$CHMOD" = x; then
1.290 - if test "xchmod" = x; then
1.291 - PROG_NAME=chmod
1.292 - else
1.293 - PROG_NAME=chmod
1.294 - fi
1.295 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.296 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.297 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.298 - fi
1.299 -
1.300 -
1.301 -
1.302 - for ac_prog in cmp
1.303 + if test "x$CHMOD" = x; then
1.304 + if test "xchmod" = x; then
1.305 + PROG_NAME=chmod
1.306 + else
1.307 + PROG_NAME=chmod
1.308 + fi
1.309 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.310 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.311 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.312 + fi
1.313 +
1.314 +
1.315 +
1.316 + for ac_prog in cmp
1.317 do
1.318 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.319 set dummy $ac_prog; ac_word=$2
1.320 @@ -4132,20 +4132,20 @@
1.321 done
1.322
1.323
1.324 - if test "x$CMP" = x; then
1.325 - if test "xcmp" = x; then
1.326 - PROG_NAME=cmp
1.327 - else
1.328 - PROG_NAME=cmp
1.329 - fi
1.330 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.331 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.332 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.333 - fi
1.334 -
1.335 -
1.336 -
1.337 - for ac_prog in comm
1.338 + if test "x$CMP" = x; then
1.339 + if test "xcmp" = x; then
1.340 + PROG_NAME=cmp
1.341 + else
1.342 + PROG_NAME=cmp
1.343 + fi
1.344 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.345 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.346 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.347 + fi
1.348 +
1.349 +
1.350 +
1.351 + for ac_prog in comm
1.352 do
1.353 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.354 set dummy $ac_prog; ac_word=$2
1.355 @@ -4191,20 +4191,20 @@
1.356 done
1.357
1.358
1.359 - if test "x$COMM" = x; then
1.360 - if test "xcomm" = x; then
1.361 - PROG_NAME=comm
1.362 - else
1.363 - PROG_NAME=comm
1.364 - fi
1.365 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.366 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.367 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.368 - fi
1.369 -
1.370 -
1.371 -
1.372 - for ac_prog in cp
1.373 + if test "x$COMM" = x; then
1.374 + if test "xcomm" = x; then
1.375 + PROG_NAME=comm
1.376 + else
1.377 + PROG_NAME=comm
1.378 + fi
1.379 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.380 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.381 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.382 + fi
1.383 +
1.384 +
1.385 +
1.386 + for ac_prog in cp
1.387 do
1.388 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.389 set dummy $ac_prog; ac_word=$2
1.390 @@ -4250,20 +4250,20 @@
1.391 done
1.392
1.393
1.394 - if test "x$CP" = x; then
1.395 - if test "xcp" = x; then
1.396 - PROG_NAME=cp
1.397 - else
1.398 - PROG_NAME=cp
1.399 - fi
1.400 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.401 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.402 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.403 - fi
1.404 -
1.405 -
1.406 -
1.407 - for ac_prog in cpio
1.408 + if test "x$CP" = x; then
1.409 + if test "xcp" = x; then
1.410 + PROG_NAME=cp
1.411 + else
1.412 + PROG_NAME=cp
1.413 + fi
1.414 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.415 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.416 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.417 + fi
1.418 +
1.419 +
1.420 +
1.421 + for ac_prog in cpio
1.422 do
1.423 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.424 set dummy $ac_prog; ac_word=$2
1.425 @@ -4309,20 +4309,20 @@
1.426 done
1.427
1.428
1.429 - if test "x$CPIO" = x; then
1.430 - if test "xcpio" = x; then
1.431 - PROG_NAME=cpio
1.432 - else
1.433 - PROG_NAME=cpio
1.434 - fi
1.435 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.436 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.437 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.438 - fi
1.439 -
1.440 -
1.441 -
1.442 - for ac_prog in cut
1.443 + if test "x$CPIO" = x; then
1.444 + if test "xcpio" = x; then
1.445 + PROG_NAME=cpio
1.446 + else
1.447 + PROG_NAME=cpio
1.448 + fi
1.449 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.450 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.451 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.452 + fi
1.453 +
1.454 +
1.455 +
1.456 + for ac_prog in cut
1.457 do
1.458 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.459 set dummy $ac_prog; ac_word=$2
1.460 @@ -4368,20 +4368,20 @@
1.461 done
1.462
1.463
1.464 - if test "x$CUT" = x; then
1.465 - if test "xcut" = x; then
1.466 - PROG_NAME=cut
1.467 - else
1.468 - PROG_NAME=cut
1.469 - fi
1.470 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.471 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.472 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.473 - fi
1.474 -
1.475 -
1.476 -
1.477 - for ac_prog in date
1.478 + if test "x$CUT" = x; then
1.479 + if test "xcut" = x; then
1.480 + PROG_NAME=cut
1.481 + else
1.482 + PROG_NAME=cut
1.483 + fi
1.484 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.485 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.486 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.487 + fi
1.488 +
1.489 +
1.490 +
1.491 + for ac_prog in date
1.492 do
1.493 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.494 set dummy $ac_prog; ac_word=$2
1.495 @@ -4427,20 +4427,20 @@
1.496 done
1.497
1.498
1.499 - if test "x$DATE" = x; then
1.500 - if test "xdate" = x; then
1.501 - PROG_NAME=date
1.502 - else
1.503 - PROG_NAME=date
1.504 - fi
1.505 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.506 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.507 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.508 - fi
1.509 -
1.510 -
1.511 -
1.512 - for ac_prog in gdiff diff
1.513 + if test "x$DATE" = x; then
1.514 + if test "xdate" = x; then
1.515 + PROG_NAME=date
1.516 + else
1.517 + PROG_NAME=date
1.518 + fi
1.519 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.520 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.521 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.522 + fi
1.523 +
1.524 +
1.525 +
1.526 + for ac_prog in gdiff diff
1.527 do
1.528 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.529 set dummy $ac_prog; ac_word=$2
1.530 @@ -4486,20 +4486,20 @@
1.531 done
1.532
1.533
1.534 - if test "x$DIFF" = x; then
1.535 - if test "xgdiff diff" = x; then
1.536 - PROG_NAME=diff
1.537 - else
1.538 - PROG_NAME=gdiff diff
1.539 - fi
1.540 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.541 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.542 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.543 - fi
1.544 -
1.545 -
1.546 -
1.547 - for ac_prog in dirname
1.548 + if test "x$DIFF" = x; then
1.549 + if test "xgdiff diff" = x; then
1.550 + PROG_NAME=diff
1.551 + else
1.552 + PROG_NAME=gdiff diff
1.553 + fi
1.554 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.555 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.556 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.557 + fi
1.558 +
1.559 +
1.560 +
1.561 + for ac_prog in dirname
1.562 do
1.563 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.564 set dummy $ac_prog; ac_word=$2
1.565 @@ -4545,20 +4545,20 @@
1.566 done
1.567
1.568
1.569 - if test "x$DIRNAME" = x; then
1.570 - if test "xdirname" = x; then
1.571 - PROG_NAME=dirname
1.572 - else
1.573 - PROG_NAME=dirname
1.574 - fi
1.575 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.576 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.577 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.578 - fi
1.579 -
1.580 -
1.581 -
1.582 - for ac_prog in echo
1.583 + if test "x$DIRNAME" = x; then
1.584 + if test "xdirname" = x; then
1.585 + PROG_NAME=dirname
1.586 + else
1.587 + PROG_NAME=dirname
1.588 + fi
1.589 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.590 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.591 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.592 + fi
1.593 +
1.594 +
1.595 +
1.596 + for ac_prog in echo
1.597 do
1.598 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.599 set dummy $ac_prog; ac_word=$2
1.600 @@ -4604,20 +4604,20 @@
1.601 done
1.602
1.603
1.604 - if test "x$ECHO" = x; then
1.605 - if test "xecho" = x; then
1.606 - PROG_NAME=echo
1.607 - else
1.608 - PROG_NAME=echo
1.609 - fi
1.610 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.611 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.612 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.613 - fi
1.614 -
1.615 -
1.616 -
1.617 - for ac_prog in expr
1.618 + if test "x$ECHO" = x; then
1.619 + if test "xecho" = x; then
1.620 + PROG_NAME=echo
1.621 + else
1.622 + PROG_NAME=echo
1.623 + fi
1.624 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.625 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.626 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.627 + fi
1.628 +
1.629 +
1.630 +
1.631 + for ac_prog in expr
1.632 do
1.633 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.634 set dummy $ac_prog; ac_word=$2
1.635 @@ -4663,20 +4663,20 @@
1.636 done
1.637
1.638
1.639 - if test "x$EXPR" = x; then
1.640 - if test "xexpr" = x; then
1.641 - PROG_NAME=expr
1.642 - else
1.643 - PROG_NAME=expr
1.644 - fi
1.645 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.646 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.647 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.648 - fi
1.649 -
1.650 -
1.651 -
1.652 - for ac_prog in file
1.653 + if test "x$EXPR" = x; then
1.654 + if test "xexpr" = x; then
1.655 + PROG_NAME=expr
1.656 + else
1.657 + PROG_NAME=expr
1.658 + fi
1.659 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.660 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.661 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.662 + fi
1.663 +
1.664 +
1.665 +
1.666 + for ac_prog in file
1.667 do
1.668 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.669 set dummy $ac_prog; ac_word=$2
1.670 @@ -4722,20 +4722,20 @@
1.671 done
1.672
1.673
1.674 - if test "x$FILE" = x; then
1.675 - if test "xfile" = x; then
1.676 - PROG_NAME=file
1.677 - else
1.678 - PROG_NAME=file
1.679 - fi
1.680 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.681 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.682 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.683 - fi
1.684 -
1.685 -
1.686 -
1.687 - for ac_prog in find
1.688 + if test "x$FILE" = x; then
1.689 + if test "xfile" = x; then
1.690 + PROG_NAME=file
1.691 + else
1.692 + PROG_NAME=file
1.693 + fi
1.694 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.695 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.696 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.697 + fi
1.698 +
1.699 +
1.700 +
1.701 + for ac_prog in find
1.702 do
1.703 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.704 set dummy $ac_prog; ac_word=$2
1.705 @@ -4781,20 +4781,20 @@
1.706 done
1.707
1.708
1.709 - if test "x$FIND" = x; then
1.710 - if test "xfind" = x; then
1.711 - PROG_NAME=find
1.712 - else
1.713 - PROG_NAME=find
1.714 - fi
1.715 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.716 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.717 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.718 - fi
1.719 -
1.720 -
1.721 -
1.722 - for ac_prog in head
1.723 + if test "x$FIND" = x; then
1.724 + if test "xfind" = x; then
1.725 + PROG_NAME=find
1.726 + else
1.727 + PROG_NAME=find
1.728 + fi
1.729 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.730 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.731 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.732 + fi
1.733 +
1.734 +
1.735 +
1.736 + for ac_prog in head
1.737 do
1.738 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.739 set dummy $ac_prog; ac_word=$2
1.740 @@ -4840,20 +4840,20 @@
1.741 done
1.742
1.743
1.744 - if test "x$HEAD" = x; then
1.745 - if test "xhead" = x; then
1.746 - PROG_NAME=head
1.747 - else
1.748 - PROG_NAME=head
1.749 - fi
1.750 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.751 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.752 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.753 - fi
1.754 -
1.755 -
1.756 -
1.757 - for ac_prog in ln
1.758 + if test "x$HEAD" = x; then
1.759 + if test "xhead" = x; then
1.760 + PROG_NAME=head
1.761 + else
1.762 + PROG_NAME=head
1.763 + fi
1.764 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.765 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.766 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.767 + fi
1.768 +
1.769 +
1.770 +
1.771 + for ac_prog in ln
1.772 do
1.773 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.774 set dummy $ac_prog; ac_word=$2
1.775 @@ -4899,20 +4899,20 @@
1.776 done
1.777
1.778
1.779 - if test "x$LN" = x; then
1.780 - if test "xln" = x; then
1.781 - PROG_NAME=ln
1.782 - else
1.783 - PROG_NAME=ln
1.784 - fi
1.785 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.786 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.787 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.788 - fi
1.789 -
1.790 -
1.791 -
1.792 - for ac_prog in ls
1.793 + if test "x$LN" = x; then
1.794 + if test "xln" = x; then
1.795 + PROG_NAME=ln
1.796 + else
1.797 + PROG_NAME=ln
1.798 + fi
1.799 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.800 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.801 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.802 + fi
1.803 +
1.804 +
1.805 +
1.806 + for ac_prog in ls
1.807 do
1.808 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.809 set dummy $ac_prog; ac_word=$2
1.810 @@ -4958,20 +4958,20 @@
1.811 done
1.812
1.813
1.814 - if test "x$LS" = x; then
1.815 - if test "xls" = x; then
1.816 - PROG_NAME=ls
1.817 - else
1.818 - PROG_NAME=ls
1.819 - fi
1.820 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.821 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.822 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.823 - fi
1.824 -
1.825 -
1.826 -
1.827 - for ac_prog in mkdir
1.828 + if test "x$LS" = x; then
1.829 + if test "xls" = x; then
1.830 + PROG_NAME=ls
1.831 + else
1.832 + PROG_NAME=ls
1.833 + fi
1.834 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.835 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.836 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.837 + fi
1.838 +
1.839 +
1.840 +
1.841 + for ac_prog in mkdir
1.842 do
1.843 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.844 set dummy $ac_prog; ac_word=$2
1.845 @@ -5017,20 +5017,20 @@
1.846 done
1.847
1.848
1.849 - if test "x$MKDIR" = x; then
1.850 - if test "xmkdir" = x; then
1.851 - PROG_NAME=mkdir
1.852 - else
1.853 - PROG_NAME=mkdir
1.854 - fi
1.855 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.856 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.857 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.858 - fi
1.859 -
1.860 -
1.861 -
1.862 - for ac_prog in mktemp
1.863 + if test "x$MKDIR" = x; then
1.864 + if test "xmkdir" = x; then
1.865 + PROG_NAME=mkdir
1.866 + else
1.867 + PROG_NAME=mkdir
1.868 + fi
1.869 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.870 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.871 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.872 + fi
1.873 +
1.874 +
1.875 +
1.876 + for ac_prog in mktemp
1.877 do
1.878 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.879 set dummy $ac_prog; ac_word=$2
1.880 @@ -5076,20 +5076,20 @@
1.881 done
1.882
1.883
1.884 - if test "x$MKTEMP" = x; then
1.885 - if test "xmktemp" = x; then
1.886 - PROG_NAME=mktemp
1.887 - else
1.888 - PROG_NAME=mktemp
1.889 - fi
1.890 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.891 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.892 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.893 - fi
1.894 -
1.895 -
1.896 -
1.897 - for ac_prog in mv
1.898 + if test "x$MKTEMP" = x; then
1.899 + if test "xmktemp" = x; then
1.900 + PROG_NAME=mktemp
1.901 + else
1.902 + PROG_NAME=mktemp
1.903 + fi
1.904 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.905 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.906 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.907 + fi
1.908 +
1.909 +
1.910 +
1.911 + for ac_prog in mv
1.912 do
1.913 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.914 set dummy $ac_prog; ac_word=$2
1.915 @@ -5135,20 +5135,20 @@
1.916 done
1.917
1.918
1.919 - if test "x$MV" = x; then
1.920 - if test "xmv" = x; then
1.921 - PROG_NAME=mv
1.922 - else
1.923 - PROG_NAME=mv
1.924 - fi
1.925 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.926 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.927 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.928 - fi
1.929 -
1.930 -
1.931 -
1.932 - for ac_prog in printf
1.933 + if test "x$MV" = x; then
1.934 + if test "xmv" = x; then
1.935 + PROG_NAME=mv
1.936 + else
1.937 + PROG_NAME=mv
1.938 + fi
1.939 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.940 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.941 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.942 + fi
1.943 +
1.944 +
1.945 +
1.946 + for ac_prog in printf
1.947 do
1.948 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.949 set dummy $ac_prog; ac_word=$2
1.950 @@ -5194,20 +5194,20 @@
1.951 done
1.952
1.953
1.954 - if test "x$PRINTF" = x; then
1.955 - if test "xprintf" = x; then
1.956 - PROG_NAME=printf
1.957 - else
1.958 - PROG_NAME=printf
1.959 - fi
1.960 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.961 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.962 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.963 - fi
1.964 -
1.965 -
1.966 -
1.967 - for ac_prog in rm
1.968 + if test "x$PRINTF" = x; then
1.969 + if test "xprintf" = x; then
1.970 + PROG_NAME=printf
1.971 + else
1.972 + PROG_NAME=printf
1.973 + fi
1.974 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.975 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.976 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.977 + fi
1.978 +
1.979 +
1.980 +
1.981 + for ac_prog in rm
1.982 do
1.983 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.984 set dummy $ac_prog; ac_word=$2
1.985 @@ -5253,20 +5253,20 @@
1.986 done
1.987
1.988
1.989 - if test "x$RM" = x; then
1.990 - if test "xrm" = x; then
1.991 - PROG_NAME=rm
1.992 - else
1.993 - PROG_NAME=rm
1.994 - fi
1.995 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.996 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.997 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.998 - fi
1.999 -
1.1000 -
1.1001 -
1.1002 - for ac_prog in sh
1.1003 + if test "x$RM" = x; then
1.1004 + if test "xrm" = x; then
1.1005 + PROG_NAME=rm
1.1006 + else
1.1007 + PROG_NAME=rm
1.1008 + fi
1.1009 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1010 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1011 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1012 + fi
1.1013 +
1.1014 +
1.1015 +
1.1016 + for ac_prog in sh
1.1017 do
1.1018 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1019 set dummy $ac_prog; ac_word=$2
1.1020 @@ -5312,20 +5312,20 @@
1.1021 done
1.1022
1.1023
1.1024 - if test "x$SH" = x; then
1.1025 - if test "xsh" = x; then
1.1026 - PROG_NAME=sh
1.1027 - else
1.1028 - PROG_NAME=sh
1.1029 - fi
1.1030 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1031 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1032 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1033 - fi
1.1034 -
1.1035 -
1.1036 -
1.1037 - for ac_prog in sort
1.1038 + if test "x$SH" = x; then
1.1039 + if test "xsh" = x; then
1.1040 + PROG_NAME=sh
1.1041 + else
1.1042 + PROG_NAME=sh
1.1043 + fi
1.1044 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1045 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1046 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1047 + fi
1.1048 +
1.1049 +
1.1050 +
1.1051 + for ac_prog in sort
1.1052 do
1.1053 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1054 set dummy $ac_prog; ac_word=$2
1.1055 @@ -5371,20 +5371,20 @@
1.1056 done
1.1057
1.1058
1.1059 - if test "x$SORT" = x; then
1.1060 - if test "xsort" = x; then
1.1061 - PROG_NAME=sort
1.1062 - else
1.1063 - PROG_NAME=sort
1.1064 - fi
1.1065 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1066 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1067 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1068 - fi
1.1069 -
1.1070 -
1.1071 -
1.1072 - for ac_prog in tail
1.1073 + if test "x$SORT" = x; then
1.1074 + if test "xsort" = x; then
1.1075 + PROG_NAME=sort
1.1076 + else
1.1077 + PROG_NAME=sort
1.1078 + fi
1.1079 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1080 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1081 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1082 + fi
1.1083 +
1.1084 +
1.1085 +
1.1086 + for ac_prog in tail
1.1087 do
1.1088 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1089 set dummy $ac_prog; ac_word=$2
1.1090 @@ -5430,20 +5430,20 @@
1.1091 done
1.1092
1.1093
1.1094 - if test "x$TAIL" = x; then
1.1095 - if test "xtail" = x; then
1.1096 - PROG_NAME=tail
1.1097 - else
1.1098 - PROG_NAME=tail
1.1099 - fi
1.1100 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1101 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1102 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1103 - fi
1.1104 -
1.1105 -
1.1106 -
1.1107 - for ac_prog in tar
1.1108 + if test "x$TAIL" = x; then
1.1109 + if test "xtail" = x; then
1.1110 + PROG_NAME=tail
1.1111 + else
1.1112 + PROG_NAME=tail
1.1113 + fi
1.1114 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1115 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1116 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1117 + fi
1.1118 +
1.1119 +
1.1120 +
1.1121 + for ac_prog in tar
1.1122 do
1.1123 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1124 set dummy $ac_prog; ac_word=$2
1.1125 @@ -5489,20 +5489,20 @@
1.1126 done
1.1127
1.1128
1.1129 - if test "x$TAR" = x; then
1.1130 - if test "xtar" = x; then
1.1131 - PROG_NAME=tar
1.1132 - else
1.1133 - PROG_NAME=tar
1.1134 - fi
1.1135 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1136 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1137 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1138 - fi
1.1139 -
1.1140 -
1.1141 -
1.1142 - for ac_prog in tee
1.1143 + if test "x$TAR" = x; then
1.1144 + if test "xtar" = x; then
1.1145 + PROG_NAME=tar
1.1146 + else
1.1147 + PROG_NAME=tar
1.1148 + fi
1.1149 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1150 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1151 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1152 + fi
1.1153 +
1.1154 +
1.1155 +
1.1156 + for ac_prog in tee
1.1157 do
1.1158 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1159 set dummy $ac_prog; ac_word=$2
1.1160 @@ -5548,20 +5548,20 @@
1.1161 done
1.1162
1.1163
1.1164 - if test "x$TEE" = x; then
1.1165 - if test "xtee" = x; then
1.1166 - PROG_NAME=tee
1.1167 - else
1.1168 - PROG_NAME=tee
1.1169 - fi
1.1170 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1171 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1172 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1173 - fi
1.1174 -
1.1175 -
1.1176 -
1.1177 - for ac_prog in touch
1.1178 + if test "x$TEE" = x; then
1.1179 + if test "xtee" = x; then
1.1180 + PROG_NAME=tee
1.1181 + else
1.1182 + PROG_NAME=tee
1.1183 + fi
1.1184 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1185 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1186 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1187 + fi
1.1188 +
1.1189 +
1.1190 +
1.1191 + for ac_prog in touch
1.1192 do
1.1193 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1194 set dummy $ac_prog; ac_word=$2
1.1195 @@ -5607,20 +5607,20 @@
1.1196 done
1.1197
1.1198
1.1199 - if test "x$TOUCH" = x; then
1.1200 - if test "xtouch" = x; then
1.1201 - PROG_NAME=touch
1.1202 - else
1.1203 - PROG_NAME=touch
1.1204 - fi
1.1205 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1206 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1207 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1208 - fi
1.1209 -
1.1210 -
1.1211 -
1.1212 - for ac_prog in tr
1.1213 + if test "x$TOUCH" = x; then
1.1214 + if test "xtouch" = x; then
1.1215 + PROG_NAME=touch
1.1216 + else
1.1217 + PROG_NAME=touch
1.1218 + fi
1.1219 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1220 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1221 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1222 + fi
1.1223 +
1.1224 +
1.1225 +
1.1226 + for ac_prog in tr
1.1227 do
1.1228 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1229 set dummy $ac_prog; ac_word=$2
1.1230 @@ -5666,20 +5666,20 @@
1.1231 done
1.1232
1.1233
1.1234 - if test "x$TR" = x; then
1.1235 - if test "xtr" = x; then
1.1236 - PROG_NAME=tr
1.1237 - else
1.1238 - PROG_NAME=tr
1.1239 - fi
1.1240 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1241 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1242 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1243 - fi
1.1244 -
1.1245 -
1.1246 -
1.1247 - for ac_prog in uname
1.1248 + if test "x$TR" = x; then
1.1249 + if test "xtr" = x; then
1.1250 + PROG_NAME=tr
1.1251 + else
1.1252 + PROG_NAME=tr
1.1253 + fi
1.1254 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1255 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1256 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1257 + fi
1.1258 +
1.1259 +
1.1260 +
1.1261 + for ac_prog in uname
1.1262 do
1.1263 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1264 set dummy $ac_prog; ac_word=$2
1.1265 @@ -5725,20 +5725,20 @@
1.1266 done
1.1267
1.1268
1.1269 - if test "x$UNAME" = x; then
1.1270 - if test "xuname" = x; then
1.1271 - PROG_NAME=uname
1.1272 - else
1.1273 - PROG_NAME=uname
1.1274 - fi
1.1275 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1276 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1277 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1278 - fi
1.1279 -
1.1280 -
1.1281 -
1.1282 - for ac_prog in uniq
1.1283 + if test "x$UNAME" = x; then
1.1284 + if test "xuname" = x; then
1.1285 + PROG_NAME=uname
1.1286 + else
1.1287 + PROG_NAME=uname
1.1288 + fi
1.1289 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1290 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1291 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1292 + fi
1.1293 +
1.1294 +
1.1295 +
1.1296 + for ac_prog in uniq
1.1297 do
1.1298 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1299 set dummy $ac_prog; ac_word=$2
1.1300 @@ -5784,20 +5784,20 @@
1.1301 done
1.1302
1.1303
1.1304 - if test "x$UNIQ" = x; then
1.1305 - if test "xuniq" = x; then
1.1306 - PROG_NAME=uniq
1.1307 - else
1.1308 - PROG_NAME=uniq
1.1309 - fi
1.1310 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1311 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1312 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1313 - fi
1.1314 -
1.1315 -
1.1316 -
1.1317 - for ac_prog in wc
1.1318 + if test "x$UNIQ" = x; then
1.1319 + if test "xuniq" = x; then
1.1320 + PROG_NAME=uniq
1.1321 + else
1.1322 + PROG_NAME=uniq
1.1323 + fi
1.1324 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1325 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1326 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1327 + fi
1.1328 +
1.1329 +
1.1330 +
1.1331 + for ac_prog in wc
1.1332 do
1.1333 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1334 set dummy $ac_prog; ac_word=$2
1.1335 @@ -5843,20 +5843,20 @@
1.1336 done
1.1337
1.1338
1.1339 - if test "x$WC" = x; then
1.1340 - if test "xwc" = x; then
1.1341 - PROG_NAME=wc
1.1342 - else
1.1343 - PROG_NAME=wc
1.1344 - fi
1.1345 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1346 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1347 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1348 - fi
1.1349 -
1.1350 -
1.1351 -
1.1352 - for ac_prog in which
1.1353 + if test "x$WC" = x; then
1.1354 + if test "xwc" = x; then
1.1355 + PROG_NAME=wc
1.1356 + else
1.1357 + PROG_NAME=wc
1.1358 + fi
1.1359 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1360 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1361 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1362 + fi
1.1363 +
1.1364 +
1.1365 +
1.1366 + for ac_prog in which
1.1367 do
1.1368 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1369 set dummy $ac_prog; ac_word=$2
1.1370 @@ -5902,20 +5902,20 @@
1.1371 done
1.1372
1.1373
1.1374 - if test "x$WHICH" = x; then
1.1375 - if test "xwhich" = x; then
1.1376 - PROG_NAME=which
1.1377 - else
1.1378 - PROG_NAME=which
1.1379 - fi
1.1380 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1381 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1382 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1383 - fi
1.1384 -
1.1385 -
1.1386 -
1.1387 - for ac_prog in xargs
1.1388 + if test "x$WHICH" = x; then
1.1389 + if test "xwhich" = x; then
1.1390 + PROG_NAME=which
1.1391 + else
1.1392 + PROG_NAME=which
1.1393 + fi
1.1394 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1395 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1396 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1397 + fi
1.1398 +
1.1399 +
1.1400 +
1.1401 + for ac_prog in xargs
1.1402 do
1.1403 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1404 set dummy $ac_prog; ac_word=$2
1.1405 @@ -5961,21 +5961,21 @@
1.1406 done
1.1407
1.1408
1.1409 - if test "x$XARGS" = x; then
1.1410 - if test "xxargs" = x; then
1.1411 - PROG_NAME=xargs
1.1412 - else
1.1413 - PROG_NAME=xargs
1.1414 - fi
1.1415 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1416 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1417 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1418 - fi
1.1419 -
1.1420 -
1.1421 -
1.1422 -# Then required tools that require some special treatment.
1.1423 -for ac_prog in gawk mawk nawk awk
1.1424 + if test "x$XARGS" = x; then
1.1425 + if test "xxargs" = x; then
1.1426 + PROG_NAME=xargs
1.1427 + else
1.1428 + PROG_NAME=xargs
1.1429 + fi
1.1430 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1431 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1432 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1433 + fi
1.1434 +
1.1435 +
1.1436 +
1.1437 + # Then required tools that require some special treatment.
1.1438 + for ac_prog in gawk mawk nawk awk
1.1439 do
1.1440 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1441 set dummy $ac_prog; ac_word=$2
1.1442 @@ -6018,18 +6018,18 @@
1.1443 done
1.1444
1.1445
1.1446 - if test "x$AWK" = x; then
1.1447 - if test "x" = x; then
1.1448 - PROG_NAME=awk
1.1449 - else
1.1450 - PROG_NAME=
1.1451 - fi
1.1452 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1453 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1454 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1455 - fi
1.1456 -
1.1457 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
1.1458 + if test "x$AWK" = x; then
1.1459 + if test "x" = x; then
1.1460 + PROG_NAME=awk
1.1461 + else
1.1462 + PROG_NAME=
1.1463 + fi
1.1464 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1465 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1466 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1467 + fi
1.1468 +
1.1469 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
1.1470 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
1.1471 if ${ac_cv_path_GREP+:} false; then :
1.1472 $as_echo_n "(cached) " >&6
1.1473 @@ -6093,18 +6093,18 @@
1.1474
1.1475
1.1476
1.1477 - if test "x$GREP" = x; then
1.1478 - if test "x" = x; then
1.1479 - PROG_NAME=grep
1.1480 - else
1.1481 - PROG_NAME=
1.1482 - fi
1.1483 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1484 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1485 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1486 - fi
1.1487 -
1.1488 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
1.1489 + if test "x$GREP" = x; then
1.1490 + if test "x" = x; then
1.1491 + PROG_NAME=grep
1.1492 + else
1.1493 + PROG_NAME=
1.1494 + fi
1.1495 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1496 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1497 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1498 + fi
1.1499 +
1.1500 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
1.1501 $as_echo_n "checking for egrep... " >&6; }
1.1502 if ${ac_cv_path_EGREP+:} false; then :
1.1503 $as_echo_n "(cached) " >&6
1.1504 @@ -6172,18 +6172,18 @@
1.1505
1.1506
1.1507
1.1508 - if test "x$EGREP" = x; then
1.1509 - if test "x" = x; then
1.1510 - PROG_NAME=egrep
1.1511 - else
1.1512 - PROG_NAME=
1.1513 - fi
1.1514 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1515 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1516 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1517 - fi
1.1518 -
1.1519 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
1.1520 + if test "x$EGREP" = x; then
1.1521 + if test "x" = x; then
1.1522 + PROG_NAME=egrep
1.1523 + else
1.1524 + PROG_NAME=
1.1525 + fi
1.1526 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1527 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1528 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1529 + fi
1.1530 +
1.1531 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
1.1532 $as_echo_n "checking for fgrep... " >&6; }
1.1533 if ${ac_cv_path_FGREP+:} false; then :
1.1534 $as_echo_n "(cached) " >&6
1.1535 @@ -6251,18 +6251,18 @@
1.1536
1.1537
1.1538
1.1539 - if test "x$FGREP" = x; then
1.1540 - if test "x" = x; then
1.1541 - PROG_NAME=fgrep
1.1542 - else
1.1543 - PROG_NAME=
1.1544 - fi
1.1545 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1546 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1547 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1548 - fi
1.1549 -
1.1550 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
1.1551 + if test "x$FGREP" = x; then
1.1552 + if test "x" = x; then
1.1553 + PROG_NAME=fgrep
1.1554 + else
1.1555 + PROG_NAME=
1.1556 + fi
1.1557 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1558 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1559 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1560 + fi
1.1561 +
1.1562 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
1.1563 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
1.1564 if ${ac_cv_path_SED+:} false; then :
1.1565 $as_echo_n "(cached) " >&6
1.1566 @@ -6332,19 +6332,19 @@
1.1567 rm -f conftest.sed
1.1568
1.1569
1.1570 - if test "x$SED" = x; then
1.1571 - if test "x" = x; then
1.1572 - PROG_NAME=sed
1.1573 - else
1.1574 - PROG_NAME=
1.1575 - fi
1.1576 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1577 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1578 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1579 - fi
1.1580 -
1.1581 -
1.1582 -for ac_prog in nawk gawk awk
1.1583 + if test "x$SED" = x; then
1.1584 + if test "x" = x; then
1.1585 + PROG_NAME=sed
1.1586 + else
1.1587 + PROG_NAME=
1.1588 + fi
1.1589 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1590 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1591 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1592 + fi
1.1593 +
1.1594 +
1.1595 + for ac_prog in nawk gawk awk
1.1596 do
1.1597 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1598 set dummy $ac_prog; ac_word=$2
1.1599 @@ -6390,27 +6390,27 @@
1.1600 done
1.1601
1.1602
1.1603 - if test "x$NAWK" = x; then
1.1604 - if test "x" = x; then
1.1605 - PROG_NAME=nawk
1.1606 - else
1.1607 - PROG_NAME=
1.1608 - fi
1.1609 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1610 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1611 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.1612 - fi
1.1613 -
1.1614 -
1.1615 -# Always force rm.
1.1616 -RM="$RM -f"
1.1617 -
1.1618 -# pwd behaves differently on various platforms and some don't support the -L flag.
1.1619 -# Always use the bash builtin pwd to get uniform behavior.
1.1620 -THEPWDCMD=pwd
1.1621 -
1.1622 -# These are not required on all platforms
1.1623 -# Extract the first word of "cygpath", so it can be a program name with args.
1.1624 + if test "x$NAWK" = x; then
1.1625 + if test "x" = x; then
1.1626 + PROG_NAME=nawk
1.1627 + else
1.1628 + PROG_NAME=
1.1629 + fi
1.1630 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1631 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1632 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1633 + fi
1.1634 +
1.1635 +
1.1636 + # Always force rm.
1.1637 + RM="$RM -f"
1.1638 +
1.1639 + # pwd behaves differently on various platforms and some don't support the -L flag.
1.1640 + # Always use the bash builtin pwd to get uniform behavior.
1.1641 + THEPWDCMD=pwd
1.1642 +
1.1643 + # These are not required on all platforms
1.1644 + # Extract the first word of "cygpath", so it can be a program name with args.
1.1645 set dummy cygpath; ac_word=$2
1.1646 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1647 $as_echo_n "checking for $ac_word... " >&6; }
1.1648 @@ -6450,7 +6450,7 @@
1.1649 fi
1.1650
1.1651
1.1652 -# Extract the first word of "readlink", so it can be a program name with args.
1.1653 + # Extract the first word of "readlink", so it can be a program name with args.
1.1654 set dummy readlink; ac_word=$2
1.1655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1656 $as_echo_n "checking for $ac_word... " >&6; }
1.1657 @@ -6490,7 +6490,7 @@
1.1658 fi
1.1659
1.1660
1.1661 -# Extract the first word of "df", so it can be a program name with args.
1.1662 + # Extract the first word of "df", so it can be a program name with args.
1.1663 set dummy df; ac_word=$2
1.1664 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1665 $as_echo_n "checking for $ac_word... " >&6; }
1.1666 @@ -6530,7 +6530,7 @@
1.1667 fi
1.1668
1.1669
1.1670 -# Extract the first word of "SetFile", so it can be a program name with args.
1.1671 + # Extract the first word of "SetFile", so it can be a program name with args.
1.1672 set dummy SetFile; ac_word=$2
1.1673 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1674 $as_echo_n "checking for $ac_word... " >&6; }
1.1675 @@ -6685,26 +6685,26 @@
1.1676 NONENONEs,x,x, &&
1.1677 program_prefix=${target_alias}-
1.1678
1.1679 -# Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
1.1680 -# is confusing; it assumes you are cross-compiling a cross-compiler (!) and "target" is thus the target of the
1.1681 -# product you're building. The target of this build is called "host". Since this is confusing to most people, we
1.1682 -# have not adopted that system, but use "target" as the platform we are building for. In some places though we need
1.1683 -# to use the configure naming style.
1.1684 -
1.1685 -
1.1686 -
1.1687 -
1.1688 -
1.1689 - # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME
1.1690 - # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME
1.1691 - # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build,
1.1692 - # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME.
1.1693 - OPENJDK_TARGET_AUTOCONF_NAME="$host"
1.1694 - OPENJDK_BUILD_AUTOCONF_NAME="$build"
1.1695 -
1.1696 -
1.1697 -
1.1698 - # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
1.1699 + # Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
1.1700 + # is confusing; it assumes you are cross-compiling a cross-compiler (!) and "target" is thus the target of the
1.1701 + # product you're building. The target of this build is called "host". Since this is confusing to most people, we
1.1702 + # have not adopted that system, but use "target" as the platform we are building for. In some places though we need
1.1703 + # to use the configure naming style.
1.1704 +
1.1705 +
1.1706 +
1.1707 +
1.1708 +
1.1709 + # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME
1.1710 + # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME
1.1711 + # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build,
1.1712 + # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME.
1.1713 + OPENJDK_TARGET_AUTOCONF_NAME="$host"
1.1714 + OPENJDK_BUILD_AUTOCONF_NAME="$build"
1.1715 +
1.1716 +
1.1717 +
1.1718 + # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
1.1719
1.1720 case "$build_os" in
1.1721 *linux*)
1.1722 @@ -6768,63 +6768,63 @@
1.1723 VAR_CPU_ARCH=ppc
1.1724 VAR_CPU_BITS=32
1.1725 VAR_CPU_ENDIAN=big
1.1726 - ;;
1.1727 + ;;
1.1728 powerpc64)
1.1729 VAR_CPU=ppc64
1.1730 VAR_CPU_ARCH=ppc
1.1731 VAR_CPU_BITS=64
1.1732 VAR_CPU_ENDIAN=big
1.1733 - ;;
1.1734 + ;;
1.1735 s390)
1.1736 VAR_CPU=s390
1.1737 VAR_CPU_ARCH=s390
1.1738 VAR_CPU_BITS=32
1.1739 VAR_CPU_ENDIAN=big
1.1740 - ;;
1.1741 + ;;
1.1742 s390x)
1.1743 VAR_CPU=s390x
1.1744 VAR_CPU_ARCH=s390
1.1745 VAR_CPU_BITS=64
1.1746 VAR_CPU_ENDIAN=big
1.1747 - ;;
1.1748 + ;;
1.1749 sparc)
1.1750 VAR_CPU=sparc
1.1751 VAR_CPU_ARCH=sparc
1.1752 VAR_CPU_BITS=32
1.1753 VAR_CPU_ENDIAN=big
1.1754 - ;;
1.1755 + ;;
1.1756 sparcv9)
1.1757 VAR_CPU=sparcv9
1.1758 VAR_CPU_ARCH=sparc
1.1759 VAR_CPU_BITS=64
1.1760 VAR_CPU_ENDIAN=big
1.1761 - ;;
1.1762 + ;;
1.1763 *)
1.1764 as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
1.1765 ;;
1.1766 esac
1.1767
1.1768 - # ..and setup our own variables. (Do this explicitely to facilitate searching)
1.1769 - OPENJDK_BUILD_OS="$VAR_OS"
1.1770 - OPENJDK_BUILD_OS_API="$VAR_OS_API"
1.1771 - OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
1.1772 - OPENJDK_BUILD_CPU="$VAR_CPU"
1.1773 - OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
1.1774 - OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
1.1775 - OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
1.1776 -
1.1777 -
1.1778 -
1.1779 -
1.1780 -
1.1781 -
1.1782 -
1.1783 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5
1.1784 + # ..and setup our own variables. (Do this explicitely to facilitate searching)
1.1785 + OPENJDK_BUILD_OS="$VAR_OS"
1.1786 + OPENJDK_BUILD_OS_API="$VAR_OS_API"
1.1787 + OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
1.1788 + OPENJDK_BUILD_CPU="$VAR_CPU"
1.1789 + OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
1.1790 + OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
1.1791 + OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
1.1792 +
1.1793 +
1.1794 +
1.1795 +
1.1796 +
1.1797 +
1.1798 +
1.1799 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5
1.1800 $as_echo_n "checking openjdk-build os-cpu... " >&6; }
1.1801 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5
1.1802 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5
1.1803 $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
1.1804
1.1805 - # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
1.1806 + # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
1.1807
1.1808 case "$host_os" in
1.1809 *linux*)
1.1810 @@ -6888,60 +6888,60 @@
1.1811 VAR_CPU_ARCH=ppc
1.1812 VAR_CPU_BITS=32
1.1813 VAR_CPU_ENDIAN=big
1.1814 - ;;
1.1815 + ;;
1.1816 powerpc64)
1.1817 VAR_CPU=ppc64
1.1818 VAR_CPU_ARCH=ppc
1.1819 VAR_CPU_BITS=64
1.1820 VAR_CPU_ENDIAN=big
1.1821 - ;;
1.1822 + ;;
1.1823 s390)
1.1824 VAR_CPU=s390
1.1825 VAR_CPU_ARCH=s390
1.1826 VAR_CPU_BITS=32
1.1827 VAR_CPU_ENDIAN=big
1.1828 - ;;
1.1829 + ;;
1.1830 s390x)
1.1831 VAR_CPU=s390x
1.1832 VAR_CPU_ARCH=s390
1.1833 VAR_CPU_BITS=64
1.1834 VAR_CPU_ENDIAN=big
1.1835 - ;;
1.1836 + ;;
1.1837 sparc)
1.1838 VAR_CPU=sparc
1.1839 VAR_CPU_ARCH=sparc
1.1840 VAR_CPU_BITS=32
1.1841 VAR_CPU_ENDIAN=big
1.1842 - ;;
1.1843 + ;;
1.1844 sparcv9)
1.1845 VAR_CPU=sparcv9
1.1846 VAR_CPU_ARCH=sparc
1.1847 VAR_CPU_BITS=64
1.1848 VAR_CPU_ENDIAN=big
1.1849 - ;;
1.1850 + ;;
1.1851 *)
1.1852 as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
1.1853 ;;
1.1854 esac
1.1855
1.1856 - # ... and setup our own variables. (Do this explicitely to facilitate searching)
1.1857 - OPENJDK_TARGET_OS="$VAR_OS"
1.1858 - OPENJDK_TARGET_OS_API="$VAR_OS_API"
1.1859 - OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
1.1860 - OPENJDK_TARGET_CPU="$VAR_CPU"
1.1861 - OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
1.1862 - OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
1.1863 - OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
1.1864 -
1.1865 -
1.1866 -
1.1867 -
1.1868 -
1.1869 -
1.1870 -
1.1871 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5
1.1872 + # ... and setup our own variables. (Do this explicitely to facilitate searching)
1.1873 + OPENJDK_TARGET_OS="$VAR_OS"
1.1874 + OPENJDK_TARGET_OS_API="$VAR_OS_API"
1.1875 + OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
1.1876 + OPENJDK_TARGET_CPU="$VAR_CPU"
1.1877 + OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
1.1878 + OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
1.1879 + OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
1.1880 +
1.1881 +
1.1882 +
1.1883 +
1.1884 +
1.1885 +
1.1886 +
1.1887 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5
1.1888 $as_echo_n "checking openjdk-target os-cpu... " >&6; }
1.1889 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5
1.1890 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5
1.1891 $as_echo "$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&6; }
1.1892
1.1893
1.1894 @@ -6991,168 +6991,167 @@
1.1895 fi
1.1896
1.1897
1.1898 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compilation type" >&5
1.1899 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking compilation type" >&5
1.1900 $as_echo_n "checking compilation type... " >&6; }
1.1901 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_TYPE" >&5
1.1902 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_TYPE" >&5
1.1903 $as_echo "$COMPILE_TYPE" >&6; }
1.1904
1.1905
1.1906 - if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.1907 - REQUIRED_OS_NAME=SunOS
1.1908 - REQUIRED_OS_VERSION=5.10
1.1909 - fi
1.1910 - if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
1.1911 - REQUIRED_OS_NAME=Linux
1.1912 - REQUIRED_OS_VERSION=2.6
1.1913 - fi
1.1914 - if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.1915 - REQUIRED_OS_NAME=Windows
1.1916 - if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
1.1917 - REQUIRED_OS_VERSION=5.2
1.1918 - else
1.1919 - REQUIRED_OS_VERSION=5.1
1.1920 - fi
1.1921 - fi
1.1922 - if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.1923 - REQUIRED_OS_NAME=Darwin
1.1924 - REQUIRED_OS_VERSION=11.2
1.1925 - fi
1.1926 -
1.1927 -
1.1928 -
1.1929 -
1.1930 -
1.1931 - # Also store the legacy naming of the cpu.
1.1932 - # Ie i586 and amd64 instead of x86 and x86_64
1.1933 - OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU"
1.1934 - if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.1935 - OPENJDK_TARGET_CPU_LEGACY="i586"
1.1936 - elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.1937 - # On all platforms except MacOSX replace x86_64 with amd64.
1.1938 - OPENJDK_TARGET_CPU_LEGACY="amd64"
1.1939 - fi
1.1940 -
1.1941 -
1.1942 - # And the second legacy naming of the cpu.
1.1943 - # Ie i386 and amd64 instead of x86 and x86_64.
1.1944 - OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU"
1.1945 - if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.1946 - OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
1.1947 - elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.1948 - OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
1.1949 - fi
1.1950 -
1.1951 -
1.1952 - # This is the name of the cpu (but using i386 and amd64 instead of
1.1953 - # x86 and x86_64, respectively), preceeded by a /, to be used when
1.1954 - # locating libraries. On macosx, it's empty, though.
1.1955 - OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
1.1956 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.1957 - OPENJDK_TARGET_CPU_LIBDIR=""
1.1958 - fi
1.1959 -
1.1960 -
1.1961 - # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
1.1962 - # /amd64 or /sparcv9. This string is appended to some library paths, like this:
1.1963 - # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
1.1964 - OPENJDK_TARGET_CPU_ISADIR=""
1.1965 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.1966 - if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.1967 - OPENJDK_TARGET_CPU_ISADIR="/amd64"
1.1968 - elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
1.1969 - OPENJDK_TARGET_CPU_ISADIR="/sparcv9"
1.1970 - fi
1.1971 - fi
1.1972 -
1.1973 -
1.1974 - # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
1.1975 - OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
1.1976 - if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
1.1977 - # On linux only, we replace x86 with i386.
1.1978 - OPENJDK_TARGET_CPU_OSARCH="i386"
1.1979 - elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.1980 - # On all platforms except macosx, we replace x86_64 with amd64.
1.1981 - OPENJDK_TARGET_CPU_OSARCH="amd64"
1.1982 - fi
1.1983 -
1.1984 -
1.1985 - OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU"
1.1986 - if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.1987 - OPENJDK_TARGET_CPU_JLI="i386"
1.1988 - elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.1989 - # On all platforms except macosx, we replace x86_64 with amd64.
1.1990 - OPENJDK_TARGET_CPU_JLI="amd64"
1.1991 - fi
1.1992 - # Now setup the -D flags for building libjli.
1.1993 - OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
1.1994 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.1995 - if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
1.1996 - OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
1.1997 - elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
1.1998 - OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
1.1999 - fi
1.2000 - fi
1.2001 -
1.2002 -
1.2003 - # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
1.2004 - if test "x$OPENJDK_TARGET_OS_API" = xposix; then
1.2005 - OPENJDK_TARGET_OS_API_DIR="solaris"
1.2006 - fi
1.2007 - if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
1.2008 - OPENJDK_TARGET_OS_API_DIR="windows"
1.2009 - fi
1.2010 -
1.2011 -
1.2012 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.2013 - A_LP64="LP64:="
1.2014 - # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
1.2015 - # unpack200.exe
1.2016 - if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.2017 - ADD_LP64="-D_LP64=1"
1.2018 - fi
1.2019 - fi
1.2020 - LP64=$A_LP64
1.2021 -
1.2022 -
1.2023 - if test "x$COMPILE_TYPE" = "xcross"; then
1.2024 - # FIXME: ... or should this include reduced builds..?
1.2025 - DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY"
1.2026 - else
1.2027 - DEFINE_CROSS_COMPILE_ARCH=""
1.2028 - fi
1.2029 -
1.2030 -
1.2031 - # ZERO_ARCHDEF is used to enable architecture-specific code
1.2032 - case "${OPENJDK_TARGET_CPU}" in
1.2033 - ppc*) ZERO_ARCHDEF=PPC ;;
1.2034 - s390*) ZERO_ARCHDEF=S390 ;;
1.2035 - sparc*) ZERO_ARCHDEF=SPARC ;;
1.2036 - x86_64*) ZERO_ARCHDEF=AMD64 ;;
1.2037 - x86) ZERO_ARCHDEF=IA32 ;;
1.2038 - *) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
1.2039 - esac
1.2040 -
1.2041 + if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.2042 + REQUIRED_OS_NAME=SunOS
1.2043 + REQUIRED_OS_VERSION=5.10
1.2044 + fi
1.2045 + if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
1.2046 + REQUIRED_OS_NAME=Linux
1.2047 + REQUIRED_OS_VERSION=2.6
1.2048 + fi
1.2049 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.2050 + REQUIRED_OS_NAME=Windows
1.2051 + if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
1.2052 + REQUIRED_OS_VERSION=5.2
1.2053 + else
1.2054 + REQUIRED_OS_VERSION=5.1
1.2055 + fi
1.2056 + fi
1.2057 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.2058 + REQUIRED_OS_NAME=Darwin
1.2059 + REQUIRED_OS_VERSION=11.2
1.2060 + fi
1.2061 +
1.2062 +
1.2063 +
1.2064 +
1.2065 +
1.2066 + # Also store the legacy naming of the cpu.
1.2067 + # Ie i586 and amd64 instead of x86 and x86_64
1.2068 + OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU"
1.2069 + if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.2070 + OPENJDK_TARGET_CPU_LEGACY="i586"
1.2071 + elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.2072 + # On all platforms except MacOSX replace x86_64 with amd64.
1.2073 + OPENJDK_TARGET_CPU_LEGACY="amd64"
1.2074 + fi
1.2075 +
1.2076 +
1.2077 + # And the second legacy naming of the cpu.
1.2078 + # Ie i386 and amd64 instead of x86 and x86_64.
1.2079 + OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU"
1.2080 + if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.2081 + OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
1.2082 + elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.2083 + OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
1.2084 + fi
1.2085 +
1.2086 +
1.2087 + # This is the name of the cpu (but using i386 and amd64 instead of
1.2088 + # x86 and x86_64, respectively), preceeded by a /, to be used when
1.2089 + # locating libraries. On macosx, it's empty, though.
1.2090 + OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
1.2091 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.2092 + OPENJDK_TARGET_CPU_LIBDIR=""
1.2093 + fi
1.2094 +
1.2095 +
1.2096 + # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
1.2097 + # /amd64 or /sparcv9. This string is appended to some library paths, like this:
1.2098 + # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
1.2099 + OPENJDK_TARGET_CPU_ISADIR=""
1.2100 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.2101 + if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.2102 + OPENJDK_TARGET_CPU_ISADIR="/amd64"
1.2103 + elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
1.2104 + OPENJDK_TARGET_CPU_ISADIR="/sparcv9"
1.2105 + fi
1.2106 + fi
1.2107 +
1.2108 +
1.2109 + # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
1.2110 + OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
1.2111 + if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
1.2112 + # On linux only, we replace x86 with i386.
1.2113 + OPENJDK_TARGET_CPU_OSARCH="i386"
1.2114 + elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.2115 + # On all platforms except macosx, we replace x86_64 with amd64.
1.2116 + OPENJDK_TARGET_CPU_OSARCH="amd64"
1.2117 + fi
1.2118 +
1.2119 +
1.2120 + OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU"
1.2121 + if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.2122 + OPENJDK_TARGET_CPU_JLI="i386"
1.2123 + elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.2124 + # On all platforms except macosx, we replace x86_64 with amd64.
1.2125 + OPENJDK_TARGET_CPU_JLI="amd64"
1.2126 + fi
1.2127 + # Now setup the -D flags for building libjli.
1.2128 + OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
1.2129 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.2130 + if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
1.2131 + OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
1.2132 + elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
1.2133 + OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
1.2134 + fi
1.2135 + fi
1.2136 +
1.2137 +
1.2138 + # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
1.2139 + if test "x$OPENJDK_TARGET_OS_API" = xposix; then
1.2140 + OPENJDK_TARGET_OS_API_DIR="solaris"
1.2141 + fi
1.2142 + if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
1.2143 + OPENJDK_TARGET_OS_API_DIR="windows"
1.2144 + fi
1.2145 +
1.2146 +
1.2147 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.2148 + A_LP64="LP64:="
1.2149 + # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
1.2150 + # unpack200.exe
1.2151 + if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.2152 + ADD_LP64="-D_LP64=1"
1.2153 + fi
1.2154 + fi
1.2155 + LP64=$A_LP64
1.2156 +
1.2157 +
1.2158 + if test "x$COMPILE_TYPE" = "xcross"; then
1.2159 + # FIXME: ... or should this include reduced builds..?
1.2160 + DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY"
1.2161 + else
1.2162 + DEFINE_CROSS_COMPILE_ARCH=""
1.2163 + fi
1.2164 +
1.2165 +
1.2166 + # ZERO_ARCHDEF is used to enable architecture-specific code
1.2167 + case "${OPENJDK_TARGET_CPU}" in
1.2168 + ppc*) ZERO_ARCHDEF=PPC ;;
1.2169 + s390*) ZERO_ARCHDEF=S390 ;;
1.2170 + sparc*) ZERO_ARCHDEF=SPARC ;;
1.2171 + x86_64*) ZERO_ARCHDEF=AMD64 ;;
1.2172 + x86) ZERO_ARCHDEF=IA32 ;;
1.2173 + *) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
1.2174 + esac
1.2175
1.2176
1.2177
1.2178
1.2179 # Continue setting up basic stuff. Most remaining code require fundamental tools.
1.2180
1.2181 -# Locate the directory of this script.
1.2182 -SCRIPT="$0"
1.2183 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
1.2184 -
1.2185 -# Where is the source? It is located two levels above the configure script.
1.2186 -CURDIR="$PWD"
1.2187 -cd "$AUTOCONF_DIR/../.."
1.2188 -SRC_ROOT="`$THEPWDCMD -L`"
1.2189 -
1.2190 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.2191 - PATH_SEP=";"
1.2192 + # Locate the directory of this script.
1.2193 + SCRIPT="$0"
1.2194 + AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
1.2195 +
1.2196 + # Where is the source? It is located two levels above the configure script.
1.2197 + CURDIR="$PWD"
1.2198 + cd "$AUTOCONF_DIR/../.."
1.2199 + SRC_ROOT="`$THEPWDCMD -L`"
1.2200 +
1.2201 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.2202 + PATH_SEP=";"
1.2203
1.2204 SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
1.2205 if test $SRC_ROOT_LENGTH -gt 100; then
1.2206 - as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
1.2207 + as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
1.2208 fi
1.2209
1.2210 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2211 @@ -7171,7 +7170,7 @@
1.2212 as_fn_error $? "Cannot continue" "$LINENO" 5
1.2213 fi
1.2214 if test "x$CYGPATH" = x; then
1.2215 - as_fn_error $? "Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path" "$LINENO" 5
1.2216 + as_fn_error $? "Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path" "$LINENO" 5
1.2217 fi
1.2218 { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin root directory as unix-style path" >&5
1.2219 $as_echo_n "checking cygwin root directory as unix-style path... " >&6; }
1.2220 @@ -7184,7 +7183,7 @@
1.2221 WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH"
1.2222 test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/`
1.2223 if test "x$test_cygdrive_prefix" = x; then
1.2224 - as_fn_error $? "Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c." "$LINENO" 5
1.2225 + as_fn_error $? "Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c." "$LINENO" 5
1.2226 fi
1.2227 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2228 { $as_echo "$as_me:${as_lineno-$LINENO}: checking msys release" >&5
1.2229 @@ -7239,13 +7238,13 @@
1.2230 $as_echo "$as_me: WARNING: It seems that your find utility is non-standard." >&2;}
1.2231 fi
1.2232
1.2233 -else
1.2234 - PATH_SEP=":"
1.2235 -fi
1.2236 -
1.2237 -
1.2238 -
1.2239 -cd "$CURDIR"
1.2240 + else
1.2241 + PATH_SEP=":"
1.2242 + fi
1.2243 +
1.2244 +
1.2245 +
1.2246 + cd "$CURDIR"
1.2247
1.2248
1.2249 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2250 @@ -7492,13 +7491,13 @@
1.2251 fi
1.2252
1.2253
1.2254 -if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
1.2255 + if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
1.2256 # Add extra search paths on solaris for utilities like ar and as etc...
1.2257 PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
1.2258 -fi
1.2259 -
1.2260 -# You can force the sys-root if the sys-root encoded into the cross compiler tools
1.2261 -# is not correct.
1.2262 + fi
1.2263 +
1.2264 + # You can force the sys-root if the sys-root encoded into the cross compiler tools
1.2265 + # is not correct.
1.2266
1.2267 # Check whether --with-sys-root was given.
1.2268 if test "${with_sys_root+set}" = set; then :
1.2269 @@ -7506,11 +7505,11 @@
1.2270 fi
1.2271
1.2272
1.2273 -if test "x$with_sys_root" != x; then
1.2274 - SYS_ROOT=$with_sys_root
1.2275 -else
1.2276 - SYS_ROOT=/
1.2277 -fi
1.2278 + if test "x$with_sys_root" != x; then
1.2279 + SYS_ROOT=$with_sys_root
1.2280 + else
1.2281 + SYS_ROOT=/
1.2282 + fi
1.2283
1.2284
1.2285
1.2286 @@ -7525,9 +7524,9 @@
1.2287 # Check whether --with-devkit was given.
1.2288 if test "${with_devkit+set}" = set; then :
1.2289 withval=$with_devkit;
1.2290 - if test "x$with_sys_root" != x; then
1.2291 - as_fn_error $? "Cannot specify both --with-devkit and --with-sys-root at the same time" "$LINENO" 5
1.2292 - fi
1.2293 + if test "x$with_sys_root" != x; then
1.2294 + as_fn_error $? "Cannot specify both --with-devkit and --with-sys-root at the same time" "$LINENO" 5
1.2295 + fi
1.2296
1.2297 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2298
1.2299 @@ -7657,20 +7656,20 @@
1.2300 TOOLS_DIR="$TOOLS_DIR:$with_devkit/bin"
1.2301 fi
1.2302
1.2303 - if test -d "$with_devkit/$host_alias/libc"; then
1.2304 - SYS_ROOT=$with_devkit/$host_alias/libc
1.2305 - elif test -d "$with_devkit/$host/sys-root"; then
1.2306 - SYS_ROOT=$with_devkit/$host/sys-root
1.2307 - fi
1.2308 -
1.2309 -fi
1.2310 -
1.2311 -
1.2312 -
1.2313 -# Setup default logging of stdout and stderr to build.log in the output root.
1.2314 -BUILD_LOG='$(OUTPUT_ROOT)/build.log'
1.2315 -BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
1.2316 -BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
1.2317 + if test -d "$with_devkit/$host_alias/libc"; then
1.2318 + SYS_ROOT=$with_devkit/$host_alias/libc
1.2319 + elif test -d "$with_devkit/$host/sys-root"; then
1.2320 + SYS_ROOT=$with_devkit/$host/sys-root
1.2321 + fi
1.2322 +
1.2323 +fi
1.2324 +
1.2325 +
1.2326 +
1.2327 + # Setup default logging of stdout and stderr to build.log in the output root.
1.2328 + BUILD_LOG='$(OUTPUT_ROOT)/build.log'
1.2329 + BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
1.2330 + BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
1.2331
1.2332
1.2333
1.2334 @@ -7725,18 +7724,18 @@
1.2335
1.2336 # These are needed to be able to create a configuration name (and thus the output directory)
1.2337
1.2338 -###############################################################################
1.2339 -#
1.2340 -# Check which variant of the JDK that we want to build.
1.2341 -# Currently we have:
1.2342 -# normal: standard edition
1.2343 -# but the custom make system may add other variants
1.2344 -#
1.2345 -# Effectively the JDK variant gives a name to a specific set of
1.2346 -# modules to compile into the JDK. In the future, these modules
1.2347 -# might even be Jigsaw modules.
1.2348 -#
1.2349 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of the JDK to build" >&5
1.2350 + ###############################################################################
1.2351 + #
1.2352 + # Check which variant of the JDK that we want to build.
1.2353 + # Currently we have:
1.2354 + # normal: standard edition
1.2355 + # but the custom make system may add other variants
1.2356 + #
1.2357 + # Effectively the JDK variant gives a name to a specific set of
1.2358 + # modules to compile into the JDK. In the future, these modules
1.2359 + # might even be Jigsaw modules.
1.2360 + #
1.2361 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of the JDK to build" >&5
1.2362 $as_echo_n "checking which variant of the JDK to build... " >&6; }
1.2363
1.2364 # Check whether --with-jdk-variant was given.
1.2365 @@ -7745,31 +7744,31 @@
1.2366 fi
1.2367
1.2368
1.2369 -if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
1.2370 + if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
1.2371 JDK_VARIANT="normal"
1.2372 -else
1.2373 + else
1.2374 as_fn_error $? "The available JDK variants are: normal" "$LINENO" 5
1.2375 -fi
1.2376 -
1.2377 -
1.2378 -
1.2379 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_VARIANT" >&5
1.2380 + fi
1.2381 +
1.2382 +
1.2383 +
1.2384 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_VARIANT" >&5
1.2385 $as_echo "$JDK_VARIANT" >&6; }
1.2386
1.2387
1.2388
1.2389 -###############################################################################
1.2390 -#
1.2391 -# Check which variants of the JVM that we want to build.
1.2392 -# Currently we have:
1.2393 -# server: normal interpreter and a tiered C1/C2 compiler
1.2394 -# client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
1.2395 -# minimal1: reduced form of client with optional VM services and features stripped out
1.2396 -# kernel: kernel footprint JVM that passes the TCK without major performance problems,
1.2397 -# ie normal interpreter and C1, only the serial GC, kernel jvmti etc
1.2398 -# zero: no machine code interpreter, no compiler
1.2399 -# zeroshark: zero interpreter and shark/llvm compiler backend
1.2400 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5
1.2401 + ###############################################################################
1.2402 + #
1.2403 + # Check which variants of the JVM that we want to build.
1.2404 + # Currently we have:
1.2405 + # server: normal interpreter and a tiered C1/C2 compiler
1.2406 + # client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
1.2407 + # minimal1: reduced form of client with optional VM services and features stripped out
1.2408 + # kernel: kernel footprint JVM that passes the TCK without major performance problems,
1.2409 + # ie normal interpreter and C1, only the serial GC, kernel jvmti etc
1.2410 + # zero: no machine code interpreter, no compiler
1.2411 + # zeroshark: zero interpreter and shark/llvm compiler backend
1.2412 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5
1.2413 $as_echo_n "checking which variants of the JVM to build... " >&6; }
1.2414
1.2415 # Check whether --with-jvm-variants was given.
1.2416 @@ -7778,87 +7777,86 @@
1.2417 fi
1.2418
1.2419
1.2420 -if test "x$with_jvm_variants" = x; then
1.2421 - with_jvm_variants="server"
1.2422 -fi
1.2423 -
1.2424 -JVM_VARIANTS=",$with_jvm_variants,"
1.2425 -TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'`
1.2426 -
1.2427 -if test "x$TEST_VARIANTS" != "x,"; then
1.2428 - as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5
1.2429 -fi
1.2430 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5
1.2431 + if test "x$with_jvm_variants" = x; then
1.2432 + with_jvm_variants="server"
1.2433 + fi
1.2434 +
1.2435 + JVM_VARIANTS=",$with_jvm_variants,"
1.2436 + TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'`
1.2437 +
1.2438 + if test "x$TEST_VARIANTS" != "x,"; then
1.2439 + as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5
1.2440 + fi
1.2441 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5
1.2442 $as_echo "$with_jvm_variants" >&6; }
1.2443
1.2444 -JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
1.2445 -JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
1.2446 -JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
1.2447 -JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
1.2448 -JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
1.2449 -JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
1.2450 -
1.2451 -if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.2452 + JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
1.2453 + JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
1.2454 + JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
1.2455 + JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
1.2456 + JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
1.2457 + JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
1.2458 +
1.2459 + if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.2460 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.2461 - as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5
1.2462 - fi
1.2463 -fi
1.2464 -if test "x$JVM_VARIANT_KERNEL" = xtrue; then
1.2465 + as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5
1.2466 + fi
1.2467 + fi
1.2468 + if test "x$JVM_VARIANT_KERNEL" = xtrue; then
1.2469 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.2470 - as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5
1.2471 - fi
1.2472 -fi
1.2473 -if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.2474 + as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5
1.2475 + fi
1.2476 + fi
1.2477 + if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.2478 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.2479 - as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5
1.2480 - fi
1.2481 -fi
1.2482 -
1.2483 -# Replace the commas with AND for use in the build directory name.
1.2484 -ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
1.2485 -COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'`
1.2486 -if test "x$COUNT_VARIANTS" != "x,1"; then
1.2487 + as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5
1.2488 + fi
1.2489 + fi
1.2490 +
1.2491 + # Replace the commas with AND for use in the build directory name.
1.2492 + ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
1.2493 + COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'`
1.2494 + if test "x$COUNT_VARIANTS" != "x,1"; then
1.2495 BUILDING_MULTIPLE_JVM_VARIANTS=yes
1.2496 -else
1.2497 + else
1.2498 BUILDING_MULTIPLE_JVM_VARIANTS=no
1.2499 -fi
1.2500 -
1.2501 -
1.2502 -
1.2503 -
1.2504 -
1.2505 -
1.2506 -
1.2507 -
1.2508 -
1.2509 -INCLUDE_SA=true
1.2510 -if test "x$JVM_VARIANT_ZERO" = xtrue ; then
1.2511 + fi
1.2512 +
1.2513 +
1.2514 +
1.2515 +
1.2516 +
1.2517 +
1.2518 +
1.2519 +
1.2520 +
1.2521 + INCLUDE_SA=true
1.2522 + if test "x$JVM_VARIANT_ZERO" = xtrue ; then
1.2523 INCLUDE_SA=false
1.2524 -fi
1.2525 -if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
1.2526 + fi
1.2527 + if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
1.2528 INCLUDE_SA=false
1.2529 -fi
1.2530 -
1.2531 -
1.2532 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.2533 - MACOSX_UNIVERSAL="true"
1.2534 -fi
1.2535 -
1.2536 -
1.2537 -
1.2538 -
1.2539 -
1.2540 -###############################################################################
1.2541 -#
1.2542 -# Set the debug level
1.2543 -# release: no debug information, all optimizations, no asserts.
1.2544 -# fastdebug: debug information (-g), all optimizations, all asserts
1.2545 -# slowdebug: debug information (-g), no optimizations, all asserts
1.2546 -#
1.2547 -DEBUG_LEVEL="release"
1.2548 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which debug level to use" >&5
1.2549 + fi
1.2550 +
1.2551 +
1.2552 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.2553 + MACOSX_UNIVERSAL="true"
1.2554 + fi
1.2555 +
1.2556 +
1.2557 +
1.2558 +
1.2559 + ###############################################################################
1.2560 + #
1.2561 + # Set the debug level
1.2562 + # release: no debug information, all optimizations, no asserts.
1.2563 + # fastdebug: debug information (-g), all optimizations, all asserts
1.2564 + # slowdebug: debug information (-g), no optimizations, all asserts
1.2565 + #
1.2566 + DEBUG_LEVEL="release"
1.2567 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which debug level to use" >&5
1.2568 $as_echo_n "checking which debug level to use... " >&6; }
1.2569 -# Check whether --enable-debug was given.
1.2570 + # Check whether --enable-debug was given.
1.2571 if test "${enable_debug+set}" = set; then :
1.2572 enableval=$enable_debug;
1.2573 ENABLE_DEBUG="${enableval}"
1.2574 @@ -7875,96 +7873,96 @@
1.2575 withval=$with_debug_level;
1.2576 DEBUG_LEVEL="${withval}"
1.2577 if test "x$ENABLE_DEBUG" = xyes; then
1.2578 - as_fn_error $? "You cannot use both --enable-debug and --with-debug-level at the same time." "$LINENO" 5
1.2579 - fi
1.2580 -
1.2581 -fi
1.2582 -
1.2583 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG_LEVEL" >&5
1.2584 + as_fn_error $? "You cannot use both --enable-debug and --with-debug-level at the same time." "$LINENO" 5
1.2585 + fi
1.2586 +
1.2587 +fi
1.2588 +
1.2589 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG_LEVEL" >&5
1.2590 $as_echo "$DEBUG_LEVEL" >&6; }
1.2591
1.2592 -if test "x$DEBUG_LEVEL" != xrelease && \
1.2593 - test "x$DEBUG_LEVEL" != xfastdebug && \
1.2594 - test "x$DEBUG_LEVEL" != xslowdebug; then
1.2595 - as_fn_error $? "Allowed debug levels are: release, fastdebug and slowdebug" "$LINENO" 5
1.2596 -fi
1.2597 -
1.2598 -
1.2599 -###############################################################################
1.2600 -#
1.2601 -# Setup legacy vars/targets and new vars to deal with different debug levels.
1.2602 -#
1.2603 -
1.2604 -case $DEBUG_LEVEL in
1.2605 - release )
1.2606 - VARIANT="OPT"
1.2607 - FASTDEBUG="false"
1.2608 - DEBUG_CLASSFILES="false"
1.2609 - BUILD_VARIANT_RELEASE=""
1.2610 - HOTSPOT_DEBUG_LEVEL="product"
1.2611 - HOTSPOT_EXPORT="product"
1.2612 - ;;
1.2613 - fastdebug )
1.2614 - VARIANT="DBG"
1.2615 - FASTDEBUG="true"
1.2616 - DEBUG_CLASSFILES="true"
1.2617 - BUILD_VARIANT_RELEASE="-fastdebug"
1.2618 - HOTSPOT_DEBUG_LEVEL="fastdebug"
1.2619 - HOTSPOT_EXPORT="fastdebug"
1.2620 - ;;
1.2621 - slowdebug )
1.2622 - VARIANT="DBG"
1.2623 - FASTDEBUG="false"
1.2624 - DEBUG_CLASSFILES="true"
1.2625 - BUILD_VARIANT_RELEASE="-debug"
1.2626 - HOTSPOT_DEBUG_LEVEL="jvmg"
1.2627 - HOTSPOT_EXPORT="debug"
1.2628 - ;;
1.2629 -esac
1.2630 -
1.2631 -#####
1.2632 -# Generate the legacy makefile targets for hotspot.
1.2633 -# The hotspot api for selecting the build artifacts, really, needs to be improved.
1.2634 -# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
1.2635 -# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
1.2636 -# But until then ...
1.2637 -HOTSPOT_TARGET=""
1.2638 -
1.2639 -if test "x$JVM_VARIANT_SERVER" = xtrue; then
1.2640 + if test "x$DEBUG_LEVEL" != xrelease && \
1.2641 + test "x$DEBUG_LEVEL" != xfastdebug && \
1.2642 + test "x$DEBUG_LEVEL" != xslowdebug; then
1.2643 + as_fn_error $? "Allowed debug levels are: release, fastdebug and slowdebug" "$LINENO" 5
1.2644 + fi
1.2645 +
1.2646 +
1.2647 + ###############################################################################
1.2648 + #
1.2649 + # Setup legacy vars/targets and new vars to deal with different debug levels.
1.2650 + #
1.2651 +
1.2652 + case $DEBUG_LEVEL in
1.2653 + release )
1.2654 + VARIANT="OPT"
1.2655 + FASTDEBUG="false"
1.2656 + DEBUG_CLASSFILES="false"
1.2657 + BUILD_VARIANT_RELEASE=""
1.2658 + HOTSPOT_DEBUG_LEVEL="product"
1.2659 + HOTSPOT_EXPORT="product"
1.2660 + ;;
1.2661 + fastdebug )
1.2662 + VARIANT="DBG"
1.2663 + FASTDEBUG="true"
1.2664 + DEBUG_CLASSFILES="true"
1.2665 + BUILD_VARIANT_RELEASE="-fastdebug"
1.2666 + HOTSPOT_DEBUG_LEVEL="fastdebug"
1.2667 + HOTSPOT_EXPORT="fastdebug"
1.2668 + ;;
1.2669 + slowdebug )
1.2670 + VARIANT="DBG"
1.2671 + FASTDEBUG="false"
1.2672 + DEBUG_CLASSFILES="true"
1.2673 + BUILD_VARIANT_RELEASE="-debug"
1.2674 + HOTSPOT_DEBUG_LEVEL="jvmg"
1.2675 + HOTSPOT_EXPORT="debug"
1.2676 + ;;
1.2677 + esac
1.2678 +
1.2679 + #####
1.2680 + # Generate the legacy makefile targets for hotspot.
1.2681 + # The hotspot api for selecting the build artifacts, really, needs to be improved.
1.2682 + # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
1.2683 + # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
1.2684 + # But until then ...
1.2685 + HOTSPOT_TARGET=""
1.2686 +
1.2687 + if test "x$JVM_VARIANT_SERVER" = xtrue; then
1.2688 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
1.2689 -fi
1.2690 -
1.2691 -if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.2692 + fi
1.2693 +
1.2694 + if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.2695 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
1.2696 -fi
1.2697 -
1.2698 -if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.2699 + fi
1.2700 +
1.2701 + if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.2702 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
1.2703 -fi
1.2704 -
1.2705 -if test "x$JVM_VARIANT_KERNEL" = xtrue; then
1.2706 + fi
1.2707 +
1.2708 + if test "x$JVM_VARIANT_KERNEL" = xtrue; then
1.2709 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
1.2710 -fi
1.2711 -
1.2712 -if test "x$JVM_VARIANT_ZERO" = xtrue; then
1.2713 + fi
1.2714 +
1.2715 + if test "x$JVM_VARIANT_ZERO" = xtrue; then
1.2716 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
1.2717 -fi
1.2718 -
1.2719 -if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
1.2720 + fi
1.2721 +
1.2722 + if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
1.2723 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
1.2724 -fi
1.2725 -
1.2726 -HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
1.2727 -
1.2728 -# On Macosx universal binaries are produced, but they only contain
1.2729 -# 64 bit intel. This invalidates control of which jvms are built
1.2730 -# from configure, but only server is valid anyway. Fix this
1.2731 -# when hotspot makefiles are rewritten.
1.2732 -if test "x$MACOSX_UNIVERSAL" = xtrue; then
1.2733 + fi
1.2734 +
1.2735 + HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
1.2736 +
1.2737 + # On Macosx universal binaries are produced, but they only contain
1.2738 + # 64 bit intel. This invalidates control of which jvms are built
1.2739 + # from configure, but only server is valid anyway. Fix this
1.2740 + # when hotspot makefiles are rewritten.
1.2741 + if test "x$MACOSX_UNIVERSAL" = xtrue; then
1.2742 HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
1.2743 -fi
1.2744 -
1.2745 -#####
1.2746 + fi
1.2747 +
1.2748 + #####
1.2749
1.2750
1.2751
1.2752 @@ -7987,27 +7985,27 @@
1.2753 fi
1.2754
1.2755
1.2756 -# Test from where we are running configure, in or outside of src root.
1.2757 -if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
1.2758 - || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
1.2759 - || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.2760 + # Test from where we are running configure, in or outside of src root.
1.2761 + if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
1.2762 + || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
1.2763 + || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.2764 # We are running configure from the src root.
1.2765 # Create a default ./build/target-variant-debuglevel output root.
1.2766 if test "x${CONF_NAME}" = x; then
1.2767 - CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
1.2768 + CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
1.2769 fi
1.2770 OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
1.2771 $MKDIR -p "$OUTPUT_ROOT"
1.2772 if test ! -d "$OUTPUT_ROOT"; then
1.2773 - as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
1.2774 - fi
1.2775 -else
1.2776 + as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
1.2777 + fi
1.2778 + else
1.2779 # We are running configure from outside of the src dir.
1.2780 # Then use the current directory as output dir!
1.2781 # If configuration is situated in normal build directory, just use the build
1.2782 # directory name as configuration name, otherwise use the complete path.
1.2783 if test "x${CONF_NAME}" = x; then
1.2784 - CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
1.2785 + CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
1.2786 fi
1.2787 OUTPUT_ROOT="$CURDIR"
1.2788
1.2789 @@ -8021,7 +8019,7 @@
1.2790 # Configure has already touched config.log and confdefs.h in the current dir when this check
1.2791 # is performed.
1.2792 filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \
1.2793 - | $TR -d '\n'`
1.2794 + | $TR -d '\n'`
1.2795 if test "x$filtered_files" != x; then
1.2796 { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5
1.2797 $as_echo "$as_me: Current directory is $CURDIR." >&6;}
1.2798 @@ -8040,10 +8038,10 @@
1.2799 as_fn_error $? "Will not continue creating configuration in $CURDIR" "$LINENO" 5
1.2800 fi
1.2801 fi
1.2802 -fi
1.2803 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
1.2804 + fi
1.2805 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
1.2806 $as_echo_n "checking what configuration name to use... " >&6; }
1.2807 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5
1.2808 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5
1.2809 $as_echo "$CONF_NAME" >&6; }
1.2810
1.2811
1.2812 @@ -8169,44 +8167,44 @@
1.2813 fi
1.2814
1.2815
1.2816 -SPEC=$OUTPUT_ROOT/spec.gmk
1.2817 -
1.2818 -CONF_NAME=$CONF_NAME
1.2819 -
1.2820 -OUTPUT_ROOT=$OUTPUT_ROOT
1.2821 -
1.2822 -
1.2823 -# Most of the probed defines are put into config.h
1.2824 -ac_config_headers="$ac_config_headers $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in"
1.2825 -
1.2826 -# The spec.gmk file contains all variables for the make system.
1.2827 -ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
1.2828 -
1.2829 -# The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
1.2830 -ac_config_files="$ac_config_files $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in"
1.2831 -
1.2832 -# The bootcycle-spec.gmk file contains support for boot cycle builds.
1.2833 -ac_config_files="$ac_config_files $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in"
1.2834 -
1.2835 -# The compare.sh is used to compare the build output to other builds.
1.2836 -ac_config_files="$ac_config_files $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in"
1.2837 -
1.2838 -# Spec.sh is currently used by compare-objects.sh
1.2839 -ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in"
1.2840 -
1.2841 -# The generated Makefile knows where the spec.gmk is and where the source is.
1.2842 -# You can run make from the OUTPUT_ROOT, or from the top-level Makefile
1.2843 -# which will look for generated configurations
1.2844 -ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in"
1.2845 -
1.2846 -
1.2847 -# Save the arguments given to us
1.2848 -echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
1.2849 + SPEC=$OUTPUT_ROOT/spec.gmk
1.2850 +
1.2851 + CONF_NAME=$CONF_NAME
1.2852 +
1.2853 + OUTPUT_ROOT=$OUTPUT_ROOT
1.2854 +
1.2855 +
1.2856 + # Most of the probed defines are put into config.h
1.2857 + ac_config_headers="$ac_config_headers $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in"
1.2858 +
1.2859 + # The spec.gmk file contains all variables for the make system.
1.2860 + ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
1.2861 +
1.2862 + # The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
1.2863 + ac_config_files="$ac_config_files $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in"
1.2864 +
1.2865 + # The bootcycle-spec.gmk file contains support for boot cycle builds.
1.2866 + ac_config_files="$ac_config_files $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in"
1.2867 +
1.2868 + # The compare.sh is used to compare the build output to other builds.
1.2869 + ac_config_files="$ac_config_files $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in"
1.2870 +
1.2871 + # Spec.sh is currently used by compare-objects.sh
1.2872 + ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in"
1.2873 +
1.2874 + # The generated Makefile knows where the spec.gmk is and where the source is.
1.2875 + # You can run make from the OUTPUT_ROOT, or from the top-level Makefile
1.2876 + # which will look for generated configurations
1.2877 + ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in"
1.2878 +
1.2879 +
1.2880 + # Save the arguments given to us
1.2881 + echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
1.2882
1.2883
1.2884 # Must be done before we can call HELP_MSG_MISSING_DEPENDENCY.
1.2885
1.2886 - for ac_prog in apt-get yum port pkgutil pkgadd
1.2887 + for ac_prog in apt-get yum port pkgutil pkgadd
1.2888 do
1.2889 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.2890 set dummy $ac_prog; ac_word=$2
1.2891 @@ -8314,8 +8312,8 @@
1.2892 # bat and cmd files are not always considered executable in cygwin causing which
1.2893 # to not find them
1.2894 if test "x$new_path" = x \
1.2895 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2896 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2897 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2898 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2899 new_path=`$CYGPATH -u "$path"`
1.2900 fi
1.2901 if test "x$new_path" = x; then
1.2902 @@ -8330,8 +8328,8 @@
1.2903 # bat and cmd files are not always considered executable in cygwin causing which
1.2904 # to not find them
1.2905 if test "x$new_path" = x \
1.2906 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2907 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2908 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2909 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2910 new_path=`$CYGPATH -u "$path"`
1.2911 fi
1.2912 if test "x$new_path" = x; then
1.2913 @@ -8359,9 +8357,9 @@
1.2914 # Short path failed, file does not exist as specified.
1.2915 # Try adding .exe or .cmd
1.2916 if test -f "${new_path}.exe"; then
1.2917 - input_to_shortpath="${new_path}.exe"
1.2918 + input_to_shortpath="${new_path}.exe"
1.2919 elif test -f "${new_path}.cmd"; then
1.2920 - input_to_shortpath="${new_path}.cmd"
1.2921 + input_to_shortpath="${new_path}.cmd"
1.2922 else
1.2923 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
1.2924 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
1.2925 @@ -8537,29 +8535,29 @@
1.2926 fi
1.2927
1.2928 if test "x$new_path" = x; then
1.2929 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.2930 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.2931 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.2932 - has_space=`$ECHO "$complete" | $GREP " "`
1.2933 - if test "x$has_space" != x; then
1.2934 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.2935 + has_space=`$ECHO "$complete" | $GREP " "`
1.2936 + if test "x$has_space" != x; then
1.2937 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.2938 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.2939 - fi
1.2940 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.2941 - fi
1.2942 - fi
1.2943 -
1.2944 - # Now join together the path and the arguments once again
1.2945 - if test "x$arguments" != xEOL; then
1.2946 - new_complete="$new_path ${arguments% *}"
1.2947 - else
1.2948 - new_complete="$new_path"
1.2949 - fi
1.2950 + fi
1.2951 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.2952 + fi
1.2953 + fi
1.2954 +
1.2955 + # Now join together the path and the arguments once again
1.2956 + if test "x$arguments" != xEOL; then
1.2957 + new_complete="$new_path ${arguments% *}"
1.2958 + else
1.2959 + new_complete="$new_path"
1.2960 + fi
1.2961
1.2962 if test "x$complete" != "x$new_complete"; then
1.2963 - FOUND_MAKE="$new_complete"
1.2964 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.2965 + FOUND_MAKE="$new_complete"
1.2966 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.2967 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.2968 - fi
1.2969 + fi
1.2970
1.2971 fi
1.2972 fi
1.2973 @@ -8671,8 +8669,8 @@
1.2974 # bat and cmd files are not always considered executable in cygwin causing which
1.2975 # to not find them
1.2976 if test "x$new_path" = x \
1.2977 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2978 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2979 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2980 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2981 new_path=`$CYGPATH -u "$path"`
1.2982 fi
1.2983 if test "x$new_path" = x; then
1.2984 @@ -8687,8 +8685,8 @@
1.2985 # bat and cmd files are not always considered executable in cygwin causing which
1.2986 # to not find them
1.2987 if test "x$new_path" = x \
1.2988 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2989 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2990 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2991 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2992 new_path=`$CYGPATH -u "$path"`
1.2993 fi
1.2994 if test "x$new_path" = x; then
1.2995 @@ -8716,9 +8714,9 @@
1.2996 # Short path failed, file does not exist as specified.
1.2997 # Try adding .exe or .cmd
1.2998 if test -f "${new_path}.exe"; then
1.2999 - input_to_shortpath="${new_path}.exe"
1.3000 + input_to_shortpath="${new_path}.exe"
1.3001 elif test -f "${new_path}.cmd"; then
1.3002 - input_to_shortpath="${new_path}.cmd"
1.3003 + input_to_shortpath="${new_path}.cmd"
1.3004 else
1.3005 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
1.3006 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
1.3007 @@ -8894,29 +8892,29 @@
1.3008 fi
1.3009
1.3010 if test "x$new_path" = x; then
1.3011 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.3012 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.3013 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.3014 - has_space=`$ECHO "$complete" | $GREP " "`
1.3015 - if test "x$has_space" != x; then
1.3016 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.3017 + has_space=`$ECHO "$complete" | $GREP " "`
1.3018 + if test "x$has_space" != x; then
1.3019 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.3020 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.3021 - fi
1.3022 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.3023 - fi
1.3024 - fi
1.3025 -
1.3026 - # Now join together the path and the arguments once again
1.3027 - if test "x$arguments" != xEOL; then
1.3028 - new_complete="$new_path ${arguments% *}"
1.3029 - else
1.3030 - new_complete="$new_path"
1.3031 - fi
1.3032 + fi
1.3033 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.3034 + fi
1.3035 + fi
1.3036 +
1.3037 + # Now join together the path and the arguments once again
1.3038 + if test "x$arguments" != xEOL; then
1.3039 + new_complete="$new_path ${arguments% *}"
1.3040 + else
1.3041 + new_complete="$new_path"
1.3042 + fi
1.3043
1.3044 if test "x$complete" != "x$new_complete"; then
1.3045 - FOUND_MAKE="$new_complete"
1.3046 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.3047 + FOUND_MAKE="$new_complete"
1.3048 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.3049 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.3050 - fi
1.3051 + fi
1.3052
1.3053 fi
1.3054 fi
1.3055 @@ -9025,8 +9023,8 @@
1.3056 # bat and cmd files are not always considered executable in cygwin causing which
1.3057 # to not find them
1.3058 if test "x$new_path" = x \
1.3059 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3060 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3061 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3062 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3063 new_path=`$CYGPATH -u "$path"`
1.3064 fi
1.3065 if test "x$new_path" = x; then
1.3066 @@ -9041,8 +9039,8 @@
1.3067 # bat and cmd files are not always considered executable in cygwin causing which
1.3068 # to not find them
1.3069 if test "x$new_path" = x \
1.3070 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3071 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3072 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3073 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3074 new_path=`$CYGPATH -u "$path"`
1.3075 fi
1.3076 if test "x$new_path" = x; then
1.3077 @@ -9070,9 +9068,9 @@
1.3078 # Short path failed, file does not exist as specified.
1.3079 # Try adding .exe or .cmd
1.3080 if test -f "${new_path}.exe"; then
1.3081 - input_to_shortpath="${new_path}.exe"
1.3082 + input_to_shortpath="${new_path}.exe"
1.3083 elif test -f "${new_path}.cmd"; then
1.3084 - input_to_shortpath="${new_path}.cmd"
1.3085 + input_to_shortpath="${new_path}.cmd"
1.3086 else
1.3087 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
1.3088 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
1.3089 @@ -9248,29 +9246,29 @@
1.3090 fi
1.3091
1.3092 if test "x$new_path" = x; then
1.3093 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.3094 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.3095 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.3096 - has_space=`$ECHO "$complete" | $GREP " "`
1.3097 - if test "x$has_space" != x; then
1.3098 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.3099 + has_space=`$ECHO "$complete" | $GREP " "`
1.3100 + if test "x$has_space" != x; then
1.3101 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.3102 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.3103 - fi
1.3104 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.3105 - fi
1.3106 - fi
1.3107 -
1.3108 - # Now join together the path and the arguments once again
1.3109 - if test "x$arguments" != xEOL; then
1.3110 - new_complete="$new_path ${arguments% *}"
1.3111 - else
1.3112 - new_complete="$new_path"
1.3113 - fi
1.3114 + fi
1.3115 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.3116 + fi
1.3117 + fi
1.3118 +
1.3119 + # Now join together the path and the arguments once again
1.3120 + if test "x$arguments" != xEOL; then
1.3121 + new_complete="$new_path ${arguments% *}"
1.3122 + else
1.3123 + new_complete="$new_path"
1.3124 + fi
1.3125
1.3126 if test "x$complete" != "x$new_complete"; then
1.3127 - FOUND_MAKE="$new_complete"
1.3128 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.3129 + FOUND_MAKE="$new_complete"
1.3130 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.3131 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.3132 - fi
1.3133 + fi
1.3134
1.3135 fi
1.3136 fi
1.3137 @@ -9384,8 +9382,8 @@
1.3138 # bat and cmd files are not always considered executable in cygwin causing which
1.3139 # to not find them
1.3140 if test "x$new_path" = x \
1.3141 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3142 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3143 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3144 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3145 new_path=`$CYGPATH -u "$path"`
1.3146 fi
1.3147 if test "x$new_path" = x; then
1.3148 @@ -9400,8 +9398,8 @@
1.3149 # bat and cmd files are not always considered executable in cygwin causing which
1.3150 # to not find them
1.3151 if test "x$new_path" = x \
1.3152 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3153 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3154 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3155 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3156 new_path=`$CYGPATH -u "$path"`
1.3157 fi
1.3158 if test "x$new_path" = x; then
1.3159 @@ -9429,9 +9427,9 @@
1.3160 # Short path failed, file does not exist as specified.
1.3161 # Try adding .exe or .cmd
1.3162 if test -f "${new_path}.exe"; then
1.3163 - input_to_shortpath="${new_path}.exe"
1.3164 + input_to_shortpath="${new_path}.exe"
1.3165 elif test -f "${new_path}.cmd"; then
1.3166 - input_to_shortpath="${new_path}.cmd"
1.3167 + input_to_shortpath="${new_path}.cmd"
1.3168 else
1.3169 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
1.3170 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
1.3171 @@ -9607,29 +9605,29 @@
1.3172 fi
1.3173
1.3174 if test "x$new_path" = x; then
1.3175 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.3176 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.3177 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.3178 - has_space=`$ECHO "$complete" | $GREP " "`
1.3179 - if test "x$has_space" != x; then
1.3180 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.3181 + has_space=`$ECHO "$complete" | $GREP " "`
1.3182 + if test "x$has_space" != x; then
1.3183 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.3184 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.3185 - fi
1.3186 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.3187 - fi
1.3188 - fi
1.3189 -
1.3190 - # Now join together the path and the arguments once again
1.3191 - if test "x$arguments" != xEOL; then
1.3192 - new_complete="$new_path ${arguments% *}"
1.3193 - else
1.3194 - new_complete="$new_path"
1.3195 - fi
1.3196 + fi
1.3197 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.3198 + fi
1.3199 + fi
1.3200 +
1.3201 + # Now join together the path and the arguments once again
1.3202 + if test "x$arguments" != xEOL; then
1.3203 + new_complete="$new_path ${arguments% *}"
1.3204 + else
1.3205 + new_complete="$new_path"
1.3206 + fi
1.3207
1.3208 if test "x$complete" != "x$new_complete"; then
1.3209 - FOUND_MAKE="$new_complete"
1.3210 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.3211 + FOUND_MAKE="$new_complete"
1.3212 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.3213 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.3214 - fi
1.3215 + fi
1.3216
1.3217 fi
1.3218 fi
1.3219 @@ -9737,8 +9735,8 @@
1.3220 # bat and cmd files are not always considered executable in cygwin causing which
1.3221 # to not find them
1.3222 if test "x$new_path" = x \
1.3223 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3224 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3225 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3226 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3227 new_path=`$CYGPATH -u "$path"`
1.3228 fi
1.3229 if test "x$new_path" = x; then
1.3230 @@ -9753,8 +9751,8 @@
1.3231 # bat and cmd files are not always considered executable in cygwin causing which
1.3232 # to not find them
1.3233 if test "x$new_path" = x \
1.3234 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3235 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3236 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3237 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3238 new_path=`$CYGPATH -u "$path"`
1.3239 fi
1.3240 if test "x$new_path" = x; then
1.3241 @@ -9782,9 +9780,9 @@
1.3242 # Short path failed, file does not exist as specified.
1.3243 # Try adding .exe or .cmd
1.3244 if test -f "${new_path}.exe"; then
1.3245 - input_to_shortpath="${new_path}.exe"
1.3246 + input_to_shortpath="${new_path}.exe"
1.3247 elif test -f "${new_path}.cmd"; then
1.3248 - input_to_shortpath="${new_path}.cmd"
1.3249 + input_to_shortpath="${new_path}.cmd"
1.3250 else
1.3251 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
1.3252 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
1.3253 @@ -9960,29 +9958,29 @@
1.3254 fi
1.3255
1.3256 if test "x$new_path" = x; then
1.3257 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.3258 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.3259 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.3260 - has_space=`$ECHO "$complete" | $GREP " "`
1.3261 - if test "x$has_space" != x; then
1.3262 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.3263 + has_space=`$ECHO "$complete" | $GREP " "`
1.3264 + if test "x$has_space" != x; then
1.3265 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.3266 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.3267 - fi
1.3268 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.3269 - fi
1.3270 - fi
1.3271 -
1.3272 - # Now join together the path and the arguments once again
1.3273 - if test "x$arguments" != xEOL; then
1.3274 - new_complete="$new_path ${arguments% *}"
1.3275 - else
1.3276 - new_complete="$new_path"
1.3277 - fi
1.3278 + fi
1.3279 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.3280 + fi
1.3281 + fi
1.3282 +
1.3283 + # Now join together the path and the arguments once again
1.3284 + if test "x$arguments" != xEOL; then
1.3285 + new_complete="$new_path ${arguments% *}"
1.3286 + else
1.3287 + new_complete="$new_path"
1.3288 + fi
1.3289
1.3290 if test "x$complete" != "x$new_complete"; then
1.3291 - FOUND_MAKE="$new_complete"
1.3292 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.3293 + FOUND_MAKE="$new_complete"
1.3294 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.3295 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.3296 - fi
1.3297 + fi
1.3298
1.3299 fi
1.3300 fi
1.3301 @@ -10006,34 +10004,34 @@
1.3302
1.3303
1.3304
1.3305 - # Test if find supports -delete
1.3306 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
1.3307 + # Test if find supports -delete
1.3308 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
1.3309 $as_echo_n "checking if find supports -delete... " >&6; }
1.3310 - FIND_DELETE="-delete"
1.3311 -
1.3312 - DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
1.3313 -
1.3314 - echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
1.3315 -
1.3316 - TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
1.3317 - if test -f $DELETEDIR/TestIfFindSupportsDelete; then
1.3318 - # No, it does not.
1.3319 - rm $DELETEDIR/TestIfFindSupportsDelete
1.3320 - FIND_DELETE="-exec rm \{\} \+"
1.3321 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.3322 -$as_echo "no" >&6; }
1.3323 - else
1.3324 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.3325 + FIND_DELETE="-delete"
1.3326 +
1.3327 + DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
1.3328 +
1.3329 + echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
1.3330 +
1.3331 + TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
1.3332 + if test -f $DELETEDIR/TestIfFindSupportsDelete; then
1.3333 + # No, it does not.
1.3334 + rm $DELETEDIR/TestIfFindSupportsDelete
1.3335 + FIND_DELETE="-exec rm \{\} \+"
1.3336 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.3337 +$as_echo "no" >&6; }
1.3338 + else
1.3339 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.3340 $as_echo "yes" >&6; }
1.3341 - fi
1.3342 - rmdir $DELETEDIR
1.3343 -
1.3344 -
1.3345 -
1.3346 -# These tools might not be installed by default,
1.3347 -# need hint on how to install them.
1.3348 -
1.3349 - for ac_prog in unzip
1.3350 + fi
1.3351 + rmdir $DELETEDIR
1.3352 +
1.3353 +
1.3354 +
1.3355 + # These tools might not be installed by default,
1.3356 + # need hint on how to install them.
1.3357 +
1.3358 + for ac_prog in unzip
1.3359 do
1.3360 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3361 set dummy $ac_prog; ac_word=$2
1.3362 @@ -10079,20 +10077,20 @@
1.3363 done
1.3364
1.3365
1.3366 - if test "x$UNZIP" = x; then
1.3367 - if test "xunzip" = x; then
1.3368 - PROG_NAME=unzip
1.3369 - else
1.3370 - PROG_NAME=unzip
1.3371 - fi
1.3372 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.3373 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.3374 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.3375 - fi
1.3376 -
1.3377 -
1.3378 -
1.3379 - for ac_prog in zip
1.3380 + if test "x$UNZIP" = x; then
1.3381 + if test "xunzip" = x; then
1.3382 + PROG_NAME=unzip
1.3383 + else
1.3384 + PROG_NAME=unzip
1.3385 + fi
1.3386 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.3387 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.3388 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.3389 + fi
1.3390 +
1.3391 +
1.3392 +
1.3393 + for ac_prog in zip
1.3394 do
1.3395 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3396 set dummy $ac_prog; ac_word=$2
1.3397 @@ -10138,22 +10136,22 @@
1.3398 done
1.3399
1.3400
1.3401 - if test "x$ZIP" = x; then
1.3402 - if test "xzip" = x; then
1.3403 - PROG_NAME=zip
1.3404 - else
1.3405 - PROG_NAME=zip
1.3406 - fi
1.3407 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.3408 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.3409 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.3410 - fi
1.3411 -
1.3412 -
1.3413 -
1.3414 -# Non-required basic tools
1.3415 -
1.3416 -# Extract the first word of "ldd", so it can be a program name with args.
1.3417 + if test "x$ZIP" = x; then
1.3418 + if test "xzip" = x; then
1.3419 + PROG_NAME=zip
1.3420 + else
1.3421 + PROG_NAME=zip
1.3422 + fi
1.3423 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.3424 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.3425 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.3426 + fi
1.3427 +
1.3428 +
1.3429 +
1.3430 + # Non-required basic tools
1.3431 +
1.3432 + # Extract the first word of "ldd", so it can be a program name with args.
1.3433 set dummy ldd; ac_word=$2
1.3434 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3435 $as_echo_n "checking for $ac_word... " >&6; }
1.3436 @@ -10193,13 +10191,13 @@
1.3437 fi
1.3438
1.3439
1.3440 -if test "x$LDD" = "x"; then
1.3441 + if test "x$LDD" = "x"; then
1.3442 # List shared lib dependencies is used for
1.3443 # debug output and checking for forbidden dependencies.
1.3444 # We can build without it.
1.3445 LDD="true"
1.3446 -fi
1.3447 -# Extract the first word of "otool", so it can be a program name with args.
1.3448 + fi
1.3449 + # Extract the first word of "otool", so it can be a program name with args.
1.3450 set dummy otool; ac_word=$2
1.3451 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3452 $as_echo_n "checking for $ac_word... " >&6; }
1.3453 @@ -10239,10 +10237,10 @@
1.3454 fi
1.3455
1.3456
1.3457 -if test "x$OTOOL" = "x"; then
1.3458 - OTOOL="true"
1.3459 -fi
1.3460 -for ac_prog in readelf greadelf
1.3461 + if test "x$OTOOL" = "x"; then
1.3462 + OTOOL="true"
1.3463 + fi
1.3464 + for ac_prog in readelf greadelf
1.3465 do
1.3466 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3467 set dummy $ac_prog; ac_word=$2
1.3468 @@ -10287,7 +10285,7 @@
1.3469 test -n "$READELF" && break
1.3470 done
1.3471
1.3472 -# Extract the first word of "hg", so it can be a program name with args.
1.3473 + # Extract the first word of "hg", so it can be a program name with args.
1.3474 set dummy hg; ac_word=$2
1.3475 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3476 $as_echo_n "checking for $ac_word... " >&6; }
1.3477 @@ -10327,7 +10325,7 @@
1.3478 fi
1.3479
1.3480
1.3481 -# Extract the first word of "stat", so it can be a program name with args.
1.3482 + # Extract the first word of "stat", so it can be a program name with args.
1.3483 set dummy stat; ac_word=$2
1.3484 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3485 $as_echo_n "checking for $ac_word... " >&6; }
1.3486 @@ -10367,7 +10365,7 @@
1.3487 fi
1.3488
1.3489
1.3490 -# Extract the first word of "time", so it can be a program name with args.
1.3491 + # Extract the first word of "time", so it can be a program name with args.
1.3492 set dummy time; ac_word=$2
1.3493 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3494 $as_echo_n "checking for $ac_word... " >&6; }
1.3495 @@ -10407,18 +10405,18 @@
1.3496 fi
1.3497
1.3498
1.3499 -# Check if it's GNU time
1.3500 -IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
1.3501 -if test "x$IS_GNU_TIME" != x; then
1.3502 - IS_GNU_TIME=yes
1.3503 -else
1.3504 - IS_GNU_TIME=no
1.3505 -fi
1.3506 -
1.3507 -
1.3508 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.3509 -
1.3510 - for ac_prog in comm
1.3511 + # Check if it's GNU time
1.3512 + IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
1.3513 + if test "x$IS_GNU_TIME" != x; then
1.3514 + IS_GNU_TIME=yes
1.3515 + else
1.3516 + IS_GNU_TIME=no
1.3517 + fi
1.3518 +
1.3519 +
1.3520 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.3521 +
1.3522 + for ac_prog in comm
1.3523 do
1.3524 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3525 set dummy $ac_prog; ac_word=$2
1.3526 @@ -10464,23 +10462,23 @@
1.3527 done
1.3528
1.3529
1.3530 - if test "x$COMM" = x; then
1.3531 - if test "xcomm" = x; then
1.3532 - PROG_NAME=comm
1.3533 - else
1.3534 - PROG_NAME=comm
1.3535 - fi
1.3536 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.3537 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.3538 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.3539 - fi
1.3540 -
1.3541 -
1.3542 -fi
1.3543 -
1.3544 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.3545 -
1.3546 - for ac_prog in xattr
1.3547 + if test "x$COMM" = x; then
1.3548 + if test "xcomm" = x; then
1.3549 + PROG_NAME=comm
1.3550 + else
1.3551 + PROG_NAME=comm
1.3552 + fi
1.3553 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.3554 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.3555 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.3556 + fi
1.3557 +
1.3558 +
1.3559 + fi
1.3560 +
1.3561 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.3562 +
1.3563 + for ac_prog in xattr
1.3564 do
1.3565 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3566 set dummy $ac_prog; ac_word=$2
1.3567 @@ -10526,19 +10524,19 @@
1.3568 done
1.3569
1.3570
1.3571 - if test "x$XATTR" = x; then
1.3572 - if test "xxattr" = x; then
1.3573 - PROG_NAME=xattr
1.3574 - else
1.3575 - PROG_NAME=xattr
1.3576 - fi
1.3577 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.3578 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.3579 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.3580 - fi
1.3581 -
1.3582 -
1.3583 - # Extract the first word of "codesign", so it can be a program name with args.
1.3584 + if test "x$XATTR" = x; then
1.3585 + if test "xxattr" = x; then
1.3586 + PROG_NAME=xattr
1.3587 + else
1.3588 + PROG_NAME=xattr
1.3589 + fi
1.3590 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.3591 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.3592 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.3593 + fi
1.3594 +
1.3595 +
1.3596 + # Extract the first word of "codesign", so it can be a program name with args.
1.3597 set dummy codesign; ac_word=$2
1.3598 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3599 $as_echo_n "checking for $ac_word... " >&6; }
1.3600 @@ -10578,23 +10576,23 @@
1.3601 fi
1.3602
1.3603
1.3604 - if test "x$CODESIGN" != "x"; then
1.3605 - # Verify that the openjdk_codesign certificate is present
1.3606 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
1.3607 + if test "x$CODESIGN" != "x"; then
1.3608 + # Verify that the openjdk_codesign certificate is present
1.3609 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
1.3610 $as_echo_n "checking if openjdk_codesign certificate is present... " >&6; }
1.3611 - rm -f codesign-testfile
1.3612 - touch codesign-testfile
1.3613 - codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN=
1.3614 - rm -f codesign-testfile
1.3615 - if test "x$CODESIGN" = x; then
1.3616 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.3617 -$as_echo "no" >&6; }
1.3618 - else
1.3619 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.3620 + rm -f codesign-testfile
1.3621 + touch codesign-testfile
1.3622 + codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN=
1.3623 + rm -f codesign-testfile
1.3624 + if test "x$CODESIGN" = x; then
1.3625 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.3626 +$as_echo "no" >&6; }
1.3627 + else
1.3628 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.3629 $as_echo "yes" >&6; }
1.3630 - fi
1.3631 - fi
1.3632 -fi
1.3633 + fi
1.3634 + fi
1.3635 + fi
1.3636
1.3637
1.3638 # Check if pkg-config is available.
1.3639 @@ -10717,14 +10715,14 @@
1.3640
1.3641 # After basic tools have been setup, we can check build os specific details.
1.3642
1.3643 -###############################################################################
1.3644 -
1.3645 -# Note that this is the build platform OS version!
1.3646 -
1.3647 -OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
1.3648 -OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
1.3649 -OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
1.3650 -OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
1.3651 + ###############################################################################
1.3652 +
1.3653 + # Note that this is the build platform OS version!
1.3654 +
1.3655 + OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
1.3656 + OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
1.3657 + OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
1.3658 + OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
1.3659
1.3660
1.3661
1.3662 @@ -10766,57 +10764,57 @@
1.3663
1.3664
1.3665
1.3666 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.3667 - if test "x$with_builddeps_conf" != x; then
1.3668 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supplied builddeps configuration file" >&5
1.3669 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.3670 + if test "x$with_builddeps_conf" != x; then
1.3671 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supplied builddeps configuration file" >&5
1.3672 $as_echo_n "checking for supplied builddeps configuration file... " >&6; }
1.3673 - builddepsfile=$with_builddeps_conf
1.3674 - if test -s $builddepsfile; then
1.3675 - . $builddepsfile
1.3676 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: loaded!" >&5
1.3677 + builddepsfile=$with_builddeps_conf
1.3678 + if test -s $builddepsfile; then
1.3679 + . $builddepsfile
1.3680 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loaded!" >&5
1.3681 $as_echo "loaded!" >&6; }
1.3682 - else
1.3683 - as_fn_error $? "The given builddeps conf file $with_builddeps_conf could not be loaded!" "$LINENO" 5
1.3684 - fi
1.3685 - else
1.3686 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builddeps.conf files in sources..." >&5
1.3687 + else
1.3688 + as_fn_error $? "The given builddeps conf file $with_builddeps_conf could not be loaded!" "$LINENO" 5
1.3689 + fi
1.3690 + else
1.3691 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builddeps.conf files in sources..." >&5
1.3692 $as_echo_n "checking for builddeps.conf files in sources...... " >&6; }
1.3693 - builddepsfile=`mktemp`
1.3694 - touch $builddepsfile
1.3695 - # Put all found confs into a single file.
1.3696 - find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
1.3697 - # Source the file to acquire the variables
1.3698 - if test -s $builddepsfile; then
1.3699 - . $builddepsfile
1.3700 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found at least one!" >&5
1.3701 + builddepsfile=`mktemp`
1.3702 + touch $builddepsfile
1.3703 + # Put all found confs into a single file.
1.3704 + find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
1.3705 + # Source the file to acquire the variables
1.3706 + if test -s $builddepsfile; then
1.3707 + . $builddepsfile
1.3708 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found at least one!" >&5
1.3709 $as_echo "found at least one!" >&6; }
1.3710 - else
1.3711 - as_fn_error $? "Could not find any builddeps.conf at all!" "$LINENO" 5
1.3712 - fi
1.3713 - fi
1.3714 - # Create build and target names that use _ instead of "-" and ".".
1.3715 - # This is necessary to use them in variable names.
1.3716 - build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
1.3717 - target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
1.3718 - # Extract rewrite information for build and target
1.3719 - eval rewritten_build=\${REWRITE_${build_var}}
1.3720 - if test "x$rewritten_build" = x; then
1.3721 - rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
1.3722 - echo Build stays the same $rewritten_build
1.3723 - else
1.3724 - echo Rewriting build for builddeps into $rewritten_build
1.3725 - fi
1.3726 - eval rewritten_target=\${REWRITE_${target_var}}
1.3727 - if test "x$rewritten_target" = x; then
1.3728 - rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
1.3729 - echo Target stays the same $rewritten_target
1.3730 - else
1.3731 - echo Rewriting target for builddeps into $rewritten_target
1.3732 - fi
1.3733 - rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
1.3734 - rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
1.3735 - fi
1.3736 - for ac_prog in 7z unzip
1.3737 + else
1.3738 + as_fn_error $? "Could not find any builddeps.conf at all!" "$LINENO" 5
1.3739 + fi
1.3740 + fi
1.3741 + # Create build and target names that use _ instead of "-" and ".".
1.3742 + # This is necessary to use them in variable names.
1.3743 + build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
1.3744 + target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
1.3745 + # Extract rewrite information for build and target
1.3746 + eval rewritten_build=\${REWRITE_${build_var}}
1.3747 + if test "x$rewritten_build" = x; then
1.3748 + rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
1.3749 + echo Build stays the same $rewritten_build
1.3750 + else
1.3751 + echo Rewriting build for builddeps into $rewritten_build
1.3752 + fi
1.3753 + eval rewritten_target=\${REWRITE_${target_var}}
1.3754 + if test "x$rewritten_target" = x; then
1.3755 + rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
1.3756 + echo Target stays the same $rewritten_target
1.3757 + else
1.3758 + echo Rewriting target for builddeps into $rewritten_target
1.3759 + fi
1.3760 + rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
1.3761 + rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
1.3762 + fi
1.3763 + for ac_prog in 7z unzip
1.3764 do
1.3765 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3766 set dummy $ac_prog; ac_word=$2
1.3767 @@ -10858,11 +10856,11 @@
1.3768 test -n "$BDEPS_UNZIP" && break
1.3769 done
1.3770
1.3771 - if test "x$BDEPS_UNZIP" = x7z; then
1.3772 - BDEPS_UNZIP="7z x"
1.3773 - fi
1.3774 -
1.3775 - for ac_prog in wget lftp ftp
1.3776 + if test "x$BDEPS_UNZIP" = x7z; then
1.3777 + BDEPS_UNZIP="7z x"
1.3778 + fi
1.3779 +
1.3780 + for ac_prog in wget lftp ftp
1.3781 do
1.3782 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3783 set dummy $ac_prog; ac_word=$2
1.3784 @@ -10915,14 +10913,14 @@
1.3785 # We need build & target for this.
1.3786
1.3787
1.3788 -###############################################################################
1.3789 -#
1.3790 -# Should we build a JDK/JVM with headful support (ie a graphical ui)?
1.3791 -# We always build headless support.
1.3792 -#
1.3793 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking headful support" >&5
1.3794 + ###############################################################################
1.3795 + #
1.3796 + # Should we build a JDK/JVM with headful support (ie a graphical ui)?
1.3797 + # We always build headless support.
1.3798 + #
1.3799 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking headful support" >&5
1.3800 $as_echo_n "checking headful support... " >&6; }
1.3801 -# Check whether --enable-headful was given.
1.3802 + # Check whether --enable-headful was given.
1.3803 if test "${enable_headful+set}" = set; then :
1.3804 enableval=$enable_headful; SUPPORT_HEADFUL=${enable_headful}
1.3805 else
1.3806 @@ -10930,110 +10928,110 @@
1.3807 fi
1.3808
1.3809
1.3810 -SUPPORT_HEADLESS=yes
1.3811 -BUILD_HEADLESS="BUILD_HEADLESS:=true"
1.3812 -
1.3813 -if test "x$SUPPORT_HEADFUL" = xyes; then
1.3814 + SUPPORT_HEADLESS=yes
1.3815 + BUILD_HEADLESS="BUILD_HEADLESS:=true"
1.3816 +
1.3817 + if test "x$SUPPORT_HEADFUL" = xyes; then
1.3818 # We are building both headful and headless.
1.3819 headful_msg="include support for both headful and headless"
1.3820 -fi
1.3821 -
1.3822 -if test "x$SUPPORT_HEADFUL" = xno; then
1.3823 + fi
1.3824 +
1.3825 + if test "x$SUPPORT_HEADFUL" = xno; then
1.3826 # Thus we are building headless only.
1.3827 BUILD_HEADLESS="BUILD_HEADLESS:=true"
1.3828 headful_msg="headless only"
1.3829 -fi
1.3830 -
1.3831 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $headful_msg" >&5
1.3832 + fi
1.3833 +
1.3834 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $headful_msg" >&5
1.3835 $as_echo "$headful_msg" >&6; }
1.3836
1.3837
1.3838
1.3839
1.3840
1.3841 -# Control wether Hotspot runs Queens test after build.
1.3842 -# Check whether --enable-hotspot-test-in-build was given.
1.3843 + # Control wether Hotspot runs Queens test after build.
1.3844 + # Check whether --enable-hotspot-test-in-build was given.
1.3845 if test "${enable_hotspot_test_in_build+set}" = set; then :
1.3846 enableval=$enable_hotspot_test_in_build;
1.3847 else
1.3848 enable_hotspot_test_in_build=no
1.3849 fi
1.3850
1.3851 -if test "x$enable_hotspot_test_in_build" = "xyes"; then
1.3852 + if test "x$enable_hotspot_test_in_build" = "xyes"; then
1.3853 TEST_IN_BUILD=true
1.3854 -else
1.3855 + else
1.3856 TEST_IN_BUILD=false
1.3857 -fi
1.3858 -
1.3859 -
1.3860 -###############################################################################
1.3861 -#
1.3862 -# Choose cacerts source file
1.3863 -#
1.3864 + fi
1.3865 +
1.3866 +
1.3867 + ###############################################################################
1.3868 + #
1.3869 + # Choose cacerts source file
1.3870 + #
1.3871
1.3872 # Check whether --with-cacerts-file was given.
1.3873 if test "${with_cacerts_file+set}" = set; then :
1.3874 withval=$with_cacerts_file;
1.3875 fi
1.3876
1.3877 -if test "x$with_cacerts_file" != x; then
1.3878 + if test "x$with_cacerts_file" != x; then
1.3879 CACERTS_FILE=$with_cacerts_file
1.3880 -else
1.3881 + else
1.3882 CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
1.3883 -fi
1.3884 -
1.3885 -
1.3886 -###############################################################################
1.3887 -#
1.3888 -# Enable or disable unlimited crypto
1.3889 -#
1.3890 -# Check whether --enable-unlimited-crypto was given.
1.3891 + fi
1.3892 +
1.3893 +
1.3894 + ###############################################################################
1.3895 + #
1.3896 + # Enable or disable unlimited crypto
1.3897 + #
1.3898 + # Check whether --enable-unlimited-crypto was given.
1.3899 if test "${enable_unlimited_crypto+set}" = set; then :
1.3900 enableval=$enable_unlimited_crypto;
1.3901 else
1.3902 enable_unlimited_crypto=no
1.3903 fi
1.3904
1.3905 -if test "x$enable_unlimited_crypto" = "xyes"; then
1.3906 + if test "x$enable_unlimited_crypto" = "xyes"; then
1.3907 UNLIMITED_CRYPTO=true
1.3908 -else
1.3909 + else
1.3910 UNLIMITED_CRYPTO=false
1.3911 -fi
1.3912 -
1.3913 -
1.3914 -###############################################################################
1.3915 -#
1.3916 -# Enable or disable the elliptic curve crypto implementation
1.3917 -#
1.3918 -
1.3919 -
1.3920 -###############################################################################
1.3921 -#
1.3922 -# Compress jars
1.3923 -#
1.3924 -COMPRESS_JARS=false
1.3925 -
1.3926 -
1.3927 -
1.3928 -
1.3929 -# Source the version numbers
1.3930 -. $AUTOCONF_DIR/version-numbers
1.3931 -
1.3932 -# Get the settings from parameters
1.3933 + fi
1.3934 +
1.3935 +
1.3936 + ###############################################################################
1.3937 + #
1.3938 + # Enable or disable the elliptic curve crypto implementation
1.3939 + #
1.3940 +
1.3941 +
1.3942 + ###############################################################################
1.3943 + #
1.3944 + # Compress jars
1.3945 + #
1.3946 + COMPRESS_JARS=false
1.3947 +
1.3948 +
1.3949 +
1.3950 +
1.3951 + # Source the version numbers
1.3952 + . $AUTOCONF_DIR/version-numbers
1.3953 +
1.3954 + # Get the settings from parameters
1.3955
1.3956 # Check whether --with-milestone was given.
1.3957 if test "${with_milestone+set}" = set; then :
1.3958 withval=$with_milestone;
1.3959 fi
1.3960
1.3961 -if test "x$with_milestone" = xyes; then
1.3962 - as_fn_error $? "Milestone must have a value" "$LINENO" 5
1.3963 -elif test "x$with_milestone" != x; then
1.3964 + if test "x$with_milestone" = xyes; then
1.3965 + as_fn_error $? "Milestone must have a value" "$LINENO" 5
1.3966 + elif test "x$with_milestone" != x; then
1.3967 MILESTONE="$with_milestone"
1.3968 -fi
1.3969 -if test "x$MILESTONE" = x; then
1.3970 - MILESTONE=internal
1.3971 -fi
1.3972 + fi
1.3973 + if test "x$MILESTONE" = x; then
1.3974 + MILESTONE=internal
1.3975 + fi
1.3976
1.3977
1.3978 # Check whether --with-update-version was given.
1.3979 @@ -11041,11 +11039,11 @@
1.3980 withval=$with_update_version;
1.3981 fi
1.3982
1.3983 -if test "x$with_update_version" = xyes; then
1.3984 - as_fn_error $? "Update version must have a value" "$LINENO" 5
1.3985 -elif test "x$with_update_version" != x; then
1.3986 - JDK_UPDATE_VERSION="$with_update_version"
1.3987 -fi
1.3988 + if test "x$with_update_version" = xyes; then
1.3989 + as_fn_error $? "Update version must have a value" "$LINENO" 5
1.3990 + elif test "x$with_update_version" != x; then
1.3991 + JDK_UPDATE_VERSION="$with_update_version"
1.3992 + fi
1.3993
1.3994
1.3995 # Check whether --with-user-release-suffix was given.
1.3996 @@ -11053,11 +11051,11 @@
1.3997 withval=$with_user_release_suffix;
1.3998 fi
1.3999
1.4000 -if test "x$with_user_release_suffix" = xyes; then
1.4001 - as_fn_error $? "Release suffix must have a value" "$LINENO" 5
1.4002 -elif test "x$with_user_release_suffix" != x; then
1.4003 - USER_RELEASE_SUFFIX="$with_user_release_suffix"
1.4004 -fi
1.4005 + if test "x$with_user_release_suffix" = xyes; then
1.4006 + as_fn_error $? "Release suffix must have a value" "$LINENO" 5
1.4007 + elif test "x$with_user_release_suffix" != x; then
1.4008 + USER_RELEASE_SUFFIX="$with_user_release_suffix"
1.4009 + fi
1.4010
1.4011
1.4012 # Check whether --with-build-number was given.
1.4013 @@ -11065,49 +11063,49 @@
1.4014 withval=$with_build_number;
1.4015 fi
1.4016
1.4017 -if test "x$with_build_number" = xyes; then
1.4018 - as_fn_error $? "Build number must have a value" "$LINENO" 5
1.4019 -elif test "x$with_build_number" != x; then
1.4020 - JDK_BUILD_NUMBER="$with_build_number"
1.4021 -fi
1.4022 -# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
1.4023 -if test "x$JDK_BUILD_NUMBER" = x; then
1.4024 - JDK_BUILD_NUMBER=b00
1.4025 - if test "x$USER_RELEASE_SUFFIX" = x; then
1.4026 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.4027 - # Avoid [:alnum:] since it depends on the locale.
1.4028 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
1.4029 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.4030 - fi
1.4031 -fi
1.4032 -
1.4033 -# Now set the JDK version, milestone, build number etc.
1.4034 -
1.4035 -
1.4036 -
1.4037 -
1.4038 -
1.4039 -
1.4040 -
1.4041 -
1.4042 -
1.4043 -
1.4044 -
1.4045 -
1.4046 -
1.4047 -
1.4048 -
1.4049 -COPYRIGHT_YEAR=`date +'%Y'`
1.4050 -
1.4051 -
1.4052 -if test "x$JDK_UPDATE_VERSION" != x; then
1.4053 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.4054 -else
1.4055 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.4056 -fi
1.4057 -
1.4058 -
1.4059 -COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
1.4060 + if test "x$with_build_number" = xyes; then
1.4061 + as_fn_error $? "Build number must have a value" "$LINENO" 5
1.4062 + elif test "x$with_build_number" != x; then
1.4063 + JDK_BUILD_NUMBER="$with_build_number"
1.4064 + fi
1.4065 + # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
1.4066 + if test "x$JDK_BUILD_NUMBER" = x; then
1.4067 + JDK_BUILD_NUMBER=b00
1.4068 + if test "x$USER_RELEASE_SUFFIX" = x; then
1.4069 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.4070 + # Avoid [:alnum:] since it depends on the locale.
1.4071 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
1.4072 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.4073 + fi
1.4074 + fi
1.4075 +
1.4076 + # Now set the JDK version, milestone, build number etc.
1.4077 +
1.4078 +
1.4079 +
1.4080 +
1.4081 +
1.4082 +
1.4083 +
1.4084 +
1.4085 +
1.4086 +
1.4087 +
1.4088 +
1.4089 +
1.4090 +
1.4091 +
1.4092 + COPYRIGHT_YEAR=`date +'%Y'`
1.4093 +
1.4094 +
1.4095 + if test "x$JDK_UPDATE_VERSION" != x; then
1.4096 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.4097 + else
1.4098 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.4099 + fi
1.4100 +
1.4101 +
1.4102 + COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
1.4103
1.4104
1.4105
1.4106 @@ -11118,7 +11116,7 @@
1.4107 ###############################################################################
1.4108
1.4109
1.4110 -BOOT_JDK_FOUND=no
1.4111 + BOOT_JDK_FOUND=no
1.4112
1.4113 # Check whether --with-boot-jdk was given.
1.4114 if test "${with_boot_jdk+set}" = set; then :
1.4115 @@ -11126,22 +11124,22 @@
1.4116 fi
1.4117
1.4118
1.4119 -# We look for the Boot JDK through various means, going from more certain to
1.4120 -# more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if
1.4121 -# we detected something (if so, the path to the jdk is in BOOT_JDK). But we
1.4122 -# must check if this is indeed valid; otherwise we'll continue looking.
1.4123 -
1.4124 -# Test: Is bootjdk explicitely set by command line arguments?
1.4125 + # We look for the Boot JDK through various means, going from more certain to
1.4126 + # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if
1.4127 + # we detected something (if so, the path to the jdk is in BOOT_JDK). But we
1.4128 + # must check if this is indeed valid; otherwise we'll continue looking.
1.4129 +
1.4130 + # Test: Is bootjdk explicitely set by command line arguments?
1.4131
1.4132 if test "x$BOOT_JDK_FOUND" = xno; then
1.4133 # Now execute the test
1.4134
1.4135 -if test "x$with_boot_jdk" != x; then
1.4136 + if test "x$with_boot_jdk" != x; then
1.4137 BOOT_JDK=$with_boot_jdk
1.4138 BOOT_JDK_FOUND=maybe
1.4139 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using configure arguments" >&5
1.4140 $as_echo "$as_me: Found potential Boot JDK using configure arguments" >&6;}
1.4141 -fi
1.4142 + fi
1.4143
1.4144
1.4145 # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
1.4146 @@ -11318,161 +11316,161 @@
1.4147 fi # end check boot jdk found
1.4148 fi
1.4149
1.4150 -if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then
1.4151 - # Having specified an argument which is incorrect will produce an instant failure;
1.4152 - # we should not go on looking
1.4153 - as_fn_error $? "The path given by --with-boot-jdk does not contain a valid Boot JDK" "$LINENO" 5
1.4154 -fi
1.4155 -
1.4156 -# Test: Is bootjdk available from builddeps?
1.4157 + if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then
1.4158 + # Having specified an argument which is incorrect will produce an instant failure;
1.4159 + # we should not go on looking
1.4160 + as_fn_error $? "The path given by --with-boot-jdk does not contain a valid Boot JDK" "$LINENO" 5
1.4161 + fi
1.4162 +
1.4163 + # Test: Is bootjdk available from builddeps?
1.4164
1.4165 if test "x$BOOT_JDK_FOUND" = xno; then
1.4166 # Now execute the test
1.4167
1.4168
1.4169
1.4170 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.4171 - # Source the builddeps file again, to make sure it uses the latest variables!
1.4172 - . $builddepsfile
1.4173 - # Look for a target and build machine specific resource!
1.4174 - eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.4175 - if test "x$resource" = x; then
1.4176 - # Ok, lets instead look for a target specific resource
1.4177 - eval resource=\${builddep_bootjdk_TARGET_${rewritten_target_var}}
1.4178 - fi
1.4179 - if test "x$resource" = x; then
1.4180 - # Ok, lets instead look for a build specific resource
1.4181 - eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}}
1.4182 - fi
1.4183 - if test "x$resource" = x; then
1.4184 - # Ok, lets instead look for a generic resource
1.4185 - # (The bootjdk comes from M4 and not the shell, thus no need for eval here.)
1.4186 - resource=${builddep_bootjdk}
1.4187 - fi
1.4188 - if test "x$resource" != x; then
1.4189 - { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for bootjdk" >&5
1.4190 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.4191 + # Source the builddeps file again, to make sure it uses the latest variables!
1.4192 + . $builddepsfile
1.4193 + # Look for a target and build machine specific resource!
1.4194 + eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.4195 + if test "x$resource" = x; then
1.4196 + # Ok, lets instead look for a target specific resource
1.4197 + eval resource=\${builddep_bootjdk_TARGET_${rewritten_target_var}}
1.4198 + fi
1.4199 + if test "x$resource" = x; then
1.4200 + # Ok, lets instead look for a build specific resource
1.4201 + eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}}
1.4202 + fi
1.4203 + if test "x$resource" = x; then
1.4204 + # Ok, lets instead look for a generic resource
1.4205 + # (The bootjdk comes from M4 and not the shell, thus no need for eval here.)
1.4206 + resource=${builddep_bootjdk}
1.4207 + fi
1.4208 + if test "x$resource" != x; then
1.4209 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for bootjdk" >&5
1.4210 $as_echo "$as_me: Using builddeps $resource for bootjdk" >&6;}
1.4211 - # If the resource in the builddeps.conf file is an existing directory,
1.4212 - # for example /java/linux/cups
1.4213 - if test -d ${resource}; then
1.4214 - depdir=${resource}
1.4215 - else
1.4216 -
1.4217 -# bootjdk is for example mymodule
1.4218 -# $resource is for example libs/general/libmymod_1_2_3.zip
1.4219 -# $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.4220 -# $with_builddeps_dir is for example /localhome/builddeps
1.4221 -# depdir is the name of the variable into which we store the depdir, eg MYMOD
1.4222 -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.4223 -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.4224 - filename=`basename $resource`
1.4225 - filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.4226 - filebase=${filename%%.*}
1.4227 - extension=${filename#*.}
1.4228 - installdir=$with_builddeps_dir/$filebase
1.4229 - if test ! -f $installdir/$filename.unpacked; then
1.4230 - { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&5
1.4231 + # If the resource in the builddeps.conf file is an existing directory,
1.4232 + # for example /java/linux/cups
1.4233 + if test -d ${resource}; then
1.4234 + depdir=${resource}
1.4235 + else
1.4236 +
1.4237 + # bootjdk is for example mymodule
1.4238 + # $resource is for example libs/general/libmymod_1_2_3.zip
1.4239 + # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.4240 + # $with_builddeps_dir is for example /localhome/builddeps
1.4241 + # depdir is the name of the variable into which we store the depdir, eg MYMOD
1.4242 + # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.4243 + # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.4244 + filename=`basename $resource`
1.4245 + filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.4246 + filebase=${filename%%.*}
1.4247 + extension=${filename#*.}
1.4248 + installdir=$with_builddeps_dir/$filebase
1.4249 + if test ! -f $installdir/$filename.unpacked; then
1.4250 + { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&5
1.4251 $as_echo "$as_me: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&6;}
1.4252 - if test ! -d $installdir; then
1.4253 - mkdir -p $installdir
1.4254 - fi
1.4255 - if test ! -d $installdir; then
1.4256 - as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.4257 - fi
1.4258 - tmpfile=`mktemp $installdir/bootjdk.XXXXXXXXX`
1.4259 - touch $tmpfile
1.4260 - if test ! -f $tmpfile; then
1.4261 - as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.4262 - fi
1.4263 -
1.4264 - # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.4265 - # $tmpfile is the local file name for the downloaded file.
1.4266 - VALID_TOOL=no
1.4267 - if test "x$BDEPS_FTP" = xwget; then
1.4268 - VALID_TOOL=yes
1.4269 - wget -O $tmpfile $with_builddeps_server/$resource
1.4270 - fi
1.4271 - if test "x$BDEPS_FTP" = xlftp; then
1.4272 - VALID_TOOL=yes
1.4273 - lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.4274 - fi
1.4275 - if test "x$BDEPS_FTP" = xftp; then
1.4276 - VALID_TOOL=yes
1.4277 - FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.4278 - FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.4279 - FTPUSERPWD=${FTPSERVER%%@*}
1.4280 - if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.4281 - FTPUSER=${userpwd%%:*}
1.4282 - FTPPWD=${userpwd#*@}
1.4283 - FTPSERVER=${FTPSERVER#*@}
1.4284 - else
1.4285 - FTPUSER=ftp
1.4286 - FTPPWD=ftp
1.4287 - fi
1.4288 - # the "pass" command does not work on some
1.4289 - # ftp clients (read ftp.exe) but if it works,
1.4290 - # passive mode is better!
1.4291 - (\
1.4292 - echo "user $FTPUSER $FTPPWD" ;\
1.4293 - echo "pass" ;\
1.4294 - echo "bin" ;\
1.4295 - echo "get $FTPPATH $tmpfile" ;\
1.4296 - ) | ftp -in $FTPSERVER
1.4297 - fi
1.4298 - if test "x$VALID_TOOL" != xyes; then
1.4299 - as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.4300 - fi
1.4301 -
1.4302 - mv $tmpfile $installdir/$filename
1.4303 - if test ! -s $installdir/$filename; then
1.4304 - as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.4305 - fi
1.4306 - case "$extension" in
1.4307 - zip) echo "Unzipping $installdir/$filename..."
1.4308 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.4309 - ;;
1.4310 - tar.gz) echo "Untaring $installdir/$filename..."
1.4311 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.4312 - ;;
1.4313 - tgz) echo "Untaring $installdir/$filename..."
1.4314 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.4315 - ;;
1.4316 - *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.4317 - ;;
1.4318 - esac
1.4319 - fi
1.4320 - if test -f $installdir/$filename.unpacked; then
1.4321 - depdir=$installdir
1.4322 - fi
1.4323 -
1.4324 - fi
1.4325 - # Source the builddeps file again, because in the previous command, the depdir
1.4326 - # was updated to point at the current build dependency install directory.
1.4327 - . $builddepsfile
1.4328 - # Now extract variables from the builddeps.conf files.
1.4329 - theroot=${builddep_bootjdk_ROOT}
1.4330 - thecflags=${builddep_bootjdk_CFLAGS}
1.4331 - thelibs=${builddep_bootjdk_LIBS}
1.4332 - if test "x$depdir" = x; then
1.4333 - as_fn_error $? "Could not download build dependency bootjdk" "$LINENO" 5
1.4334 - fi
1.4335 - BOOT_JDK=$depdir
1.4336 - if test "x$theroot" != x; then
1.4337 - BOOT_JDK="$theroot"
1.4338 - fi
1.4339 - if test "x$thecflags" != x; then
1.4340 - BOOT_JDK_CFLAGS="$thecflags"
1.4341 - fi
1.4342 - if test "x$thelibs" != x; then
1.4343 - BOOT_JDK_LIBS="$thelibs"
1.4344 - fi
1.4345 - BOOT_JDK_FOUND=maybe
1.4346 - else BOOT_JDK_FOUND=no
1.4347 -
1.4348 - fi
1.4349 - else BOOT_JDK_FOUND=no
1.4350 -
1.4351 - fi
1.4352 + if test ! -d $installdir; then
1.4353 + mkdir -p $installdir
1.4354 + fi
1.4355 + if test ! -d $installdir; then
1.4356 + as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.4357 + fi
1.4358 + tmpfile=`mktemp $installdir/bootjdk.XXXXXXXXX`
1.4359 + touch $tmpfile
1.4360 + if test ! -f $tmpfile; then
1.4361 + as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.4362 + fi
1.4363 +
1.4364 + # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.4365 + # $tmpfile is the local file name for the downloaded file.
1.4366 + VALID_TOOL=no
1.4367 + if test "x$BDEPS_FTP" = xwget; then
1.4368 + VALID_TOOL=yes
1.4369 + wget -O $tmpfile $with_builddeps_server/$resource
1.4370 + fi
1.4371 + if test "x$BDEPS_FTP" = xlftp; then
1.4372 + VALID_TOOL=yes
1.4373 + lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.4374 + fi
1.4375 + if test "x$BDEPS_FTP" = xftp; then
1.4376 + VALID_TOOL=yes
1.4377 + FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.4378 + FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.4379 + FTPUSERPWD=${FTPSERVER%%@*}
1.4380 + if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.4381 + FTPUSER=${userpwd%%:*}
1.4382 + FTPPWD=${userpwd#*@}
1.4383 + FTPSERVER=${FTPSERVER#*@}
1.4384 + else
1.4385 + FTPUSER=ftp
1.4386 + FTPPWD=ftp
1.4387 + fi
1.4388 + # the "pass" command does not work on some
1.4389 + # ftp clients (read ftp.exe) but if it works,
1.4390 + # passive mode is better!
1.4391 + ( \
1.4392 + echo "user $FTPUSER $FTPPWD" ; \
1.4393 + echo "pass" ; \
1.4394 + echo "bin" ; \
1.4395 + echo "get $FTPPATH $tmpfile" ; \
1.4396 + ) | ftp -in $FTPSERVER
1.4397 + fi
1.4398 + if test "x$VALID_TOOL" != xyes; then
1.4399 + as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.4400 + fi
1.4401 +
1.4402 + mv $tmpfile $installdir/$filename
1.4403 + if test ! -s $installdir/$filename; then
1.4404 + as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.4405 + fi
1.4406 + case "$extension" in
1.4407 + zip) echo "Unzipping $installdir/$filename..."
1.4408 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.4409 + ;;
1.4410 + tar.gz) echo "Untaring $installdir/$filename..."
1.4411 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.4412 + ;;
1.4413 + tgz) echo "Untaring $installdir/$filename..."
1.4414 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.4415 + ;;
1.4416 + *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.4417 + ;;
1.4418 + esac
1.4419 + fi
1.4420 + if test -f $installdir/$filename.unpacked; then
1.4421 + depdir=$installdir
1.4422 + fi
1.4423 +
1.4424 + fi
1.4425 + # Source the builddeps file again, because in the previous command, the depdir
1.4426 + # was updated to point at the current build dependency install directory.
1.4427 + . $builddepsfile
1.4428 + # Now extract variables from the builddeps.conf files.
1.4429 + theroot=${builddep_bootjdk_ROOT}
1.4430 + thecflags=${builddep_bootjdk_CFLAGS}
1.4431 + thelibs=${builddep_bootjdk_LIBS}
1.4432 + if test "x$depdir" = x; then
1.4433 + as_fn_error $? "Could not download build dependency bootjdk" "$LINENO" 5
1.4434 + fi
1.4435 + BOOT_JDK=$depdir
1.4436 + if test "x$theroot" != x; then
1.4437 + BOOT_JDK="$theroot"
1.4438 + fi
1.4439 + if test "x$thecflags" != x; then
1.4440 + BOOT_JDK_CFLAGS="$thecflags"
1.4441 + fi
1.4442 + if test "x$thelibs" != x; then
1.4443 + BOOT_JDK_LIBS="$thelibs"
1.4444 + fi
1.4445 + BOOT_JDK_FOUND=maybe
1.4446 + else BOOT_JDK_FOUND=no
1.4447 +
1.4448 + fi
1.4449 + else BOOT_JDK_FOUND=no
1.4450 +
1.4451 + fi
1.4452
1.4453
1.4454
1.4455 @@ -11651,13 +11649,13 @@
1.4456 fi
1.4457
1.4458
1.4459 -# Test: Is $JAVA_HOME set?
1.4460 + # Test: Is $JAVA_HOME set?
1.4461
1.4462 if test "x$BOOT_JDK_FOUND" = xno; then
1.4463 # Now execute the test
1.4464
1.4465 - if test "x$JAVA_HOME" != x; then
1.4466 - JAVA_HOME_PROCESSED="$JAVA_HOME"
1.4467 + if test "x$JAVA_HOME" != x; then
1.4468 + JAVA_HOME_PROCESSED="$JAVA_HOME"
1.4469
1.4470 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.4471
1.4472 @@ -11780,18 +11778,18 @@
1.4473 JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
1.4474 fi
1.4475
1.4476 - if test ! -d "$JAVA_HOME_PROCESSED"; then
1.4477 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your JAVA_HOME points to a non-existing directory!" >&5
1.4478 + if test ! -d "$JAVA_HOME_PROCESSED"; then
1.4479 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your JAVA_HOME points to a non-existing directory!" >&5
1.4480 $as_echo "$as_me: Your JAVA_HOME points to a non-existing directory!" >&6;}
1.4481 - else
1.4482 - # Aha, the user has set a JAVA_HOME
1.4483 - # let us use that as the Boot JDK.
1.4484 - BOOT_JDK="$JAVA_HOME_PROCESSED"
1.4485 - BOOT_JDK_FOUND=maybe
1.4486 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using JAVA_HOME" >&5
1.4487 + else
1.4488 + # Aha, the user has set a JAVA_HOME
1.4489 + # let us use that as the Boot JDK.
1.4490 + BOOT_JDK="$JAVA_HOME_PROCESSED"
1.4491 + BOOT_JDK_FOUND=maybe
1.4492 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using JAVA_HOME" >&5
1.4493 $as_echo "$as_me: Found potential Boot JDK using JAVA_HOME" >&6;}
1.4494 - fi
1.4495 - fi
1.4496 + fi
1.4497 + fi
1.4498
1.4499
1.4500 # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
1.4501 @@ -11969,17 +11967,17 @@
1.4502 fi
1.4503
1.4504
1.4505 -# Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
1.4506 + # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
1.4507
1.4508 if test "x$BOOT_JDK_FOUND" = xno; then
1.4509 # Now execute the test
1.4510
1.4511 - if test -x /usr/libexec/java_home; then
1.4512 - BOOT_JDK=`/usr/libexec/java_home`
1.4513 - BOOT_JDK_FOUND=maybe
1.4514 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using /usr/libexec/java_home" >&5
1.4515 + if test -x /usr/libexec/java_home; then
1.4516 + BOOT_JDK=`/usr/libexec/java_home`
1.4517 + BOOT_JDK_FOUND=maybe
1.4518 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using /usr/libexec/java_home" >&5
1.4519 $as_echo "$as_me: Found potential Boot JDK using /usr/libexec/java_home" >&6;}
1.4520 - fi
1.4521 + fi
1.4522
1.4523
1.4524 # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
1.4525 @@ -12157,12 +12155,12 @@
1.4526 fi
1.4527
1.4528
1.4529 -# Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
1.4530 + # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
1.4531
1.4532 if test "x$BOOT_JDK_FOUND" = xno; then
1.4533 # Now execute the test
1.4534
1.4535 - # Extract the first word of "javac", so it can be a program name with args.
1.4536 + # Extract the first word of "javac", so it can be a program name with args.
1.4537 set dummy javac; ac_word=$2
1.4538 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.4539 $as_echo_n "checking for $ac_word... " >&6; }
1.4540 @@ -12202,7 +12200,7 @@
1.4541 fi
1.4542
1.4543
1.4544 - # Extract the first word of "java", so it can be a program name with args.
1.4545 + # Extract the first word of "java", so it can be a program name with args.
1.4546 set dummy java; ac_word=$2
1.4547 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.4548 $as_echo_n "checking for $ac_word... " >&6; }
1.4549 @@ -12242,72 +12240,72 @@
1.4550 fi
1.4551
1.4552
1.4553 - BINARY="$JAVAC_CHECK"
1.4554 - if test "x$JAVAC_CHECK" = x; then
1.4555 - BINARY="$JAVA_CHECK"
1.4556 - fi
1.4557 - if test "x$BINARY" != x; then
1.4558 - # So there is a java(c) binary, it might be part of a JDK.
1.4559 - # Lets find the JDK/JRE directory by following symbolic links.
1.4560 - # Linux/GNU systems often have links from /usr/bin/java to
1.4561 - # /etc/alternatives/java to the real JDK binary.
1.4562 -
1.4563 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.4564 - # Follow a chain of symbolic links. Use readlink
1.4565 - # where it exists, else fall back to horribly
1.4566 - # complicated shell code.
1.4567 - if test "x$READLINK_TESTED" != yes; then
1.4568 - # On MacOSX there is a readlink tool with a different
1.4569 - # purpose than the GNU readlink tool. Check the found readlink.
1.4570 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.4571 - if test "x$ISGNU" = x; then
1.4572 - # A readlink that we do not know how to use.
1.4573 - # Are there other non-GNU readlinks out there?
1.4574 - READLINK_TESTED=yes
1.4575 - READLINK=
1.4576 - fi
1.4577 - fi
1.4578 -
1.4579 - if test "x$READLINK" != x; then
1.4580 - BINARY=`$READLINK -f $BINARY`
1.4581 - else
1.4582 - # Save the current directory for restoring afterwards
1.4583 - STARTDIR=$PWD
1.4584 - COUNTER=0
1.4585 - sym_link_dir=`$DIRNAME $BINARY`
1.4586 - sym_link_file=`$BASENAME $BINARY`
1.4587 - cd $sym_link_dir
1.4588 - # Use -P flag to resolve symlinks in directories.
1.4589 - cd `$THEPWDCMD -P`
1.4590 - sym_link_dir=`$THEPWDCMD -P`
1.4591 - # Resolve file symlinks
1.4592 - while test $COUNTER -lt 20; do
1.4593 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.4594 - if test "x$ISLINK" == x; then
1.4595 - # This is not a symbolic link! We are done!
1.4596 - break
1.4597 - fi
1.4598 - # Again resolve directory symlinks since the target of the just found
1.4599 - # link could be in a different directory
1.4600 - cd `$DIRNAME $ISLINK`
1.4601 - sym_link_dir=`$THEPWDCMD -P`
1.4602 - sym_link_file=`$BASENAME $ISLINK`
1.4603 - let COUNTER=COUNTER+1
1.4604 - done
1.4605 - cd $STARTDIR
1.4606 - BINARY=$sym_link_dir/$sym_link_file
1.4607 - fi
1.4608 - fi
1.4609 -
1.4610 - BOOT_JDK=`dirname "$BINARY"`
1.4611 - BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
1.4612 - if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
1.4613 - # Looks like we found ourselves an JDK
1.4614 - BOOT_JDK_FOUND=maybe
1.4615 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using java(c) in PATH" >&5
1.4616 + BINARY="$JAVAC_CHECK"
1.4617 + if test "x$JAVAC_CHECK" = x; then
1.4618 + BINARY="$JAVA_CHECK"
1.4619 + fi
1.4620 + if test "x$BINARY" != x; then
1.4621 + # So there is a java(c) binary, it might be part of a JDK.
1.4622 + # Lets find the JDK/JRE directory by following symbolic links.
1.4623 + # Linux/GNU systems often have links from /usr/bin/java to
1.4624 + # /etc/alternatives/java to the real JDK binary.
1.4625 +
1.4626 + if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.4627 + # Follow a chain of symbolic links. Use readlink
1.4628 + # where it exists, else fall back to horribly
1.4629 + # complicated shell code.
1.4630 + if test "x$READLINK_TESTED" != yes; then
1.4631 + # On MacOSX there is a readlink tool with a different
1.4632 + # purpose than the GNU readlink tool. Check the found readlink.
1.4633 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.4634 + if test "x$ISGNU" = x; then
1.4635 + # A readlink that we do not know how to use.
1.4636 + # Are there other non-GNU readlinks out there?
1.4637 + READLINK_TESTED=yes
1.4638 + READLINK=
1.4639 + fi
1.4640 + fi
1.4641 +
1.4642 + if test "x$READLINK" != x; then
1.4643 + BINARY=`$READLINK -f $BINARY`
1.4644 + else
1.4645 + # Save the current directory for restoring afterwards
1.4646 + STARTDIR=$PWD
1.4647 + COUNTER=0
1.4648 + sym_link_dir=`$DIRNAME $BINARY`
1.4649 + sym_link_file=`$BASENAME $BINARY`
1.4650 + cd $sym_link_dir
1.4651 + # Use -P flag to resolve symlinks in directories.
1.4652 + cd `$THEPWDCMD -P`
1.4653 + sym_link_dir=`$THEPWDCMD -P`
1.4654 + # Resolve file symlinks
1.4655 + while test $COUNTER -lt 20; do
1.4656 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.4657 + if test "x$ISLINK" == x; then
1.4658 + # This is not a symbolic link! We are done!
1.4659 + break
1.4660 + fi
1.4661 + # Again resolve directory symlinks since the target of the just found
1.4662 + # link could be in a different directory
1.4663 + cd `$DIRNAME $ISLINK`
1.4664 + sym_link_dir=`$THEPWDCMD -P`
1.4665 + sym_link_file=`$BASENAME $ISLINK`
1.4666 + let COUNTER=COUNTER+1
1.4667 + done
1.4668 + cd $STARTDIR
1.4669 + BINARY=$sym_link_dir/$sym_link_file
1.4670 + fi
1.4671 + fi
1.4672 +
1.4673 + BOOT_JDK=`dirname "$BINARY"`
1.4674 + BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
1.4675 + if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
1.4676 + # Looks like we found ourselves an JDK
1.4677 + BOOT_JDK_FOUND=maybe
1.4678 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using java(c) in PATH" >&5
1.4679 $as_echo "$as_me: Found potential Boot JDK using java(c) in PATH" >&6;}
1.4680 - fi
1.4681 - fi
1.4682 + fi
1.4683 + fi
1.4684
1.4685
1.4686 # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
1.4687 @@ -12485,7 +12483,7 @@
1.4688 fi
1.4689
1.4690
1.4691 -# Test: Is there a JDK installed in default, well-known locations?
1.4692 + # Test: Is there a JDK installed in default, well-known locations?
1.4693
1.4694 if test "x$BOOT_JDK_FOUND" = xno; then
1.4695 # Now execute the test
1.4696 @@ -15715,67 +15713,67 @@
1.4697 fi
1.4698
1.4699
1.4700 -# If we haven't found anything yet, we've truly lost. Give up.
1.4701 -if test "x$BOOT_JDK_FOUND" = xno; then
1.4702 -
1.4703 - # Print a helpful message on how to acquire the necessary build dependency.
1.4704 - # openjdk is the help tag: freetyp2, cups, pulse, alsa etc
1.4705 - MISSING_DEPENDENCY=openjdk
1.4706 - PKGHANDLER_COMMAND=
1.4707 -
1.4708 - case $PKGHANDLER in
1.4709 - apt-get)
1.4710 - apt_help $MISSING_DEPENDENCY ;;
1.4711 + # If we haven't found anything yet, we've truly lost. Give up.
1.4712 + if test "x$BOOT_JDK_FOUND" = xno; then
1.4713 +
1.4714 + # Print a helpful message on how to acquire the necessary build dependency.
1.4715 + # openjdk is the help tag: freetyp2, cups, pulse, alsa etc
1.4716 + MISSING_DEPENDENCY=openjdk
1.4717 + PKGHANDLER_COMMAND=
1.4718 +
1.4719 + case $PKGHANDLER in
1.4720 + apt-get)
1.4721 + apt_help $MISSING_DEPENDENCY ;;
1.4722 yum)
1.4723 - yum_help $MISSING_DEPENDENCY ;;
1.4724 - port)
1.4725 - port_help $MISSING_DEPENDENCY ;;
1.4726 - pkgutil)
1.4727 - pkgutil_help $MISSING_DEPENDENCY ;;
1.4728 - pkgadd)
1.4729 - pkgadd_help $MISSING_DEPENDENCY ;;
1.4730 + yum_help $MISSING_DEPENDENCY ;;
1.4731 + port)
1.4732 + port_help $MISSING_DEPENDENCY ;;
1.4733 + pkgutil)
1.4734 + pkgutil_help $MISSING_DEPENDENCY ;;
1.4735 + pkgadd)
1.4736 + pkgadd_help $MISSING_DEPENDENCY ;;
1.4737 * )
1.4738 break ;;
1.4739 - esac
1.4740 -
1.4741 - if test "x$PKGHANDLER_COMMAND" != x; then
1.4742 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.4743 - fi
1.4744 -
1.4745 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5
1.4746 + esac
1.4747 +
1.4748 + if test "x$PKGHANDLER_COMMAND" != x; then
1.4749 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.4750 + fi
1.4751 +
1.4752 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5
1.4753 $as_echo "$as_me: Could not find a valid Boot JDK. $HELP_MSG" >&6;}
1.4754 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4755 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4756 $as_echo "$as_me: This might be fixed by explicitely setting --with-boot-jdk" >&6;}
1.4757 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.4758 -fi
1.4759 -
1.4760 -# Setup proper paths for what we found
1.4761 -BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
1.4762 -if test ! -f "$BOOT_RTJAR"; then
1.4763 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.4764 + fi
1.4765 +
1.4766 + # Setup proper paths for what we found
1.4767 + BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
1.4768 + if test ! -f "$BOOT_RTJAR"; then
1.4769 # On MacOSX it is called classes.jar
1.4770 BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar"
1.4771 if test -f "$BOOT_RTJAR"; then
1.4772 # Remove the ..
1.4773 BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
1.4774 fi
1.4775 -fi
1.4776 -BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
1.4777 -BOOT_JDK="$BOOT_JDK"
1.4778 -
1.4779 -
1.4780 -
1.4781 -
1.4782 -# Setup tools from the Boot JDK.
1.4783 + fi
1.4784 + BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
1.4785 + BOOT_JDK="$BOOT_JDK"
1.4786 +
1.4787 +
1.4788 +
1.4789 +
1.4790 + # Setup tools from the Boot JDK.
1.4791
1.4792 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for java in Boot JDK" >&5
1.4793 $as_echo_n "checking for java in Boot JDK... " >&6; }
1.4794 JAVA=$BOOT_JDK/bin/java
1.4795 if test ! -x $JAVA; then
1.4796 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4797 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4798 $as_echo "not found" >&6; }
1.4799 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4800 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4801 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
1.4802 - as_fn_error $? "Could not find java in the Boot JDK" "$LINENO" 5
1.4803 + as_fn_error $? "Could not find java in the Boot JDK" "$LINENO" 5
1.4804 fi
1.4805 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.4806 $as_echo "ok" >&6; }
1.4807 @@ -15785,11 +15783,11 @@
1.4808 $as_echo_n "checking for javac in Boot JDK... " >&6; }
1.4809 JAVAC=$BOOT_JDK/bin/javac
1.4810 if test ! -x $JAVAC; then
1.4811 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4812 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4813 $as_echo "not found" >&6; }
1.4814 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4815 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4816 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
1.4817 - as_fn_error $? "Could not find javac in the Boot JDK" "$LINENO" 5
1.4818 + as_fn_error $? "Could not find javac in the Boot JDK" "$LINENO" 5
1.4819 fi
1.4820 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.4821 $as_echo "ok" >&6; }
1.4822 @@ -15799,11 +15797,11 @@
1.4823 $as_echo_n "checking for javah in Boot JDK... " >&6; }
1.4824 JAVAH=$BOOT_JDK/bin/javah
1.4825 if test ! -x $JAVAH; then
1.4826 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4827 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4828 $as_echo "not found" >&6; }
1.4829 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4830 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4831 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
1.4832 - as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
1.4833 + as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
1.4834 fi
1.4835 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.4836 $as_echo "ok" >&6; }
1.4837 @@ -15813,11 +15811,11 @@
1.4838 $as_echo_n "checking for javap in Boot JDK... " >&6; }
1.4839 JAVAP=$BOOT_JDK/bin/javap
1.4840 if test ! -x $JAVAP; then
1.4841 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4842 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4843 $as_echo "not found" >&6; }
1.4844 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4845 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4846 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
1.4847 - as_fn_error $? "Could not find javap in the Boot JDK" "$LINENO" 5
1.4848 + as_fn_error $? "Could not find javap in the Boot JDK" "$LINENO" 5
1.4849 fi
1.4850 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.4851 $as_echo "ok" >&6; }
1.4852 @@ -15827,11 +15825,11 @@
1.4853 $as_echo_n "checking for jar in Boot JDK... " >&6; }
1.4854 JAR=$BOOT_JDK/bin/jar
1.4855 if test ! -x $JAR; then
1.4856 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4857 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4858 $as_echo "not found" >&6; }
1.4859 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4860 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4861 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
1.4862 - as_fn_error $? "Could not find jar in the Boot JDK" "$LINENO" 5
1.4863 + as_fn_error $? "Could not find jar in the Boot JDK" "$LINENO" 5
1.4864 fi
1.4865 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.4866 $as_echo "ok" >&6; }
1.4867 @@ -15841,11 +15839,11 @@
1.4868 $as_echo_n "checking for rmic in Boot JDK... " >&6; }
1.4869 RMIC=$BOOT_JDK/bin/rmic
1.4870 if test ! -x $RMIC; then
1.4871 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4872 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4873 $as_echo "not found" >&6; }
1.4874 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4875 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4876 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
1.4877 - as_fn_error $? "Could not find rmic in the Boot JDK" "$LINENO" 5
1.4878 + as_fn_error $? "Could not find rmic in the Boot JDK" "$LINENO" 5
1.4879 fi
1.4880 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.4881 $as_echo "ok" >&6; }
1.4882 @@ -15855,28 +15853,28 @@
1.4883 $as_echo_n "checking for native2ascii in Boot JDK... " >&6; }
1.4884 NATIVE2ASCII=$BOOT_JDK/bin/native2ascii
1.4885 if test ! -x $NATIVE2ASCII; then
1.4886 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4887 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.4888 $as_echo "not found" >&6; }
1.4889 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4890 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
1.4891 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
1.4892 - as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5
1.4893 + as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5
1.4894 fi
1.4895 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.4896 $as_echo "ok" >&6; }
1.4897
1.4898
1.4899 -# Finally, set some other options...
1.4900 -
1.4901 -# When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
1.4902 -BOOT_JDK_SOURCETARGET="-source 7 -target 7"
1.4903 -
1.4904 -
1.4905 -
1.4906 -
1.4907 -##############################################################################
1.4908 -#
1.4909 -# Specify options for anything that is run with the Boot JDK.
1.4910 -#
1.4911 + # Finally, set some other options...
1.4912 +
1.4913 + # When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
1.4914 + BOOT_JDK_SOURCETARGET="-source 7 -target 7"
1.4915 +
1.4916 +
1.4917 +
1.4918 +
1.4919 + ##############################################################################
1.4920 + #
1.4921 + # Specify options for anything that is run with the Boot JDK.
1.4922 + #
1.4923
1.4924 # Check whether --with-boot-jdk-jvmargs was given.
1.4925 if test "${with_boot_jdk_jvmargs+set}" = set; then :
1.4926 @@ -15884,135 +15882,135 @@
1.4927 fi
1.4928
1.4929
1.4930 -if test "x$with_boot_jdk_jvmargs" = x; then
1.4931 + if test "x$with_boot_jdk_jvmargs" = x; then
1.4932 # Not all JVM:s accept the same arguments on the command line.
1.4933 # OpenJDK specific increase in thread stack for JDK build,
1.4934 # well more specifically, when running javac.
1.4935 if test "x$BUILD_NUM_BITS" = x32; then
1.4936 - STACK_SIZE=768
1.4937 - else
1.4938 - # Running Javac on a JVM on a 64-bit machine, the stack takes more space
1.4939 - # since 64-bit pointers are pushed on the stach. Apparently, we need
1.4940 - # to increase the stack space when javacing the JDK....
1.4941 - STACK_SIZE=1536
1.4942 + STACK_SIZE=768
1.4943 + else
1.4944 + # Running Javac on a JVM on a 64-bit machine, the stack takes more space
1.4945 + # since 64-bit pointers are pushed on the stach. Apparently, we need
1.4946 + # to increase the stack space when javacing the JDK....
1.4947 + STACK_SIZE=1536
1.4948 fi
1.4949
1.4950 # Minimum amount of heap memory.
1.4951
1.4952 - $ECHO "Check if jvm arg is ok: -Xms64M" >&5
1.4953 - $ECHO "Command: $JAVA -Xms64M -version" >&5
1.4954 - OUTPUT=`$JAVA -Xms64M -version 2>&1`
1.4955 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.4956 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.4957 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.4958 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M"
1.4959 - JVM_ARG_OK=true
1.4960 - else
1.4961 - $ECHO "Arg failed:" >&5
1.4962 - $ECHO "$OUTPUT" >&5
1.4963 - JVM_ARG_OK=false
1.4964 - fi
1.4965 + $ECHO "Check if jvm arg is ok: -Xms64M" >&5
1.4966 + $ECHO "Command: $JAVA -Xms64M -version" >&5
1.4967 + OUTPUT=`$JAVA -Xms64M -version 2>&1`
1.4968 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.4969 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.4970 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.4971 + boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M"
1.4972 + JVM_ARG_OK=true
1.4973 + else
1.4974 + $ECHO "Arg failed:" >&5
1.4975 + $ECHO "$OUTPUT" >&5
1.4976 + JVM_ARG_OK=false
1.4977 + fi
1.4978
1.4979 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.4980 - # Why does macosx need more heap? Its the huge JDK batch.
1.4981 -
1.4982 - $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5
1.4983 - $ECHO "Command: $JAVA -Xmx1600M -version" >&5
1.4984 - OUTPUT=`$JAVA -Xmx1600M -version 2>&1`
1.4985 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.4986 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.4987 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.4988 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M"
1.4989 - JVM_ARG_OK=true
1.4990 - else
1.4991 - $ECHO "Arg failed:" >&5
1.4992 - $ECHO "$OUTPUT" >&5
1.4993 - JVM_ARG_OK=false
1.4994 - fi
1.4995 -
1.4996 - else
1.4997 -
1.4998 - $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5
1.4999 - $ECHO "Command: $JAVA -Xmx1100M -version" >&5
1.5000 - OUTPUT=`$JAVA -Xmx1100M -version 2>&1`
1.5001 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5002 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5003 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5004 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M"
1.5005 - JVM_ARG_OK=true
1.5006 - else
1.5007 - $ECHO "Arg failed:" >&5
1.5008 - $ECHO "$OUTPUT" >&5
1.5009 - JVM_ARG_OK=false
1.5010 - fi
1.5011 + # Why does macosx need more heap? Its the huge JDK batch.
1.5012 +
1.5013 + $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5
1.5014 + $ECHO "Command: $JAVA -Xmx1600M -version" >&5
1.5015 + OUTPUT=`$JAVA -Xmx1600M -version 2>&1`
1.5016 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5017 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5018 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5019 + boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M"
1.5020 + JVM_ARG_OK=true
1.5021 + else
1.5022 + $ECHO "Arg failed:" >&5
1.5023 + $ECHO "$OUTPUT" >&5
1.5024 + JVM_ARG_OK=false
1.5025 + fi
1.5026 +
1.5027 + else
1.5028 +
1.5029 + $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5
1.5030 + $ECHO "Command: $JAVA -Xmx1100M -version" >&5
1.5031 + OUTPUT=`$JAVA -Xmx1100M -version 2>&1`
1.5032 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5033 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5034 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5035 + boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M"
1.5036 + JVM_ARG_OK=true
1.5037 + else
1.5038 + $ECHO "Arg failed:" >&5
1.5039 + $ECHO "$OUTPUT" >&5
1.5040 + JVM_ARG_OK=false
1.5041 + fi
1.5042
1.5043 fi
1.5044 # When is adding -client something that speeds up the JVM?
1.5045 # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
1.5046
1.5047 - $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5
1.5048 - $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5
1.5049 - OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1`
1.5050 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5051 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5052 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5053 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m"
1.5054 - JVM_ARG_OK=true
1.5055 - else
1.5056 - $ECHO "Arg failed:" >&5
1.5057 - $ECHO "$OUTPUT" >&5
1.5058 - JVM_ARG_OK=false
1.5059 - fi
1.5060 -
1.5061 -
1.5062 - $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5
1.5063 - $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5
1.5064 - OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1`
1.5065 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5066 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5067 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5068 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m"
1.5069 - JVM_ARG_OK=true
1.5070 - else
1.5071 - $ECHO "Arg failed:" >&5
1.5072 - $ECHO "$OUTPUT" >&5
1.5073 - JVM_ARG_OK=false
1.5074 - fi
1.5075 -
1.5076 -
1.5077 - $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5
1.5078 - $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5
1.5079 - OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1`
1.5080 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5081 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5082 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5083 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE"
1.5084 - JVM_ARG_OK=true
1.5085 - else
1.5086 - $ECHO "Arg failed:" >&5
1.5087 - $ECHO "$OUTPUT" >&5
1.5088 - JVM_ARG_OK=false
1.5089 - fi
1.5090 + $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5
1.5091 + $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5
1.5092 + OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1`
1.5093 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5094 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5095 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5096 + boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m"
1.5097 + JVM_ARG_OK=true
1.5098 + else
1.5099 + $ECHO "Arg failed:" >&5
1.5100 + $ECHO "$OUTPUT" >&5
1.5101 + JVM_ARG_OK=false
1.5102 + fi
1.5103 +
1.5104 +
1.5105 + $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5
1.5106 + $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5
1.5107 + OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1`
1.5108 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5109 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5110 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5111 + boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m"
1.5112 + JVM_ARG_OK=true
1.5113 + else
1.5114 + $ECHO "Arg failed:" >&5
1.5115 + $ECHO "$OUTPUT" >&5
1.5116 + JVM_ARG_OK=false
1.5117 + fi
1.5118 +
1.5119 +
1.5120 + $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5
1.5121 + $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5
1.5122 + OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1`
1.5123 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5124 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5125 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5126 + boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE"
1.5127 + JVM_ARG_OK=true
1.5128 + else
1.5129 + $ECHO "Arg failed:" >&5
1.5130 + $ECHO "$OUTPUT" >&5
1.5131 + JVM_ARG_OK=false
1.5132 + fi
1.5133
1.5134 # Disable special log output when a debug build is used as Boot JDK...
1.5135
1.5136 - $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5
1.5137 - $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5
1.5138 - OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1`
1.5139 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5140 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5141 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5142 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput"
1.5143 - JVM_ARG_OK=true
1.5144 - else
1.5145 - $ECHO "Arg failed:" >&5
1.5146 - $ECHO "$OUTPUT" >&5
1.5147 - JVM_ARG_OK=false
1.5148 - fi
1.5149 -
1.5150 -fi
1.5151 -
1.5152 -BOOT_JDK_JVMARGS=$boot_jdk_jvmargs
1.5153 + $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5
1.5154 + $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5
1.5155 + OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1`
1.5156 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.5157 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.5158 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.5159 + boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput"
1.5160 + JVM_ARG_OK=true
1.5161 + else
1.5162 + $ECHO "Arg failed:" >&5
1.5163 + $ECHO "$OUTPUT" >&5
1.5164 + JVM_ARG_OK=false
1.5165 + fi
1.5166 +
1.5167 + fi
1.5168 +
1.5169 + BOOT_JDK_JVMARGS=$boot_jdk_jvmargs
1.5170
1.5171
1.5172
1.5173 @@ -16023,31 +16021,30 @@
1.5174 ###############################################################################
1.5175
1.5176
1.5177 -
1.5178 -# Where are the sources. Any of these can be overridden
1.5179 -# using --with-override-corba and the likes.
1.5180 -LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
1.5181 -CORBA_TOPDIR="$SRC_ROOT/corba"
1.5182 -JAXP_TOPDIR="$SRC_ROOT/jaxp"
1.5183 -JAXWS_TOPDIR="$SRC_ROOT/jaxws"
1.5184 -HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
1.5185 -NASHORN_TOPDIR="$SRC_ROOT/nashorn"
1.5186 -JDK_TOPDIR="$SRC_ROOT/jdk"
1.5187 -
1.5188 -
1.5189 -
1.5190 -
1.5191 -
1.5192 -
1.5193 -
1.5194 -
1.5195 -
1.5196 -
1.5197 -###############################################################################
1.5198 -#
1.5199 -# Pickup additional source for a component from outside of the source root
1.5200 -# or override source for a component.
1.5201 -#
1.5202 + # Where are the sources. Any of these can be overridden
1.5203 + # using --with-override-corba and the likes.
1.5204 + LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
1.5205 + CORBA_TOPDIR="$SRC_ROOT/corba"
1.5206 + JAXP_TOPDIR="$SRC_ROOT/jaxp"
1.5207 + JAXWS_TOPDIR="$SRC_ROOT/jaxws"
1.5208 + HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
1.5209 + NASHORN_TOPDIR="$SRC_ROOT/nashorn"
1.5210 + JDK_TOPDIR="$SRC_ROOT/jdk"
1.5211 +
1.5212 +
1.5213 +
1.5214 +
1.5215 +
1.5216 +
1.5217 +
1.5218 +
1.5219 +
1.5220 +
1.5221 + ###############################################################################
1.5222 + #
1.5223 + # Pickup additional source for a component from outside of the source root
1.5224 + # or override source for a component.
1.5225 + #
1.5226
1.5227 # Check whether --with-add-source-root was given.
1.5228 if test "${with_add_source_root+set}" = set; then :
1.5229 @@ -16069,14 +16066,14 @@
1.5230 fi
1.5231
1.5232
1.5233 -if test "x$with_adds_and_overrides" != x; then
1.5234 + if test "x$with_adds_and_overrides" != x; then
1.5235 with_add_source_root="$with_adds_and_overrides/adds"
1.5236 with_override_source_root="$with_adds_and_overrides/overrides"
1.5237 -fi
1.5238 -
1.5239 -if test "x$with_add_source_root" != x; then
1.5240 + fi
1.5241 +
1.5242 + if test "x$with_add_source_root" != x; then
1.5243 if ! test -d $with_add_source_root; then
1.5244 - as_fn_error $? "Trying to use a non-existant add-source-root $with_add_source_root" "$LINENO" 5
1.5245 + as_fn_error $? "Trying to use a non-existant add-source-root $with_add_source_root" "$LINENO" 5
1.5246 fi
1.5247 CURDIR="$PWD"
1.5248 cd "$with_add_source_root"
1.5249 @@ -16085,93 +16082,93 @@
1.5250 # Verify that the addon source root does not have any root makefiles.
1.5251 # If it does, then it is usually an error, prevent this.
1.5252 if test -f $with_add_source_root/langtools/makefiles/Makefile || \
1.5253 - test -f $with_add_source_root/langtools/make/Makefile; then
1.5254 - as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5
1.5255 + test -f $with_add_source_root/langtools/make/Makefile; then
1.5256 + as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5
1.5257 fi
1.5258 if test -f $with_add_source_root/corba/makefiles/Makefile || \
1.5259 - test -f $with_add_source_root/corba/make/Makefile; then
1.5260 - as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5
1.5261 + test -f $with_add_source_root/corba/make/Makefile; then
1.5262 + as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5
1.5263 fi
1.5264 if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
1.5265 - test -f $with_add_source_root/jaxp/make/Makefile; then
1.5266 - as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5
1.5267 + test -f $with_add_source_root/jaxp/make/Makefile; then
1.5268 + as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5
1.5269 fi
1.5270 if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
1.5271 - test -f $with_add_source_root/jaxws/make/Makefile; then
1.5272 - as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5
1.5273 + test -f $with_add_source_root/jaxws/make/Makefile; then
1.5274 + as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5
1.5275 fi
1.5276 if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
1.5277 - test -f $with_add_source_root/hotspot/make/Makefile; then
1.5278 - as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5
1.5279 + test -f $with_add_source_root/hotspot/make/Makefile; then
1.5280 + as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5
1.5281 fi
1.5282 if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
1.5283 - test -f $with_add_source_root/nashorn/make/Makefile; then
1.5284 - as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5
1.5285 + test -f $with_add_source_root/nashorn/make/Makefile; then
1.5286 + as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5
1.5287 fi
1.5288 if test -f $with_add_source_root/jdk/makefiles/Makefile || \
1.5289 - test -f $with_add_source_root/jdk/make/Makefile; then
1.5290 - as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5
1.5291 - fi
1.5292 -fi
1.5293 -
1.5294 -
1.5295 -if test "x$with_override_source_root" != x; then
1.5296 + test -f $with_add_source_root/jdk/make/Makefile; then
1.5297 + as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5
1.5298 + fi
1.5299 + fi
1.5300 +
1.5301 +
1.5302 + if test "x$with_override_source_root" != x; then
1.5303 if ! test -d $with_override_source_root; then
1.5304 - as_fn_error $? "Trying to use a non-existant override-source-root $with_override_source_root" "$LINENO" 5
1.5305 + as_fn_error $? "Trying to use a non-existant override-source-root $with_override_source_root" "$LINENO" 5
1.5306 fi
1.5307 CURDIR="$PWD"
1.5308 cd "$with_override_source_root"
1.5309 OVERRIDE_SRC_ROOT="`pwd`"
1.5310 cd "$CURDIR"
1.5311 if test -f $with_override_source_root/langtools/makefiles/Makefile || \
1.5312 - test -f $with_override_source_root/langtools/make/Makefile; then
1.5313 - as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5
1.5314 + test -f $with_override_source_root/langtools/make/Makefile; then
1.5315 + as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5
1.5316 fi
1.5317 if test -f $with_override_source_root/corba/makefiles/Makefile || \
1.5318 - test -f $with_override_source_root/corba/make/Makefile; then
1.5319 - as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5
1.5320 + test -f $with_override_source_root/corba/make/Makefile; then
1.5321 + as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5
1.5322 fi
1.5323 if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
1.5324 - test -f $with_override_source_root/jaxp/make/Makefile; then
1.5325 - as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5
1.5326 + test -f $with_override_source_root/jaxp/make/Makefile; then
1.5327 + as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5
1.5328 fi
1.5329 if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
1.5330 - test -f $with_override_source_root/jaxws/make/Makefile; then
1.5331 - as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5
1.5332 + test -f $with_override_source_root/jaxws/make/Makefile; then
1.5333 + as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5
1.5334 fi
1.5335 if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
1.5336 - test -f $with_override_source_root/hotspot/make/Makefile; then
1.5337 - as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5
1.5338 + test -f $with_override_source_root/hotspot/make/Makefile; then
1.5339 + as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5
1.5340 fi
1.5341 if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
1.5342 - test -f $with_override_source_root/nashorn/make/Makefile; then
1.5343 - as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5
1.5344 + test -f $with_override_source_root/nashorn/make/Makefile; then
1.5345 + as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5
1.5346 fi
1.5347 if test -f $with_override_source_root/jdk/makefiles/Makefile || \
1.5348 - test -f $with_override_source_root/jdk/make/Makefile; then
1.5349 - as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5
1.5350 - fi
1.5351 -fi
1.5352 -
1.5353 -
1.5354 -###############################################################################
1.5355 -#
1.5356 -# Override a repo completely, this is used for example when you have 3 small
1.5357 -# development sandboxes of the langtools sources and want to avoid having 3 full
1.5358 -# OpenJDK sources checked out on disk.
1.5359 -#
1.5360 -# Assuming that the 3 langtools sandboxes are located here:
1.5361 -# /home/fredrik/sandbox1/langtools
1.5362 -# /home/fredrik/sandbox2/langtools
1.5363 -# /home/fredrik/sandbox3/langtools
1.5364 -#
1.5365 -# From the source root you create build subdirs manually:
1.5366 -# mkdir -p build1 build2 build3
1.5367 -# in each build directory run:
1.5368 -# (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
1.5369 -# (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
1.5370 -# (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
1.5371 -#
1.5372 + test -f $with_override_source_root/jdk/make/Makefile; then
1.5373 + as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5
1.5374 + fi
1.5375 + fi
1.5376 +
1.5377 +
1.5378 + ###############################################################################
1.5379 + #
1.5380 + # Override a repo completely, this is used for example when you have 3 small
1.5381 + # development sandboxes of the langtools sources and want to avoid having 3 full
1.5382 + # OpenJDK sources checked out on disk.
1.5383 + #
1.5384 + # Assuming that the 3 langtools sandboxes are located here:
1.5385 + # /home/fredrik/sandbox1/langtools
1.5386 + # /home/fredrik/sandbox2/langtools
1.5387 + # /home/fredrik/sandbox3/langtools
1.5388 + #
1.5389 + # From the source root you create build subdirs manually:
1.5390 + # mkdir -p build1 build2 build3
1.5391 + # in each build directory run:
1.5392 + # (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
1.5393 + # (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
1.5394 + # (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
1.5395 + #
1.5396
1.5397
1.5398 # Check whether --with-override-langtools was given.
1.5399 @@ -16222,106 +16219,105 @@
1.5400 fi
1.5401
1.5402
1.5403 -if test "x$with_override_langtools" != x; then
1.5404 + if test "x$with_override_langtools" != x; then
1.5405 CURDIR="$PWD"
1.5406 cd "$with_override_langtools"
1.5407 LANGTOOLS_TOPDIR="`pwd`"
1.5408 cd "$CURDIR"
1.5409 if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
1.5410 - as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
1.5411 + as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
1.5412 fi
1.5413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5
1.5414 $as_echo_n "checking if langtools should be overridden... " >&6; }
1.5415 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $LANGTOOLS_TOPDIR" >&5
1.5416 $as_echo "yes with $LANGTOOLS_TOPDIR" >&6; }
1.5417 -fi
1.5418 -if test "x$with_override_corba" != x; then
1.5419 + fi
1.5420 + if test "x$with_override_corba" != x; then
1.5421 CURDIR="$PWD"
1.5422 cd "$with_override_corba"
1.5423 CORBA_TOPDIR="`pwd`"
1.5424 cd "$CURDIR"
1.5425 if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
1.5426 - as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
1.5427 + as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
1.5428 fi
1.5429 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5
1.5430 $as_echo_n "checking if corba should be overridden... " >&6; }
1.5431 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $CORBA_TOPDIR" >&5
1.5432 $as_echo "yes with $CORBA_TOPDIR" >&6; }
1.5433 -fi
1.5434 -if test "x$with_override_jaxp" != x; then
1.5435 + fi
1.5436 + if test "x$with_override_jaxp" != x; then
1.5437 CURDIR="$PWD"
1.5438 cd "$with_override_jaxp"
1.5439 JAXP_TOPDIR="`pwd`"
1.5440 cd "$CURDIR"
1.5441 if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
1.5442 - as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
1.5443 + as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
1.5444 fi
1.5445 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5
1.5446 $as_echo_n "checking if jaxp should be overridden... " >&6; }
1.5447 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JAXP_TOPDIR" >&5
1.5448 $as_echo "yes with $JAXP_TOPDIR" >&6; }
1.5449 -fi
1.5450 -if test "x$with_override_jaxws" != x; then
1.5451 + fi
1.5452 + if test "x$with_override_jaxws" != x; then
1.5453 CURDIR="$PWD"
1.5454 cd "$with_override_jaxws"
1.5455 JAXWS_TOPDIR="`pwd`"
1.5456 cd "$CURDIR"
1.5457 if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
1.5458 - as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
1.5459 + as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
1.5460 fi
1.5461 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5
1.5462 $as_echo_n "checking if jaxws should be overridden... " >&6; }
1.5463 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JAXWS_TOPDIR" >&5
1.5464 $as_echo "yes with $JAXWS_TOPDIR" >&6; }
1.5465 -fi
1.5466 -if test "x$with_override_hotspot" != x; then
1.5467 + fi
1.5468 + if test "x$with_override_hotspot" != x; then
1.5469 CURDIR="$PWD"
1.5470 cd "$with_override_hotspot"
1.5471 HOTSPOT_TOPDIR="`pwd`"
1.5472 cd "$CURDIR"
1.5473 if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
1.5474 - ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
1.5475 - as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5
1.5476 + ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
1.5477 + as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5
1.5478 fi
1.5479 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5
1.5480 $as_echo_n "checking if hotspot should be overridden... " >&6; }
1.5481 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5
1.5482 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
1.5483 -fi
1.5484 -if test "x$with_override_nashorn" != x; then
1.5485 + fi
1.5486 + if test "x$with_override_nashorn" != x; then
1.5487 CURDIR="$PWD"
1.5488 cd "$with_override_nashorn"
1.5489 NASHORN_TOPDIR="`pwd`"
1.5490 cd "$CURDIR"
1.5491 if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
1.5492 - as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
1.5493 + as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
1.5494 fi
1.5495 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
1.5496 $as_echo_n "checking if nashorn should be overridden... " >&6; }
1.5497 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5
1.5498 $as_echo "yes with $NASHORN_TOPDIR" >&6; }
1.5499 -fi
1.5500 -if test "x$with_override_jdk" != x; then
1.5501 + fi
1.5502 + if test "x$with_override_jdk" != x; then
1.5503 CURDIR="$PWD"
1.5504 cd "$with_override_jdk"
1.5505 JDK_TOPDIR="`pwd`"
1.5506 cd "$CURDIR"
1.5507 if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
1.5508 - as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5
1.5509 + as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5
1.5510 fi
1.5511 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if JDK should be overridden" >&5
1.5512 $as_echo_n "checking if JDK should be overridden... " >&6; }
1.5513 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JDK_TOPDIR" >&5
1.5514 $as_echo "yes with $JDK_TOPDIR" >&6; }
1.5515 -fi
1.5516 -
1.5517 -
1.5518 -
1.5519 -BUILD_OUTPUT="$OUTPUT_ROOT"
1.5520 -
1.5521 -
1.5522 -HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
1.5523 -BUILD_HOTSPOT=true
1.5524 + fi
1.5525 +
1.5526 +
1.5527 + BUILD_OUTPUT="$OUTPUT_ROOT"
1.5528 +
1.5529 +
1.5530 + HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
1.5531 + BUILD_HOTSPOT=true
1.5532
1.5533
1.5534
1.5535 @@ -16330,22 +16326,22 @@
1.5536 withval=$with_import_hotspot;
1.5537 fi
1.5538
1.5539 -if test "x$with_import_hotspot" != x; then
1.5540 + if test "x$with_import_hotspot" != x; then
1.5541 CURDIR="$PWD"
1.5542 cd "$with_import_hotspot"
1.5543 HOTSPOT_DIST="`pwd`"
1.5544 cd "$CURDIR"
1.5545 if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then
1.5546 - as_fn_error $? "You have to import hotspot from a full jdk image or hotspot build dist dir!" "$LINENO" 5
1.5547 + as_fn_error $? "You have to import hotspot from a full jdk image or hotspot build dist dir!" "$LINENO" 5
1.5548 fi
1.5549 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be imported" >&5
1.5550 $as_echo_n "checking if hotspot should be imported... " >&6; }
1.5551 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes from $HOTSPOT_DIST" >&5
1.5552 $as_echo "yes from $HOTSPOT_DIST" >&6; }
1.5553 BUILD_HOTSPOT=false
1.5554 -fi
1.5555 -
1.5556 -JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
1.5557 + fi
1.5558 +
1.5559 + JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
1.5560
1.5561
1.5562 ###############################################################################
1.5563 @@ -16356,26 +16352,26 @@
1.5564 ###############################################################################
1.5565
1.5566
1.5567 -###############################################################################
1.5568 -#
1.5569 -# Configure the development tool paths and potential sysroot.
1.5570 -#
1.5571 -ac_ext=cpp
1.5572 + ###############################################################################
1.5573 + #
1.5574 + # Configure the development tool paths and potential sysroot.
1.5575 + #
1.5576 + ac_ext=cpp
1.5577 ac_cpp='$CXXCPP $CPPFLAGS'
1.5578 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.5579 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.5580 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.5581
1.5582
1.5583 -# The option used to specify the target .o,.a or .so file.
1.5584 -# When compiling, how to specify the to be created object file.
1.5585 -CC_OUT_OPTION='-o$(SPACE)'
1.5586 -# When linking, how to specify the to be created executable.
1.5587 -EXE_OUT_OPTION='-o$(SPACE)'
1.5588 -# When linking, how to specify the to be created dynamically linkable library.
1.5589 -LD_OUT_OPTION='-o$(SPACE)'
1.5590 -# When archiving, how to specify the to be create static archive for object files.
1.5591 -AR_OUT_OPTION='rcs$(SPACE)'
1.5592 + # The option used to specify the target .o,.a or .so file.
1.5593 + # When compiling, how to specify the to be created object file.
1.5594 + CC_OUT_OPTION='-o$(SPACE)'
1.5595 + # When linking, how to specify the to be created executable.
1.5596 + EXE_OUT_OPTION='-o$(SPACE)'
1.5597 + # When linking, how to specify the to be created dynamically linkable library.
1.5598 + LD_OUT_OPTION='-o$(SPACE)'
1.5599 + # When archiving, how to specify the to be create static archive for object files.
1.5600 + AR_OUT_OPTION='rcs$(SPACE)'
1.5601
1.5602
1.5603
1.5604 @@ -16544,7 +16540,7 @@
1.5605 else
1.5606 # try to find jtreg on path
1.5607
1.5608 - for ac_prog in jtreg
1.5609 + for ac_prog in jtreg
1.5610 do
1.5611 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.5612 set dummy $ac_prog; ac_word=$2
1.5613 @@ -16590,16 +16586,16 @@
1.5614 done
1.5615
1.5616
1.5617 - if test "x$JTREGEXE" = x; then
1.5618 - if test "xjtreg" = x; then
1.5619 - PROG_NAME=jtregexe
1.5620 - else
1.5621 - PROG_NAME=jtreg
1.5622 - fi
1.5623 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.5624 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.5625 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.5626 - fi
1.5627 + if test "x$JTREGEXE" = x; then
1.5628 + if test "xjtreg" = x; then
1.5629 + PROG_NAME=jtregexe
1.5630 + else
1.5631 + PROG_NAME=jtreg
1.5632 + fi
1.5633 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.5634 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.5635 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.5636 + fi
1.5637
1.5638
1.5639 JT_HOME="`$DIRNAME $JTREGEXE`"
1.5640 @@ -16610,7 +16606,7 @@
1.5641
1.5642
1.5643
1.5644 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.5645 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.5646
1.5647 # Store path to cygwin link.exe to help excluding it when searching for
1.5648 # VS linker. This must be done before changing the PATH when looking for VS.
1.5649 @@ -17065,8 +17061,8 @@
1.5650 # bat and cmd files are not always considered executable in cygwin causing which
1.5651 # to not find them
1.5652 if test "x$new_path" = x \
1.5653 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5654 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5655 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5656 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5657 new_path=`$CYGPATH -u "$path"`
1.5658 fi
1.5659 if test "x$new_path" = x; then
1.5660 @@ -17081,8 +17077,8 @@
1.5661 # bat and cmd files are not always considered executable in cygwin causing which
1.5662 # to not find them
1.5663 if test "x$new_path" = x \
1.5664 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5665 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5666 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5667 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5668 new_path=`$CYGPATH -u "$path"`
1.5669 fi
1.5670 if test "x$new_path" = x; then
1.5671 @@ -17110,9 +17106,9 @@
1.5672 # Short path failed, file does not exist as specified.
1.5673 # Try adding .exe or .cmd
1.5674 if test -f "${new_path}.exe"; then
1.5675 - input_to_shortpath="${new_path}.exe"
1.5676 + input_to_shortpath="${new_path}.exe"
1.5677 elif test -f "${new_path}.cmd"; then
1.5678 - input_to_shortpath="${new_path}.cmd"
1.5679 + input_to_shortpath="${new_path}.cmd"
1.5680 else
1.5681 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$new_path\", is invalid." >&5
1.5682 $as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$new_path\", is invalid." >&6;}
1.5683 @@ -17288,29 +17284,29 @@
1.5684 fi
1.5685
1.5686 if test "x$new_path" = x; then
1.5687 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5
1.5688 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5
1.5689 $as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&6;}
1.5690 - has_space=`$ECHO "$complete" | $GREP " "`
1.5691 - if test "x$has_space" != x; then
1.5692 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5693 + has_space=`$ECHO "$complete" | $GREP " "`
1.5694 + if test "x$has_space" != x; then
1.5695 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5696 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.5697 - fi
1.5698 - as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
1.5699 - fi
1.5700 - fi
1.5701 -
1.5702 - # Now join together the path and the arguments once again
1.5703 - if test "x$arguments" != xEOL; then
1.5704 - new_complete="$new_path ${arguments% *}"
1.5705 - else
1.5706 - new_complete="$new_path"
1.5707 - fi
1.5708 + fi
1.5709 + as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
1.5710 + fi
1.5711 + fi
1.5712 +
1.5713 + # Now join together the path and the arguments once again
1.5714 + if test "x$arguments" != xEOL; then
1.5715 + new_complete="$new_path ${arguments% *}"
1.5716 + else
1.5717 + new_complete="$new_path"
1.5718 + fi
1.5719
1.5720 if test "x$complete" != "x$new_complete"; then
1.5721 - VS_ENV_CMD="$new_complete"
1.5722 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting VS_ENV_CMD to \"$new_complete\"" >&5
1.5723 + VS_ENV_CMD="$new_complete"
1.5724 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting VS_ENV_CMD to \"$new_complete\"" >&5
1.5725 $as_echo "$as_me: Rewriting VS_ENV_CMD to \"$new_complete\"" >&6;}
1.5726 - fi
1.5727 + fi
1.5728
1.5729
1.5730 # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
1.5731 @@ -17626,21 +17622,21 @@
1.5732 fi
1.5733
1.5734
1.5735 -fi
1.5736 -
1.5737 -
1.5738 -
1.5739 -# If --build AND --host is set, then the configure script will find any
1.5740 -# cross compilation tools in the PATH. Cross compilation tools
1.5741 -# follows the cross compilation standard where they are prefixed with ${host}.
1.5742 -# For example the binary i686-sun-solaris2.10-gcc
1.5743 -# will cross compile for i686-sun-solaris2.10
1.5744 -# If neither of build and host is not set, then build=host and the
1.5745 -# default compiler found in the path will be used.
1.5746 -# Setting only --host, does not seem to be really supported.
1.5747 -# Please set both --build and --host if you want to cross compile.
1.5748 -
1.5749 -if test "x$COMPILE_TYPE" = "xcross"; then
1.5750 + fi
1.5751 +
1.5752 +
1.5753 +
1.5754 + # If --build AND --host is set, then the configure script will find any
1.5755 + # cross compilation tools in the PATH. Cross compilation tools
1.5756 + # follows the cross compilation standard where they are prefixed with ${host}.
1.5757 + # For example the binary i686-sun-solaris2.10-gcc
1.5758 + # will cross compile for i686-sun-solaris2.10
1.5759 + # If neither of build and host is not set, then build=host and the
1.5760 + # default compiler found in the path will be used.
1.5761 + # Setting only --host, does not seem to be really supported.
1.5762 + # Please set both --build and --host if you want to cross compile.
1.5763 +
1.5764 + if test "x$COMPILE_TYPE" = "xcross"; then
1.5765 # Now we to find a C/C++ compiler that can build executables for the build
1.5766 # platform. We can't use the AC_PROG_CC macro, since it can only be used
1.5767 # once. Also, we need to do this before adding a tools dir to the path,
1.5768 @@ -17711,8 +17707,8 @@
1.5769 # bat and cmd files are not always considered executable in cygwin causing which
1.5770 # to not find them
1.5771 if test "x$new_path" = x \
1.5772 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5773 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5774 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5775 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5776 new_path=`$CYGPATH -u "$path"`
1.5777 fi
1.5778 if test "x$new_path" = x; then
1.5779 @@ -17727,8 +17723,8 @@
1.5780 # bat and cmd files are not always considered executable in cygwin causing which
1.5781 # to not find them
1.5782 if test "x$new_path" = x \
1.5783 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5784 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5785 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5786 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5787 new_path=`$CYGPATH -u "$path"`
1.5788 fi
1.5789 if test "x$new_path" = x; then
1.5790 @@ -17756,9 +17752,9 @@
1.5791 # Short path failed, file does not exist as specified.
1.5792 # Try adding .exe or .cmd
1.5793 if test -f "${new_path}.exe"; then
1.5794 - input_to_shortpath="${new_path}.exe"
1.5795 + input_to_shortpath="${new_path}.exe"
1.5796 elif test -f "${new_path}.cmd"; then
1.5797 - input_to_shortpath="${new_path}.cmd"
1.5798 + input_to_shortpath="${new_path}.cmd"
1.5799 else
1.5800 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&5
1.5801 $as_echo "$as_me: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&6;}
1.5802 @@ -17934,29 +17930,29 @@
1.5803 fi
1.5804
1.5805 if test "x$new_path" = x; then
1.5806 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
1.5807 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
1.5808 $as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
1.5809 - has_space=`$ECHO "$complete" | $GREP " "`
1.5810 - if test "x$has_space" != x; then
1.5811 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5812 + has_space=`$ECHO "$complete" | $GREP " "`
1.5813 + if test "x$has_space" != x; then
1.5814 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5815 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.5816 - fi
1.5817 - as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.5818 - fi
1.5819 - fi
1.5820 -
1.5821 - # Now join together the path and the arguments once again
1.5822 - if test "x$arguments" != xEOL; then
1.5823 - new_complete="$new_path ${arguments% *}"
1.5824 - else
1.5825 - new_complete="$new_path"
1.5826 - fi
1.5827 + fi
1.5828 + as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.5829 + fi
1.5830 + fi
1.5831 +
1.5832 + # Now join together the path and the arguments once again
1.5833 + if test "x$arguments" != xEOL; then
1.5834 + new_complete="$new_path ${arguments% *}"
1.5835 + else
1.5836 + new_complete="$new_path"
1.5837 + fi
1.5838
1.5839 if test "x$complete" != "x$new_complete"; then
1.5840 - BUILD_CC="$new_complete"
1.5841 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5
1.5842 + BUILD_CC="$new_complete"
1.5843 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5
1.5844 $as_echo "$as_me: Rewriting BUILD_CC to \"$new_complete\"" >&6;}
1.5845 - fi
1.5846 + fi
1.5847
1.5848 for ac_prog in cl CC g++
1.5849 do
1.5850 @@ -18022,8 +18018,8 @@
1.5851 # bat and cmd files are not always considered executable in cygwin causing which
1.5852 # to not find them
1.5853 if test "x$new_path" = x \
1.5854 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5855 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5856 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5857 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5858 new_path=`$CYGPATH -u "$path"`
1.5859 fi
1.5860 if test "x$new_path" = x; then
1.5861 @@ -18038,8 +18034,8 @@
1.5862 # bat and cmd files are not always considered executable in cygwin causing which
1.5863 # to not find them
1.5864 if test "x$new_path" = x \
1.5865 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5866 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5867 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5868 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5869 new_path=`$CYGPATH -u "$path"`
1.5870 fi
1.5871 if test "x$new_path" = x; then
1.5872 @@ -18067,9 +18063,9 @@
1.5873 # Short path failed, file does not exist as specified.
1.5874 # Try adding .exe or .cmd
1.5875 if test -f "${new_path}.exe"; then
1.5876 - input_to_shortpath="${new_path}.exe"
1.5877 + input_to_shortpath="${new_path}.exe"
1.5878 elif test -f "${new_path}.cmd"; then
1.5879 - input_to_shortpath="${new_path}.cmd"
1.5880 + input_to_shortpath="${new_path}.cmd"
1.5881 else
1.5882 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&5
1.5883 $as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&6;}
1.5884 @@ -18245,29 +18241,29 @@
1.5885 fi
1.5886
1.5887 if test "x$new_path" = x; then
1.5888 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
1.5889 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
1.5890 $as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
1.5891 - has_space=`$ECHO "$complete" | $GREP " "`
1.5892 - if test "x$has_space" != x; then
1.5893 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5894 + has_space=`$ECHO "$complete" | $GREP " "`
1.5895 + if test "x$has_space" != x; then
1.5896 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5897 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.5898 - fi
1.5899 - as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.5900 - fi
1.5901 - fi
1.5902 -
1.5903 - # Now join together the path and the arguments once again
1.5904 - if test "x$arguments" != xEOL; then
1.5905 - new_complete="$new_path ${arguments% *}"
1.5906 - else
1.5907 - new_complete="$new_path"
1.5908 - fi
1.5909 + fi
1.5910 + as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.5911 + fi
1.5912 + fi
1.5913 +
1.5914 + # Now join together the path and the arguments once again
1.5915 + if test "x$arguments" != xEOL; then
1.5916 + new_complete="$new_path ${arguments% *}"
1.5917 + else
1.5918 + new_complete="$new_path"
1.5919 + fi
1.5920
1.5921 if test "x$complete" != "x$new_complete"; then
1.5922 - BUILD_CXX="$new_complete"
1.5923 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5
1.5924 + BUILD_CXX="$new_complete"
1.5925 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5
1.5926 $as_echo "$as_me: Rewriting BUILD_CXX to \"$new_complete\"" >&6;}
1.5927 - fi
1.5928 + fi
1.5929
1.5930 # Extract the first word of "ld", so it can be a program name with args.
1.5931 set dummy ld; ac_word=$2
1.5932 @@ -18328,8 +18324,8 @@
1.5933 # bat and cmd files are not always considered executable in cygwin causing which
1.5934 # to not find them
1.5935 if test "x$new_path" = x \
1.5936 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5937 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5938 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5939 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5940 new_path=`$CYGPATH -u "$path"`
1.5941 fi
1.5942 if test "x$new_path" = x; then
1.5943 @@ -18344,8 +18340,8 @@
1.5944 # bat and cmd files are not always considered executable in cygwin causing which
1.5945 # to not find them
1.5946 if test "x$new_path" = x \
1.5947 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5948 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5949 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5950 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5951 new_path=`$CYGPATH -u "$path"`
1.5952 fi
1.5953 if test "x$new_path" = x; then
1.5954 @@ -18373,9 +18369,9 @@
1.5955 # Short path failed, file does not exist as specified.
1.5956 # Try adding .exe or .cmd
1.5957 if test -f "${new_path}.exe"; then
1.5958 - input_to_shortpath="${new_path}.exe"
1.5959 + input_to_shortpath="${new_path}.exe"
1.5960 elif test -f "${new_path}.cmd"; then
1.5961 - input_to_shortpath="${new_path}.cmd"
1.5962 + input_to_shortpath="${new_path}.cmd"
1.5963 else
1.5964 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&5
1.5965 $as_echo "$as_me: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&6;}
1.5966 @@ -18551,219 +18547,220 @@
1.5967 fi
1.5968
1.5969 if test "x$new_path" = x; then
1.5970 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
1.5971 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
1.5972 $as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
1.5973 - has_space=`$ECHO "$complete" | $GREP " "`
1.5974 - if test "x$has_space" != x; then
1.5975 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5976 + has_space=`$ECHO "$complete" | $GREP " "`
1.5977 + if test "x$has_space" != x; then
1.5978 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5979 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.5980 - fi
1.5981 - as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.5982 - fi
1.5983 - fi
1.5984 -
1.5985 - # Now join together the path and the arguments once again
1.5986 - if test "x$arguments" != xEOL; then
1.5987 - new_complete="$new_path ${arguments% *}"
1.5988 - else
1.5989 - new_complete="$new_path"
1.5990 - fi
1.5991 + fi
1.5992 + as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.5993 + fi
1.5994 + fi
1.5995 +
1.5996 + # Now join together the path and the arguments once again
1.5997 + if test "x$arguments" != xEOL; then
1.5998 + new_complete="$new_path ${arguments% *}"
1.5999 + else
1.6000 + new_complete="$new_path"
1.6001 + fi
1.6002
1.6003 if test "x$complete" != "x$new_complete"; then
1.6004 - BUILD_LD="$new_complete"
1.6005 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5
1.6006 + BUILD_LD="$new_complete"
1.6007 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5
1.6008 $as_echo "$as_me: Rewriting BUILD_LD to \"$new_complete\"" >&6;}
1.6009 - fi
1.6010 -
1.6011 -fi
1.6012 -
1.6013 -
1.6014 -
1.6015 -
1.6016 -# If a devkit is found on the builddeps server, then prepend its path to the
1.6017 -# PATH variable. If there are cross compilers available in the devkit, these
1.6018 -# will be found by AC_PROG_CC et al.
1.6019 -DEVKIT=
1.6020 -
1.6021 -
1.6022 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.6023 - # Source the builddeps file again, to make sure it uses the latest variables!
1.6024 - . $builddepsfile
1.6025 - # Look for a target and build machine specific resource!
1.6026 - eval resource=\${builddep_devkit_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.6027 - if test "x$resource" = x; then
1.6028 - # Ok, lets instead look for a target specific resource
1.6029 - eval resource=\${builddep_devkit_TARGET_${rewritten_target_var}}
1.6030 - fi
1.6031 - if test "x$resource" = x; then
1.6032 - # Ok, lets instead look for a build specific resource
1.6033 - eval resource=\${builddep_devkit_BUILD_${rewritten_build_var}}
1.6034 - fi
1.6035 - if test "x$resource" = x; then
1.6036 - # Ok, lets instead look for a generic resource
1.6037 - # (The devkit comes from M4 and not the shell, thus no need for eval here.)
1.6038 - resource=${builddep_devkit}
1.6039 - fi
1.6040 - if test "x$resource" != x; then
1.6041 - { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for devkit" >&5
1.6042 + fi
1.6043 +
1.6044 + fi
1.6045 +
1.6046 +
1.6047 +
1.6048 +
1.6049 + # If a devkit is found on the builddeps server, then prepend its path to the
1.6050 + # PATH variable. If there are cross compilers available in the devkit, these
1.6051 + # will be found by AC_PROG_CC et al.
1.6052 + DEVKIT=
1.6053 +
1.6054 +
1.6055 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.6056 + # Source the builddeps file again, to make sure it uses the latest variables!
1.6057 + . $builddepsfile
1.6058 + # Look for a target and build machine specific resource!
1.6059 + eval resource=\${builddep_devkit_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.6060 + if test "x$resource" = x; then
1.6061 + # Ok, lets instead look for a target specific resource
1.6062 + eval resource=\${builddep_devkit_TARGET_${rewritten_target_var}}
1.6063 + fi
1.6064 + if test "x$resource" = x; then
1.6065 + # Ok, lets instead look for a build specific resource
1.6066 + eval resource=\${builddep_devkit_BUILD_${rewritten_build_var}}
1.6067 + fi
1.6068 + if test "x$resource" = x; then
1.6069 + # Ok, lets instead look for a generic resource
1.6070 + # (The devkit comes from M4 and not the shell, thus no need for eval here.)
1.6071 + resource=${builddep_devkit}
1.6072 + fi
1.6073 + if test "x$resource" != x; then
1.6074 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for devkit" >&5
1.6075 $as_echo "$as_me: Using builddeps $resource for devkit" >&6;}
1.6076 - # If the resource in the builddeps.conf file is an existing directory,
1.6077 - # for example /java/linux/cups
1.6078 - if test -d ${resource}; then
1.6079 - depdir=${resource}
1.6080 - else
1.6081 -
1.6082 -# devkit is for example mymodule
1.6083 -# $resource is for example libs/general/libmymod_1_2_3.zip
1.6084 -# $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.6085 -# $with_builddeps_dir is for example /localhome/builddeps
1.6086 -# depdir is the name of the variable into which we store the depdir, eg MYMOD
1.6087 -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.6088 -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.6089 - filename=`basename $resource`
1.6090 - filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.6091 - filebase=${filename%%.*}
1.6092 - extension=${filename#*.}
1.6093 - installdir=$with_builddeps_dir/$filebase
1.6094 - if test ! -f $installdir/$filename.unpacked; then
1.6095 - { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency devkit from $with_builddeps_server/$resource and installing into $installdir" >&5
1.6096 + # If the resource in the builddeps.conf file is an existing directory,
1.6097 + # for example /java/linux/cups
1.6098 + if test -d ${resource}; then
1.6099 + depdir=${resource}
1.6100 + else
1.6101 +
1.6102 + # devkit is for example mymodule
1.6103 + # $resource is for example libs/general/libmymod_1_2_3.zip
1.6104 + # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.6105 + # $with_builddeps_dir is for example /localhome/builddeps
1.6106 + # depdir is the name of the variable into which we store the depdir, eg MYMOD
1.6107 + # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.6108 + # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.6109 + filename=`basename $resource`
1.6110 + filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.6111 + filebase=${filename%%.*}
1.6112 + extension=${filename#*.}
1.6113 + installdir=$with_builddeps_dir/$filebase
1.6114 + if test ! -f $installdir/$filename.unpacked; then
1.6115 + { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency devkit from $with_builddeps_server/$resource and installing into $installdir" >&5
1.6116 $as_echo "$as_me: Downloading build dependency devkit from $with_builddeps_server/$resource and installing into $installdir" >&6;}
1.6117 - if test ! -d $installdir; then
1.6118 - mkdir -p $installdir
1.6119 - fi
1.6120 - if test ! -d $installdir; then
1.6121 - as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.6122 - fi
1.6123 - tmpfile=`mktemp $installdir/devkit.XXXXXXXXX`
1.6124 - touch $tmpfile
1.6125 - if test ! -f $tmpfile; then
1.6126 - as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.6127 - fi
1.6128 -
1.6129 - # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.6130 - # $tmpfile is the local file name for the downloaded file.
1.6131 - VALID_TOOL=no
1.6132 - if test "x$BDEPS_FTP" = xwget; then
1.6133 - VALID_TOOL=yes
1.6134 - wget -O $tmpfile $with_builddeps_server/$resource
1.6135 - fi
1.6136 - if test "x$BDEPS_FTP" = xlftp; then
1.6137 - VALID_TOOL=yes
1.6138 - lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.6139 - fi
1.6140 - if test "x$BDEPS_FTP" = xftp; then
1.6141 - VALID_TOOL=yes
1.6142 - FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.6143 - FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.6144 - FTPUSERPWD=${FTPSERVER%%@*}
1.6145 - if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.6146 - FTPUSER=${userpwd%%:*}
1.6147 - FTPPWD=${userpwd#*@}
1.6148 - FTPSERVER=${FTPSERVER#*@}
1.6149 - else
1.6150 - FTPUSER=ftp
1.6151 - FTPPWD=ftp
1.6152 - fi
1.6153 - # the "pass" command does not work on some
1.6154 - # ftp clients (read ftp.exe) but if it works,
1.6155 - # passive mode is better!
1.6156 - (\
1.6157 - echo "user $FTPUSER $FTPPWD" ;\
1.6158 - echo "pass" ;\
1.6159 - echo "bin" ;\
1.6160 - echo "get $FTPPATH $tmpfile" ;\
1.6161 - ) | ftp -in $FTPSERVER
1.6162 - fi
1.6163 - if test "x$VALID_TOOL" != xyes; then
1.6164 - as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.6165 - fi
1.6166 -
1.6167 - mv $tmpfile $installdir/$filename
1.6168 - if test ! -s $installdir/$filename; then
1.6169 - as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.6170 - fi
1.6171 - case "$extension" in
1.6172 - zip) echo "Unzipping $installdir/$filename..."
1.6173 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.6174 - ;;
1.6175 - tar.gz) echo "Untaring $installdir/$filename..."
1.6176 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.6177 - ;;
1.6178 - tgz) echo "Untaring $installdir/$filename..."
1.6179 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.6180 - ;;
1.6181 - *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.6182 - ;;
1.6183 - esac
1.6184 - fi
1.6185 - if test -f $installdir/$filename.unpacked; then
1.6186 - depdir=$installdir
1.6187 - fi
1.6188 -
1.6189 - fi
1.6190 - # Source the builddeps file again, because in the previous command, the depdir
1.6191 - # was updated to point at the current build dependency install directory.
1.6192 - . $builddepsfile
1.6193 - # Now extract variables from the builddeps.conf files.
1.6194 - theroot=${builddep_devkit_ROOT}
1.6195 - thecflags=${builddep_devkit_CFLAGS}
1.6196 - thelibs=${builddep_devkit_LIBS}
1.6197 - if test "x$depdir" = x; then
1.6198 - as_fn_error $? "Could not download build dependency devkit" "$LINENO" 5
1.6199 - fi
1.6200 - DEVKIT=$depdir
1.6201 - if test "x$theroot" != x; then
1.6202 - DEVKIT="$theroot"
1.6203 - fi
1.6204 - if test "x$thecflags" != x; then
1.6205 - DEVKIT_CFLAGS="$thecflags"
1.6206 - fi
1.6207 - if test "x$thelibs" != x; then
1.6208 - DEVKIT_LIBS="$thelibs"
1.6209 - fi
1.6210 - # Found devkit
1.6211 - PATH="$DEVKIT/bin:$PATH"
1.6212 - SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
1.6213 - if test "x$x_includes" = "xNONE"; then
1.6214 - x_includes="$SYS_ROOT/usr/include/X11"
1.6215 - fi
1.6216 - if test "x$x_libraries" = "xNONE"; then
1.6217 - x_libraries="$SYS_ROOT/usr/lib"
1.6218 - fi
1.6219 -
1.6220 -
1.6221 - fi
1.6222 -
1.6223 - fi
1.6224 -
1.6225 -
1.6226 -# Store the CFLAGS etal passed to the configure script.
1.6227 -ORG_CFLAGS="$CFLAGS"
1.6228 -ORG_CXXFLAGS="$CXXFLAGS"
1.6229 -ORG_OBJCFLAGS="$OBJCFLAGS"
1.6230 -
1.6231 -# autoconf magic only relies on PATH, so update it if tools dir is specified
1.6232 -OLD_PATH="$PATH"
1.6233 -if test "x$TOOLS_DIR" != x; then
1.6234 - PATH=$TOOLS_DIR:$PATH
1.6235 -fi
1.6236 -
1.6237 -
1.6238 -### Locate C compiler (CC)
1.6239 -
1.6240 -# On windows, only cl.exe is supported.
1.6241 -# On Solaris, cc is preferred to gcc.
1.6242 -# Elsewhere, gcc is preferred to cc.
1.6243 -
1.6244 -if test "x$CC" != x; then
1.6245 - COMPILER_CHECK_LIST="$CC"
1.6246 -elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.6247 - COMPILER_CHECK_LIST="cl"
1.6248 -elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.6249 - COMPILER_CHECK_LIST="cc gcc"
1.6250 -else
1.6251 - COMPILER_CHECK_LIST="gcc cc"
1.6252 -fi
1.6253 + if test ! -d $installdir; then
1.6254 + mkdir -p $installdir
1.6255 + fi
1.6256 + if test ! -d $installdir; then
1.6257 + as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.6258 + fi
1.6259 + tmpfile=`mktemp $installdir/devkit.XXXXXXXXX`
1.6260 + touch $tmpfile
1.6261 + if test ! -f $tmpfile; then
1.6262 + as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.6263 + fi
1.6264 +
1.6265 + # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.6266 + # $tmpfile is the local file name for the downloaded file.
1.6267 + VALID_TOOL=no
1.6268 + if test "x$BDEPS_FTP" = xwget; then
1.6269 + VALID_TOOL=yes
1.6270 + wget -O $tmpfile $with_builddeps_server/$resource
1.6271 + fi
1.6272 + if test "x$BDEPS_FTP" = xlftp; then
1.6273 + VALID_TOOL=yes
1.6274 + lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.6275 + fi
1.6276 + if test "x$BDEPS_FTP" = xftp; then
1.6277 + VALID_TOOL=yes
1.6278 + FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.6279 + FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.6280 + FTPUSERPWD=${FTPSERVER%%@*}
1.6281 + if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.6282 + FTPUSER=${userpwd%%:*}
1.6283 + FTPPWD=${userpwd#*@}
1.6284 + FTPSERVER=${FTPSERVER#*@}
1.6285 + else
1.6286 + FTPUSER=ftp
1.6287 + FTPPWD=ftp
1.6288 + fi
1.6289 + # the "pass" command does not work on some
1.6290 + # ftp clients (read ftp.exe) but if it works,
1.6291 + # passive mode is better!
1.6292 + ( \
1.6293 + echo "user $FTPUSER $FTPPWD" ; \
1.6294 + echo "pass" ; \
1.6295 + echo "bin" ; \
1.6296 + echo "get $FTPPATH $tmpfile" ; \
1.6297 + ) | ftp -in $FTPSERVER
1.6298 + fi
1.6299 + if test "x$VALID_TOOL" != xyes; then
1.6300 + as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.6301 + fi
1.6302 +
1.6303 + mv $tmpfile $installdir/$filename
1.6304 + if test ! -s $installdir/$filename; then
1.6305 + as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.6306 + fi
1.6307 + case "$extension" in
1.6308 + zip) echo "Unzipping $installdir/$filename..."
1.6309 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.6310 + ;;
1.6311 + tar.gz) echo "Untaring $installdir/$filename..."
1.6312 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.6313 + ;;
1.6314 + tgz) echo "Untaring $installdir/$filename..."
1.6315 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.6316 + ;;
1.6317 + *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.6318 + ;;
1.6319 + esac
1.6320 + fi
1.6321 + if test -f $installdir/$filename.unpacked; then
1.6322 + depdir=$installdir
1.6323 + fi
1.6324 +
1.6325 + fi
1.6326 + # Source the builddeps file again, because in the previous command, the depdir
1.6327 + # was updated to point at the current build dependency install directory.
1.6328 + . $builddepsfile
1.6329 + # Now extract variables from the builddeps.conf files.
1.6330 + theroot=${builddep_devkit_ROOT}
1.6331 + thecflags=${builddep_devkit_CFLAGS}
1.6332 + thelibs=${builddep_devkit_LIBS}
1.6333 + if test "x$depdir" = x; then
1.6334 + as_fn_error $? "Could not download build dependency devkit" "$LINENO" 5
1.6335 + fi
1.6336 + DEVKIT=$depdir
1.6337 + if test "x$theroot" != x; then
1.6338 + DEVKIT="$theroot"
1.6339 + fi
1.6340 + if test "x$thecflags" != x; then
1.6341 + DEVKIT_CFLAGS="$thecflags"
1.6342 + fi
1.6343 + if test "x$thelibs" != x; then
1.6344 + DEVKIT_LIBS="$thelibs"
1.6345 + fi
1.6346 +
1.6347 + # Found devkit
1.6348 + PATH="$DEVKIT/bin:$PATH"
1.6349 + SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
1.6350 + if test "x$x_includes" = "xNONE"; then
1.6351 + x_includes="$SYS_ROOT/usr/include/X11"
1.6352 + fi
1.6353 + if test "x$x_libraries" = "xNONE"; then
1.6354 + x_libraries="$SYS_ROOT/usr/lib"
1.6355 + fi
1.6356 +
1.6357 +
1.6358 + fi
1.6359 +
1.6360 + fi
1.6361 +
1.6362 +
1.6363 + # Store the CFLAGS etal passed to the configure script.
1.6364 + ORG_CFLAGS="$CFLAGS"
1.6365 + ORG_CXXFLAGS="$CXXFLAGS"
1.6366 + ORG_OBJCFLAGS="$OBJCFLAGS"
1.6367 +
1.6368 + # autoconf magic only relies on PATH, so update it if tools dir is specified
1.6369 + OLD_PATH="$PATH"
1.6370 + if test "x$TOOLS_DIR" != x; then
1.6371 + PATH=$TOOLS_DIR:$PATH
1.6372 + fi
1.6373 +
1.6374 +
1.6375 + ### Locate C compiler (CC)
1.6376 +
1.6377 + # On windows, only cl.exe is supported.
1.6378 + # On Solaris, cc is preferred to gcc.
1.6379 + # Elsewhere, gcc is preferred to cc.
1.6380 +
1.6381 + if test "x$CC" != x; then
1.6382 + COMPILER_CHECK_LIST="$CC"
1.6383 + elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.6384 + COMPILER_CHECK_LIST="cl"
1.6385 + elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.6386 + COMPILER_CHECK_LIST="cc gcc"
1.6387 + else
1.6388 + COMPILER_CHECK_LIST="gcc cc"
1.6389 + fi
1.6390
1.6391
1.6392 COMPILER_NAME=C
1.6393 @@ -18876,31 +18873,31 @@
1.6394
1.6395 if test "x$CC" = x; then
1.6396
1.6397 - # Print a helpful message on how to acquire the necessary build dependency.
1.6398 - # devkit is the help tag: freetyp2, cups, pulse, alsa etc
1.6399 - MISSING_DEPENDENCY=devkit
1.6400 - PKGHANDLER_COMMAND=
1.6401 -
1.6402 - case $PKGHANDLER in
1.6403 - apt-get)
1.6404 - apt_help $MISSING_DEPENDENCY ;;
1.6405 + # Print a helpful message on how to acquire the necessary build dependency.
1.6406 + # devkit is the help tag: freetyp2, cups, pulse, alsa etc
1.6407 + MISSING_DEPENDENCY=devkit
1.6408 + PKGHANDLER_COMMAND=
1.6409 +
1.6410 + case $PKGHANDLER in
1.6411 + apt-get)
1.6412 + apt_help $MISSING_DEPENDENCY ;;
1.6413 yum)
1.6414 - yum_help $MISSING_DEPENDENCY ;;
1.6415 - port)
1.6416 - port_help $MISSING_DEPENDENCY ;;
1.6417 - pkgutil)
1.6418 - pkgutil_help $MISSING_DEPENDENCY ;;
1.6419 - pkgadd)
1.6420 - pkgadd_help $MISSING_DEPENDENCY ;;
1.6421 + yum_help $MISSING_DEPENDENCY ;;
1.6422 + port)
1.6423 + port_help $MISSING_DEPENDENCY ;;
1.6424 + pkgutil)
1.6425 + pkgutil_help $MISSING_DEPENDENCY ;;
1.6426 + pkgadd)
1.6427 + pkgadd_help $MISSING_DEPENDENCY ;;
1.6428 * )
1.6429 break ;;
1.6430 - esac
1.6431 -
1.6432 - if test "x$PKGHANDLER_COMMAND" != x; then
1.6433 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.6434 - fi
1.6435 -
1.6436 - as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.6437 + esac
1.6438 +
1.6439 + if test "x$PKGHANDLER_COMMAND" != x; then
1.6440 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.6441 + fi
1.6442 +
1.6443 + as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.6444 fi
1.6445
1.6446 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.6447 @@ -18921,8 +18918,8 @@
1.6448 # bat and cmd files are not always considered executable in cygwin causing which
1.6449 # to not find them
1.6450 if test "x$new_path" = x \
1.6451 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6452 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6453 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6454 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6455 new_path=`$CYGPATH -u "$path"`
1.6456 fi
1.6457 if test "x$new_path" = x; then
1.6458 @@ -18937,8 +18934,8 @@
1.6459 # bat and cmd files are not always considered executable in cygwin causing which
1.6460 # to not find them
1.6461 if test "x$new_path" = x \
1.6462 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6463 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6464 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6465 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6466 new_path=`$CYGPATH -u "$path"`
1.6467 fi
1.6468 if test "x$new_path" = x; then
1.6469 @@ -18966,9 +18963,9 @@
1.6470 # Short path failed, file does not exist as specified.
1.6471 # Try adding .exe or .cmd
1.6472 if test -f "${new_path}.exe"; then
1.6473 - input_to_shortpath="${new_path}.exe"
1.6474 + input_to_shortpath="${new_path}.exe"
1.6475 elif test -f "${new_path}.cmd"; then
1.6476 - input_to_shortpath="${new_path}.cmd"
1.6477 + input_to_shortpath="${new_path}.cmd"
1.6478 else
1.6479 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$new_path\", is invalid." >&5
1.6480 $as_echo "$as_me: The path of CC, which resolves as \"$new_path\", is invalid." >&6;}
1.6481 @@ -19144,80 +19141,80 @@
1.6482 fi
1.6483
1.6484 if test "x$new_path" = x; then
1.6485 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5
1.6486 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5
1.6487 $as_echo "$as_me: The path of CC, which resolves as \"$complete\", is not found." >&6;}
1.6488 - has_space=`$ECHO "$complete" | $GREP " "`
1.6489 - if test "x$has_space" != x; then
1.6490 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.6491 + has_space=`$ECHO "$complete" | $GREP " "`
1.6492 + if test "x$has_space" != x; then
1.6493 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.6494 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.6495 - fi
1.6496 - as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
1.6497 - fi
1.6498 - fi
1.6499 -
1.6500 - # Now join together the path and the arguments once again
1.6501 - if test "x$arguments" != xEOL; then
1.6502 - new_complete="$new_path ${arguments% *}"
1.6503 - else
1.6504 - new_complete="$new_path"
1.6505 - fi
1.6506 + fi
1.6507 + as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
1.6508 + fi
1.6509 + fi
1.6510 +
1.6511 + # Now join together the path and the arguments once again
1.6512 + if test "x$arguments" != xEOL; then
1.6513 + new_complete="$new_path ${arguments% *}"
1.6514 + else
1.6515 + new_complete="$new_path"
1.6516 + fi
1.6517
1.6518 if test "x$complete" != "x$new_complete"; then
1.6519 - CC="$new_complete"
1.6520 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5
1.6521 + CC="$new_complete"
1.6522 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5
1.6523 $as_echo "$as_me: Rewriting CC to \"$new_complete\"" >&6;}
1.6524 - fi
1.6525 + fi
1.6526
1.6527 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5
1.6528 $as_echo_n "checking resolved symbolic links for CC... " >&6; }
1.6529 TEST_COMPILER="$CC"
1.6530
1.6531 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.6532 - # Follow a chain of symbolic links. Use readlink
1.6533 - # where it exists, else fall back to horribly
1.6534 - # complicated shell code.
1.6535 - if test "x$READLINK_TESTED" != yes; then
1.6536 - # On MacOSX there is a readlink tool with a different
1.6537 - # purpose than the GNU readlink tool. Check the found readlink.
1.6538 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.6539 - if test "x$ISGNU" = x; then
1.6540 - # A readlink that we do not know how to use.
1.6541 - # Are there other non-GNU readlinks out there?
1.6542 - READLINK_TESTED=yes
1.6543 - READLINK=
1.6544 - fi
1.6545 - fi
1.6546 -
1.6547 - if test "x$READLINK" != x; then
1.6548 - TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
1.6549 - else
1.6550 - # Save the current directory for restoring afterwards
1.6551 - STARTDIR=$PWD
1.6552 - COUNTER=0
1.6553 - sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.6554 - sym_link_file=`$BASENAME $TEST_COMPILER`
1.6555 - cd $sym_link_dir
1.6556 - # Use -P flag to resolve symlinks in directories.
1.6557 - cd `$THEPWDCMD -P`
1.6558 - sym_link_dir=`$THEPWDCMD -P`
1.6559 - # Resolve file symlinks
1.6560 - while test $COUNTER -lt 20; do
1.6561 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.6562 - if test "x$ISLINK" == x; then
1.6563 - # This is not a symbolic link! We are done!
1.6564 - break
1.6565 - fi
1.6566 - # Again resolve directory symlinks since the target of the just found
1.6567 - # link could be in a different directory
1.6568 - cd `$DIRNAME $ISLINK`
1.6569 - sym_link_dir=`$THEPWDCMD -P`
1.6570 - sym_link_file=`$BASENAME $ISLINK`
1.6571 - let COUNTER=COUNTER+1
1.6572 - done
1.6573 - cd $STARTDIR
1.6574 - TEST_COMPILER=$sym_link_dir/$sym_link_file
1.6575 - fi
1.6576 - fi
1.6577 + if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.6578 + # Follow a chain of symbolic links. Use readlink
1.6579 + # where it exists, else fall back to horribly
1.6580 + # complicated shell code.
1.6581 + if test "x$READLINK_TESTED" != yes; then
1.6582 + # On MacOSX there is a readlink tool with a different
1.6583 + # purpose than the GNU readlink tool. Check the found readlink.
1.6584 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.6585 + if test "x$ISGNU" = x; then
1.6586 + # A readlink that we do not know how to use.
1.6587 + # Are there other non-GNU readlinks out there?
1.6588 + READLINK_TESTED=yes
1.6589 + READLINK=
1.6590 + fi
1.6591 + fi
1.6592 +
1.6593 + if test "x$READLINK" != x; then
1.6594 + TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
1.6595 + else
1.6596 + # Save the current directory for restoring afterwards
1.6597 + STARTDIR=$PWD
1.6598 + COUNTER=0
1.6599 + sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.6600 + sym_link_file=`$BASENAME $TEST_COMPILER`
1.6601 + cd $sym_link_dir
1.6602 + # Use -P flag to resolve symlinks in directories.
1.6603 + cd `$THEPWDCMD -P`
1.6604 + sym_link_dir=`$THEPWDCMD -P`
1.6605 + # Resolve file symlinks
1.6606 + while test $COUNTER -lt 20; do
1.6607 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.6608 + if test "x$ISLINK" == x; then
1.6609 + # This is not a symbolic link! We are done!
1.6610 + break
1.6611 + fi
1.6612 + # Again resolve directory symlinks since the target of the just found
1.6613 + # link could be in a different directory
1.6614 + cd `$DIRNAME $ISLINK`
1.6615 + sym_link_dir=`$THEPWDCMD -P`
1.6616 + sym_link_file=`$BASENAME $ISLINK`
1.6617 + let COUNTER=COUNTER+1
1.6618 + done
1.6619 + cd $STARTDIR
1.6620 + TEST_COMPILER=$sym_link_dir/$sym_link_file
1.6621 + fi
1.6622 + fi
1.6623
1.6624 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
1.6625 $as_echo "$TEST_COMPILER" >&6; }
1.6626 @@ -19357,8 +19354,8 @@
1.6627 # bat and cmd files are not always considered executable in cygwin causing which
1.6628 # to not find them
1.6629 if test "x$new_path" = x \
1.6630 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6631 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6632 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6633 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6634 new_path=`$CYGPATH -u "$path"`
1.6635 fi
1.6636 if test "x$new_path" = x; then
1.6637 @@ -19373,8 +19370,8 @@
1.6638 # bat and cmd files are not always considered executable in cygwin causing which
1.6639 # to not find them
1.6640 if test "x$new_path" = x \
1.6641 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6642 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6643 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6644 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6645 new_path=`$CYGPATH -u "$path"`
1.6646 fi
1.6647 if test "x$new_path" = x; then
1.6648 @@ -19402,9 +19399,9 @@
1.6649 # Short path failed, file does not exist as specified.
1.6650 # Try adding .exe or .cmd
1.6651 if test -f "${new_path}.exe"; then
1.6652 - input_to_shortpath="${new_path}.exe"
1.6653 + input_to_shortpath="${new_path}.exe"
1.6654 elif test -f "${new_path}.cmd"; then
1.6655 - input_to_shortpath="${new_path}.cmd"
1.6656 + input_to_shortpath="${new_path}.cmd"
1.6657 else
1.6658 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$new_path\", is invalid." >&5
1.6659 $as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$new_path\", is invalid." >&6;}
1.6660 @@ -19580,81 +19577,81 @@
1.6661 fi
1.6662
1.6663 if test "x$new_path" = x; then
1.6664 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5
1.6665 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5
1.6666 $as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&6;}
1.6667 - has_space=`$ECHO "$complete" | $GREP " "`
1.6668 - if test "x$has_space" != x; then
1.6669 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.6670 + has_space=`$ECHO "$complete" | $GREP " "`
1.6671 + if test "x$has_space" != x; then
1.6672 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.6673 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.6674 - fi
1.6675 - as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
1.6676 - fi
1.6677 - fi
1.6678 -
1.6679 - # Now join together the path and the arguments once again
1.6680 - if test "x$arguments" != xEOL; then
1.6681 - new_complete="$new_path ${arguments% *}"
1.6682 - else
1.6683 - new_complete="$new_path"
1.6684 - fi
1.6685 + fi
1.6686 + as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
1.6687 + fi
1.6688 + fi
1.6689 +
1.6690 + # Now join together the path and the arguments once again
1.6691 + if test "x$arguments" != xEOL; then
1.6692 + new_complete="$new_path ${arguments% *}"
1.6693 + else
1.6694 + new_complete="$new_path"
1.6695 + fi
1.6696
1.6697 if test "x$complete" != "x$new_complete"; then
1.6698 - PROPER_COMPILER_CC="$new_complete"
1.6699 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&5
1.6700 + PROPER_COMPILER_CC="$new_complete"
1.6701 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&5
1.6702 $as_echo "$as_me: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&6;}
1.6703 - fi
1.6704 + fi
1.6705
1.6706 PATH="$RETRY_COMPILER_SAVED_PATH"
1.6707
1.6708 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CC" >&5
1.6709 $as_echo_n "checking for resolved symbolic links for CC... " >&6; }
1.6710
1.6711 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.6712 - # Follow a chain of symbolic links. Use readlink
1.6713 - # where it exists, else fall back to horribly
1.6714 - # complicated shell code.
1.6715 - if test "x$READLINK_TESTED" != yes; then
1.6716 - # On MacOSX there is a readlink tool with a different
1.6717 - # purpose than the GNU readlink tool. Check the found readlink.
1.6718 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.6719 - if test "x$ISGNU" = x; then
1.6720 - # A readlink that we do not know how to use.
1.6721 - # Are there other non-GNU readlinks out there?
1.6722 - READLINK_TESTED=yes
1.6723 - READLINK=
1.6724 - fi
1.6725 - fi
1.6726 -
1.6727 - if test "x$READLINK" != x; then
1.6728 - PROPER_COMPILER_CC=`$READLINK -f $PROPER_COMPILER_CC`
1.6729 - else
1.6730 - # Save the current directory for restoring afterwards
1.6731 - STARTDIR=$PWD
1.6732 - COUNTER=0
1.6733 - sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
1.6734 - sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
1.6735 - cd $sym_link_dir
1.6736 - # Use -P flag to resolve symlinks in directories.
1.6737 - cd `$THEPWDCMD -P`
1.6738 - sym_link_dir=`$THEPWDCMD -P`
1.6739 - # Resolve file symlinks
1.6740 - while test $COUNTER -lt 20; do
1.6741 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.6742 - if test "x$ISLINK" == x; then
1.6743 - # This is not a symbolic link! We are done!
1.6744 - break
1.6745 - fi
1.6746 - # Again resolve directory symlinks since the target of the just found
1.6747 - # link could be in a different directory
1.6748 - cd `$DIRNAME $ISLINK`
1.6749 - sym_link_dir=`$THEPWDCMD -P`
1.6750 - sym_link_file=`$BASENAME $ISLINK`
1.6751 - let COUNTER=COUNTER+1
1.6752 - done
1.6753 - cd $STARTDIR
1.6754 - PROPER_COMPILER_CC=$sym_link_dir/$sym_link_file
1.6755 - fi
1.6756 - fi
1.6757 + if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.6758 + # Follow a chain of symbolic links. Use readlink
1.6759 + # where it exists, else fall back to horribly
1.6760 + # complicated shell code.
1.6761 + if test "x$READLINK_TESTED" != yes; then
1.6762 + # On MacOSX there is a readlink tool with a different
1.6763 + # purpose than the GNU readlink tool. Check the found readlink.
1.6764 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.6765 + if test "x$ISGNU" = x; then
1.6766 + # A readlink that we do not know how to use.
1.6767 + # Are there other non-GNU readlinks out there?
1.6768 + READLINK_TESTED=yes
1.6769 + READLINK=
1.6770 + fi
1.6771 + fi
1.6772 +
1.6773 + if test "x$READLINK" != x; then
1.6774 + PROPER_COMPILER_CC=`$READLINK -f $PROPER_COMPILER_CC`
1.6775 + else
1.6776 + # Save the current directory for restoring afterwards
1.6777 + STARTDIR=$PWD
1.6778 + COUNTER=0
1.6779 + sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
1.6780 + sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
1.6781 + cd $sym_link_dir
1.6782 + # Use -P flag to resolve symlinks in directories.
1.6783 + cd `$THEPWDCMD -P`
1.6784 + sym_link_dir=`$THEPWDCMD -P`
1.6785 + # Resolve file symlinks
1.6786 + while test $COUNTER -lt 20; do
1.6787 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.6788 + if test "x$ISLINK" == x; then
1.6789 + # This is not a symbolic link! We are done!
1.6790 + break
1.6791 + fi
1.6792 + # Again resolve directory symlinks since the target of the just found
1.6793 + # link could be in a different directory
1.6794 + cd `$DIRNAME $ISLINK`
1.6795 + sym_link_dir=`$THEPWDCMD -P`
1.6796 + sym_link_file=`$BASENAME $ISLINK`
1.6797 + let COUNTER=COUNTER+1
1.6798 + done
1.6799 + cd $STARTDIR
1.6800 + PROPER_COMPILER_CC=$sym_link_dir/$sym_link_file
1.6801 + fi
1.6802 + fi
1.6803
1.6804 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CC" >&5
1.6805 $as_echo "$PROPER_COMPILER_CC" >&6; }
1.6806 @@ -19686,7 +19683,7 @@
1.6807 fi
1.6808 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.6809 # First line typically looks something like:
1.6810 - # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
1.6811 + # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
1.6812 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.6813 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
1.6814 COMPILER_VENDOR="Microsoft CL.EXE"
1.6815 @@ -19726,8 +19723,8 @@
1.6816 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
1.6817
1.6818
1.6819 -# Now that we have resolved CC ourself, let autoconf have its go at it
1.6820 -ac_ext=c
1.6821 + # Now that we have resolved CC ourself, let autoconf have its go at it
1.6822 + ac_ext=c
1.6823 ac_cpp='$CPP $CPPFLAGS'
1.6824 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.6825 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.6826 @@ -20325,17 +20322,17 @@
1.6827 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.6828
1.6829
1.6830 -### Locate C++ compiler (CXX)
1.6831 -
1.6832 -if test "x$CXX" != x; then
1.6833 - COMPILER_CHECK_LIST="$CXX"
1.6834 -elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.6835 - COMPILER_CHECK_LIST="cl"
1.6836 -elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.6837 - COMPILER_CHECK_LIST="CC g++"
1.6838 -else
1.6839 - COMPILER_CHECK_LIST="g++ CC"
1.6840 -fi
1.6841 + ### Locate C++ compiler (CXX)
1.6842 +
1.6843 + if test "x$CXX" != x; then
1.6844 + COMPILER_CHECK_LIST="$CXX"
1.6845 + elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.6846 + COMPILER_CHECK_LIST="cl"
1.6847 + elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.6848 + COMPILER_CHECK_LIST="CC g++"
1.6849 + else
1.6850 + COMPILER_CHECK_LIST="g++ CC"
1.6851 + fi
1.6852
1.6853
1.6854 COMPILER_NAME=C++
1.6855 @@ -20448,31 +20445,31 @@
1.6856
1.6857 if test "x$CXX" = x; then
1.6858
1.6859 - # Print a helpful message on how to acquire the necessary build dependency.
1.6860 - # devkit is the help tag: freetyp2, cups, pulse, alsa etc
1.6861 - MISSING_DEPENDENCY=devkit
1.6862 - PKGHANDLER_COMMAND=
1.6863 -
1.6864 - case $PKGHANDLER in
1.6865 - apt-get)
1.6866 - apt_help $MISSING_DEPENDENCY ;;
1.6867 + # Print a helpful message on how to acquire the necessary build dependency.
1.6868 + # devkit is the help tag: freetyp2, cups, pulse, alsa etc
1.6869 + MISSING_DEPENDENCY=devkit
1.6870 + PKGHANDLER_COMMAND=
1.6871 +
1.6872 + case $PKGHANDLER in
1.6873 + apt-get)
1.6874 + apt_help $MISSING_DEPENDENCY ;;
1.6875 yum)
1.6876 - yum_help $MISSING_DEPENDENCY ;;
1.6877 - port)
1.6878 - port_help $MISSING_DEPENDENCY ;;
1.6879 - pkgutil)
1.6880 - pkgutil_help $MISSING_DEPENDENCY ;;
1.6881 - pkgadd)
1.6882 - pkgadd_help $MISSING_DEPENDENCY ;;
1.6883 + yum_help $MISSING_DEPENDENCY ;;
1.6884 + port)
1.6885 + port_help $MISSING_DEPENDENCY ;;
1.6886 + pkgutil)
1.6887 + pkgutil_help $MISSING_DEPENDENCY ;;
1.6888 + pkgadd)
1.6889 + pkgadd_help $MISSING_DEPENDENCY ;;
1.6890 * )
1.6891 break ;;
1.6892 - esac
1.6893 -
1.6894 - if test "x$PKGHANDLER_COMMAND" != x; then
1.6895 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.6896 - fi
1.6897 -
1.6898 - as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.6899 + esac
1.6900 +
1.6901 + if test "x$PKGHANDLER_COMMAND" != x; then
1.6902 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.6903 + fi
1.6904 +
1.6905 + as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.6906 fi
1.6907
1.6908 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.6909 @@ -20493,8 +20490,8 @@
1.6910 # bat and cmd files are not always considered executable in cygwin causing which
1.6911 # to not find them
1.6912 if test "x$new_path" = x \
1.6913 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6914 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6915 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6916 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6917 new_path=`$CYGPATH -u "$path"`
1.6918 fi
1.6919 if test "x$new_path" = x; then
1.6920 @@ -20509,8 +20506,8 @@
1.6921 # bat and cmd files are not always considered executable in cygwin causing which
1.6922 # to not find them
1.6923 if test "x$new_path" = x \
1.6924 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6925 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6926 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6927 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6928 new_path=`$CYGPATH -u "$path"`
1.6929 fi
1.6930 if test "x$new_path" = x; then
1.6931 @@ -20538,9 +20535,9 @@
1.6932 # Short path failed, file does not exist as specified.
1.6933 # Try adding .exe or .cmd
1.6934 if test -f "${new_path}.exe"; then
1.6935 - input_to_shortpath="${new_path}.exe"
1.6936 + input_to_shortpath="${new_path}.exe"
1.6937 elif test -f "${new_path}.cmd"; then
1.6938 - input_to_shortpath="${new_path}.cmd"
1.6939 + input_to_shortpath="${new_path}.cmd"
1.6940 else
1.6941 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$new_path\", is invalid." >&5
1.6942 $as_echo "$as_me: The path of CXX, which resolves as \"$new_path\", is invalid." >&6;}
1.6943 @@ -20716,80 +20713,80 @@
1.6944 fi
1.6945
1.6946 if test "x$new_path" = x; then
1.6947 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5
1.6948 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5
1.6949 $as_echo "$as_me: The path of CXX, which resolves as \"$complete\", is not found." >&6;}
1.6950 - has_space=`$ECHO "$complete" | $GREP " "`
1.6951 - if test "x$has_space" != x; then
1.6952 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.6953 + has_space=`$ECHO "$complete" | $GREP " "`
1.6954 + if test "x$has_space" != x; then
1.6955 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.6956 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.6957 - fi
1.6958 - as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
1.6959 - fi
1.6960 - fi
1.6961 -
1.6962 - # Now join together the path and the arguments once again
1.6963 - if test "x$arguments" != xEOL; then
1.6964 - new_complete="$new_path ${arguments% *}"
1.6965 - else
1.6966 - new_complete="$new_path"
1.6967 - fi
1.6968 + fi
1.6969 + as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
1.6970 + fi
1.6971 + fi
1.6972 +
1.6973 + # Now join together the path and the arguments once again
1.6974 + if test "x$arguments" != xEOL; then
1.6975 + new_complete="$new_path ${arguments% *}"
1.6976 + else
1.6977 + new_complete="$new_path"
1.6978 + fi
1.6979
1.6980 if test "x$complete" != "x$new_complete"; then
1.6981 - CXX="$new_complete"
1.6982 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5
1.6983 + CXX="$new_complete"
1.6984 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5
1.6985 $as_echo "$as_me: Rewriting CXX to \"$new_complete\"" >&6;}
1.6986 - fi
1.6987 + fi
1.6988
1.6989 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5
1.6990 $as_echo_n "checking resolved symbolic links for CXX... " >&6; }
1.6991 TEST_COMPILER="$CXX"
1.6992
1.6993 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.6994 - # Follow a chain of symbolic links. Use readlink
1.6995 - # where it exists, else fall back to horribly
1.6996 - # complicated shell code.
1.6997 - if test "x$READLINK_TESTED" != yes; then
1.6998 - # On MacOSX there is a readlink tool with a different
1.6999 - # purpose than the GNU readlink tool. Check the found readlink.
1.7000 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.7001 - if test "x$ISGNU" = x; then
1.7002 - # A readlink that we do not know how to use.
1.7003 - # Are there other non-GNU readlinks out there?
1.7004 - READLINK_TESTED=yes
1.7005 - READLINK=
1.7006 - fi
1.7007 - fi
1.7008 -
1.7009 - if test "x$READLINK" != x; then
1.7010 - TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
1.7011 - else
1.7012 - # Save the current directory for restoring afterwards
1.7013 - STARTDIR=$PWD
1.7014 - COUNTER=0
1.7015 - sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.7016 - sym_link_file=`$BASENAME $TEST_COMPILER`
1.7017 - cd $sym_link_dir
1.7018 - # Use -P flag to resolve symlinks in directories.
1.7019 - cd `$THEPWDCMD -P`
1.7020 - sym_link_dir=`$THEPWDCMD -P`
1.7021 - # Resolve file symlinks
1.7022 - while test $COUNTER -lt 20; do
1.7023 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.7024 - if test "x$ISLINK" == x; then
1.7025 - # This is not a symbolic link! We are done!
1.7026 - break
1.7027 - fi
1.7028 - # Again resolve directory symlinks since the target of the just found
1.7029 - # link could be in a different directory
1.7030 - cd `$DIRNAME $ISLINK`
1.7031 - sym_link_dir=`$THEPWDCMD -P`
1.7032 - sym_link_file=`$BASENAME $ISLINK`
1.7033 - let COUNTER=COUNTER+1
1.7034 - done
1.7035 - cd $STARTDIR
1.7036 - TEST_COMPILER=$sym_link_dir/$sym_link_file
1.7037 - fi
1.7038 - fi
1.7039 + if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.7040 + # Follow a chain of symbolic links. Use readlink
1.7041 + # where it exists, else fall back to horribly
1.7042 + # complicated shell code.
1.7043 + if test "x$READLINK_TESTED" != yes; then
1.7044 + # On MacOSX there is a readlink tool with a different
1.7045 + # purpose than the GNU readlink tool. Check the found readlink.
1.7046 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.7047 + if test "x$ISGNU" = x; then
1.7048 + # A readlink that we do not know how to use.
1.7049 + # Are there other non-GNU readlinks out there?
1.7050 + READLINK_TESTED=yes
1.7051 + READLINK=
1.7052 + fi
1.7053 + fi
1.7054 +
1.7055 + if test "x$READLINK" != x; then
1.7056 + TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
1.7057 + else
1.7058 + # Save the current directory for restoring afterwards
1.7059 + STARTDIR=$PWD
1.7060 + COUNTER=0
1.7061 + sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.7062 + sym_link_file=`$BASENAME $TEST_COMPILER`
1.7063 + cd $sym_link_dir
1.7064 + # Use -P flag to resolve symlinks in directories.
1.7065 + cd `$THEPWDCMD -P`
1.7066 + sym_link_dir=`$THEPWDCMD -P`
1.7067 + # Resolve file symlinks
1.7068 + while test $COUNTER -lt 20; do
1.7069 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.7070 + if test "x$ISLINK" == x; then
1.7071 + # This is not a symbolic link! We are done!
1.7072 + break
1.7073 + fi
1.7074 + # Again resolve directory symlinks since the target of the just found
1.7075 + # link could be in a different directory
1.7076 + cd `$DIRNAME $ISLINK`
1.7077 + sym_link_dir=`$THEPWDCMD -P`
1.7078 + sym_link_file=`$BASENAME $ISLINK`
1.7079 + let COUNTER=COUNTER+1
1.7080 + done
1.7081 + cd $STARTDIR
1.7082 + TEST_COMPILER=$sym_link_dir/$sym_link_file
1.7083 + fi
1.7084 + fi
1.7085
1.7086 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
1.7087 $as_echo "$TEST_COMPILER" >&6; }
1.7088 @@ -20929,8 +20926,8 @@
1.7089 # bat and cmd files are not always considered executable in cygwin causing which
1.7090 # to not find them
1.7091 if test "x$new_path" = x \
1.7092 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7093 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7094 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7095 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7096 new_path=`$CYGPATH -u "$path"`
1.7097 fi
1.7098 if test "x$new_path" = x; then
1.7099 @@ -20945,8 +20942,8 @@
1.7100 # bat and cmd files are not always considered executable in cygwin causing which
1.7101 # to not find them
1.7102 if test "x$new_path" = x \
1.7103 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7104 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7105 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7106 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7107 new_path=`$CYGPATH -u "$path"`
1.7108 fi
1.7109 if test "x$new_path" = x; then
1.7110 @@ -20974,9 +20971,9 @@
1.7111 # Short path failed, file does not exist as specified.
1.7112 # Try adding .exe or .cmd
1.7113 if test -f "${new_path}.exe"; then
1.7114 - input_to_shortpath="${new_path}.exe"
1.7115 + input_to_shortpath="${new_path}.exe"
1.7116 elif test -f "${new_path}.cmd"; then
1.7117 - input_to_shortpath="${new_path}.cmd"
1.7118 + input_to_shortpath="${new_path}.cmd"
1.7119 else
1.7120 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$new_path\", is invalid." >&5
1.7121 $as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$new_path\", is invalid." >&6;}
1.7122 @@ -21152,81 +21149,81 @@
1.7123 fi
1.7124
1.7125 if test "x$new_path" = x; then
1.7126 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5
1.7127 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5
1.7128 $as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&6;}
1.7129 - has_space=`$ECHO "$complete" | $GREP " "`
1.7130 - if test "x$has_space" != x; then
1.7131 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7132 + has_space=`$ECHO "$complete" | $GREP " "`
1.7133 + if test "x$has_space" != x; then
1.7134 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7135 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7136 - fi
1.7137 - as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
1.7138 - fi
1.7139 - fi
1.7140 -
1.7141 - # Now join together the path and the arguments once again
1.7142 - if test "x$arguments" != xEOL; then
1.7143 - new_complete="$new_path ${arguments% *}"
1.7144 - else
1.7145 - new_complete="$new_path"
1.7146 - fi
1.7147 + fi
1.7148 + as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
1.7149 + fi
1.7150 + fi
1.7151 +
1.7152 + # Now join together the path and the arguments once again
1.7153 + if test "x$arguments" != xEOL; then
1.7154 + new_complete="$new_path ${arguments% *}"
1.7155 + else
1.7156 + new_complete="$new_path"
1.7157 + fi
1.7158
1.7159 if test "x$complete" != "x$new_complete"; then
1.7160 - PROPER_COMPILER_CXX="$new_complete"
1.7161 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&5
1.7162 + PROPER_COMPILER_CXX="$new_complete"
1.7163 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&5
1.7164 $as_echo "$as_me: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&6;}
1.7165 - fi
1.7166 + fi
1.7167
1.7168 PATH="$RETRY_COMPILER_SAVED_PATH"
1.7169
1.7170 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolved symbolic links for CXX" >&5
1.7171 $as_echo_n "checking for resolved symbolic links for CXX... " >&6; }
1.7172
1.7173 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.7174 - # Follow a chain of symbolic links. Use readlink
1.7175 - # where it exists, else fall back to horribly
1.7176 - # complicated shell code.
1.7177 - if test "x$READLINK_TESTED" != yes; then
1.7178 - # On MacOSX there is a readlink tool with a different
1.7179 - # purpose than the GNU readlink tool. Check the found readlink.
1.7180 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.7181 - if test "x$ISGNU" = x; then
1.7182 - # A readlink that we do not know how to use.
1.7183 - # Are there other non-GNU readlinks out there?
1.7184 - READLINK_TESTED=yes
1.7185 - READLINK=
1.7186 - fi
1.7187 - fi
1.7188 -
1.7189 - if test "x$READLINK" != x; then
1.7190 - PROPER_COMPILER_CXX=`$READLINK -f $PROPER_COMPILER_CXX`
1.7191 - else
1.7192 - # Save the current directory for restoring afterwards
1.7193 - STARTDIR=$PWD
1.7194 - COUNTER=0
1.7195 - sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
1.7196 - sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
1.7197 - cd $sym_link_dir
1.7198 - # Use -P flag to resolve symlinks in directories.
1.7199 - cd `$THEPWDCMD -P`
1.7200 - sym_link_dir=`$THEPWDCMD -P`
1.7201 - # Resolve file symlinks
1.7202 - while test $COUNTER -lt 20; do
1.7203 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.7204 - if test "x$ISLINK" == x; then
1.7205 - # This is not a symbolic link! We are done!
1.7206 - break
1.7207 - fi
1.7208 - # Again resolve directory symlinks since the target of the just found
1.7209 - # link could be in a different directory
1.7210 - cd `$DIRNAME $ISLINK`
1.7211 - sym_link_dir=`$THEPWDCMD -P`
1.7212 - sym_link_file=`$BASENAME $ISLINK`
1.7213 - let COUNTER=COUNTER+1
1.7214 - done
1.7215 - cd $STARTDIR
1.7216 - PROPER_COMPILER_CXX=$sym_link_dir/$sym_link_file
1.7217 - fi
1.7218 - fi
1.7219 + if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.7220 + # Follow a chain of symbolic links. Use readlink
1.7221 + # where it exists, else fall back to horribly
1.7222 + # complicated shell code.
1.7223 + if test "x$READLINK_TESTED" != yes; then
1.7224 + # On MacOSX there is a readlink tool with a different
1.7225 + # purpose than the GNU readlink tool. Check the found readlink.
1.7226 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.7227 + if test "x$ISGNU" = x; then
1.7228 + # A readlink that we do not know how to use.
1.7229 + # Are there other non-GNU readlinks out there?
1.7230 + READLINK_TESTED=yes
1.7231 + READLINK=
1.7232 + fi
1.7233 + fi
1.7234 +
1.7235 + if test "x$READLINK" != x; then
1.7236 + PROPER_COMPILER_CXX=`$READLINK -f $PROPER_COMPILER_CXX`
1.7237 + else
1.7238 + # Save the current directory for restoring afterwards
1.7239 + STARTDIR=$PWD
1.7240 + COUNTER=0
1.7241 + sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
1.7242 + sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
1.7243 + cd $sym_link_dir
1.7244 + # Use -P flag to resolve symlinks in directories.
1.7245 + cd `$THEPWDCMD -P`
1.7246 + sym_link_dir=`$THEPWDCMD -P`
1.7247 + # Resolve file symlinks
1.7248 + while test $COUNTER -lt 20; do
1.7249 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.7250 + if test "x$ISLINK" == x; then
1.7251 + # This is not a symbolic link! We are done!
1.7252 + break
1.7253 + fi
1.7254 + # Again resolve directory symlinks since the target of the just found
1.7255 + # link could be in a different directory
1.7256 + cd `$DIRNAME $ISLINK`
1.7257 + sym_link_dir=`$THEPWDCMD -P`
1.7258 + sym_link_file=`$BASENAME $ISLINK`
1.7259 + let COUNTER=COUNTER+1
1.7260 + done
1.7261 + cd $STARTDIR
1.7262 + PROPER_COMPILER_CXX=$sym_link_dir/$sym_link_file
1.7263 + fi
1.7264 + fi
1.7265
1.7266 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CXX" >&5
1.7267 $as_echo "$PROPER_COMPILER_CXX" >&6; }
1.7268 @@ -21258,7 +21255,7 @@
1.7269 fi
1.7270 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.7271 # First line typically looks something like:
1.7272 - # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
1.7273 + # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
1.7274 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.7275 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
1.7276 COMPILER_VENDOR="Microsoft CL.EXE"
1.7277 @@ -21298,8 +21295,8 @@
1.7278 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
1.7279
1.7280
1.7281 -# Now that we have resolved CXX ourself, let autoconf have its go at it
1.7282 -ac_ext=cpp
1.7283 + # Now that we have resolved CXX ourself, let autoconf have its go at it
1.7284 + ac_ext=cpp
1.7285 ac_cpp='$CXXCPP $CPPFLAGS'
1.7286 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.7287 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.7288 @@ -21557,9 +21554,9 @@
1.7289 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.7290
1.7291
1.7292 -### Locate other tools
1.7293 -
1.7294 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.7295 + ### Locate other tools
1.7296 +
1.7297 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.7298 ac_ext=m
1.7299 ac_cpp='$OBJCPP $CPPFLAGS'
1.7300 ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.7301 @@ -21830,8 +21827,8 @@
1.7302 # bat and cmd files are not always considered executable in cygwin causing which
1.7303 # to not find them
1.7304 if test "x$new_path" = x \
1.7305 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7306 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7307 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7308 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7309 new_path=`$CYGPATH -u "$path"`
1.7310 fi
1.7311 if test "x$new_path" = x; then
1.7312 @@ -21846,8 +21843,8 @@
1.7313 # bat and cmd files are not always considered executable in cygwin causing which
1.7314 # to not find them
1.7315 if test "x$new_path" = x \
1.7316 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7317 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7318 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7319 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7320 new_path=`$CYGPATH -u "$path"`
1.7321 fi
1.7322 if test "x$new_path" = x; then
1.7323 @@ -21875,9 +21872,9 @@
1.7324 # Short path failed, file does not exist as specified.
1.7325 # Try adding .exe or .cmd
1.7326 if test -f "${new_path}.exe"; then
1.7327 - input_to_shortpath="${new_path}.exe"
1.7328 + input_to_shortpath="${new_path}.exe"
1.7329 elif test -f "${new_path}.cmd"; then
1.7330 - input_to_shortpath="${new_path}.cmd"
1.7331 + input_to_shortpath="${new_path}.cmd"
1.7332 else
1.7333 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$new_path\", is invalid." >&5
1.7334 $as_echo "$as_me: The path of OBJC, which resolves as \"$new_path\", is invalid." >&6;}
1.7335 @@ -22053,53 +22050,53 @@
1.7336 fi
1.7337
1.7338 if test "x$new_path" = x; then
1.7339 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5
1.7340 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5
1.7341 $as_echo "$as_me: The path of OBJC, which resolves as \"$complete\", is not found." >&6;}
1.7342 - has_space=`$ECHO "$complete" | $GREP " "`
1.7343 - if test "x$has_space" != x; then
1.7344 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7345 + has_space=`$ECHO "$complete" | $GREP " "`
1.7346 + if test "x$has_space" != x; then
1.7347 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7348 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7349 - fi
1.7350 - as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
1.7351 - fi
1.7352 - fi
1.7353 -
1.7354 - # Now join together the path and the arguments once again
1.7355 - if test "x$arguments" != xEOL; then
1.7356 - new_complete="$new_path ${arguments% *}"
1.7357 - else
1.7358 - new_complete="$new_path"
1.7359 - fi
1.7360 + fi
1.7361 + as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
1.7362 + fi
1.7363 + fi
1.7364 +
1.7365 + # Now join together the path and the arguments once again
1.7366 + if test "x$arguments" != xEOL; then
1.7367 + new_complete="$new_path ${arguments% *}"
1.7368 + else
1.7369 + new_complete="$new_path"
1.7370 + fi
1.7371
1.7372 if test "x$complete" != "x$new_complete"; then
1.7373 - OBJC="$new_complete"
1.7374 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJC to \"$new_complete\"" >&5
1.7375 + OBJC="$new_complete"
1.7376 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJC to \"$new_complete\"" >&5
1.7377 $as_echo "$as_me: Rewriting OBJC to \"$new_complete\"" >&6;}
1.7378 - fi
1.7379 -
1.7380 -else
1.7381 + fi
1.7382 +
1.7383 + else
1.7384 OBJC=
1.7385 -fi
1.7386 -
1.7387 -# Restore the flags to the user specified values.
1.7388 -# This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
1.7389 -CFLAGS="$ORG_CFLAGS"
1.7390 -CXXFLAGS="$ORG_CXXFLAGS"
1.7391 -OBJCFLAGS="$ORG_OBJCFLAGS"
1.7392 -
1.7393 -LD="$CC"
1.7394 -LDEXE="$CC"
1.7395 -LDCXX="$CXX"
1.7396 -LDEXECXX="$CXX"
1.7397 -
1.7398 -# LDEXE is the linker to use, when creating executables.
1.7399 -
1.7400 -# Linking C++ libraries.
1.7401 -
1.7402 -# Linking C++ executables.
1.7403 -
1.7404 -
1.7405 -if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.7406 + fi
1.7407 +
1.7408 + # Restore the flags to the user specified values.
1.7409 + # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
1.7410 + CFLAGS="$ORG_CFLAGS"
1.7411 + CXXFLAGS="$ORG_CXXFLAGS"
1.7412 + OBJCFLAGS="$ORG_OBJCFLAGS"
1.7413 +
1.7414 + LD="$CC"
1.7415 + LDEXE="$CC"
1.7416 + LDCXX="$CXX"
1.7417 + LDEXECXX="$CXX"
1.7418 +
1.7419 + # LDEXE is the linker to use, when creating executables.
1.7420 +
1.7421 + # Linking C++ libraries.
1.7422 +
1.7423 + # Linking C++ executables.
1.7424 +
1.7425 +
1.7426 + if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.7427 if test -n "$ac_tool_prefix"; then
1.7428 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
1.7429 set dummy ${ac_tool_prefix}ar; ac_word=$2
1.7430 @@ -22211,8 +22208,8 @@
1.7431 # bat and cmd files are not always considered executable in cygwin causing which
1.7432 # to not find them
1.7433 if test "x$new_path" = x \
1.7434 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7435 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7436 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7437 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7438 new_path=`$CYGPATH -u "$path"`
1.7439 fi
1.7440 if test "x$new_path" = x; then
1.7441 @@ -22227,8 +22224,8 @@
1.7442 # bat and cmd files are not always considered executable in cygwin causing which
1.7443 # to not find them
1.7444 if test "x$new_path" = x \
1.7445 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7446 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7447 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7448 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7449 new_path=`$CYGPATH -u "$path"`
1.7450 fi
1.7451 if test "x$new_path" = x; then
1.7452 @@ -22256,9 +22253,9 @@
1.7453 # Short path failed, file does not exist as specified.
1.7454 # Try adding .exe or .cmd
1.7455 if test -f "${new_path}.exe"; then
1.7456 - input_to_shortpath="${new_path}.exe"
1.7457 + input_to_shortpath="${new_path}.exe"
1.7458 elif test -f "${new_path}.cmd"; then
1.7459 - input_to_shortpath="${new_path}.cmd"
1.7460 + input_to_shortpath="${new_path}.cmd"
1.7461 else
1.7462 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$new_path\", is invalid." >&5
1.7463 $as_echo "$as_me: The path of AR, which resolves as \"$new_path\", is invalid." >&6;}
1.7464 @@ -22434,47 +22431,47 @@
1.7465 fi
1.7466
1.7467 if test "x$new_path" = x; then
1.7468 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
1.7469 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
1.7470 $as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
1.7471 - has_space=`$ECHO "$complete" | $GREP " "`
1.7472 - if test "x$has_space" != x; then
1.7473 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7474 + has_space=`$ECHO "$complete" | $GREP " "`
1.7475 + if test "x$has_space" != x; then
1.7476 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7477 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7478 - fi
1.7479 - as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.7480 - fi
1.7481 - fi
1.7482 -
1.7483 - # Now join together the path and the arguments once again
1.7484 - if test "x$arguments" != xEOL; then
1.7485 - new_complete="$new_path ${arguments% *}"
1.7486 - else
1.7487 - new_complete="$new_path"
1.7488 - fi
1.7489 + fi
1.7490 + as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.7491 + fi
1.7492 + fi
1.7493 +
1.7494 + # Now join together the path and the arguments once again
1.7495 + if test "x$arguments" != xEOL; then
1.7496 + new_complete="$new_path ${arguments% *}"
1.7497 + else
1.7498 + new_complete="$new_path"
1.7499 + fi
1.7500
1.7501 if test "x$complete" != "x$new_complete"; then
1.7502 - AR="$new_complete"
1.7503 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5
1.7504 + AR="$new_complete"
1.7505 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5
1.7506 $as_echo "$as_me: Rewriting AR to \"$new_complete\"" >&6;}
1.7507 - fi
1.7508 -
1.7509 -fi
1.7510 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.7511 + fi
1.7512 +
1.7513 + fi
1.7514 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.7515 ARFLAGS="-r"
1.7516 -else
1.7517 + else
1.7518 ARFLAGS=""
1.7519 -fi
1.7520 -
1.7521 -
1.7522 -# For hotspot, we need these in Windows mixed path; other platforms keep them the same
1.7523 -HOTSPOT_CXX="$CXX"
1.7524 -HOTSPOT_LD="$LD"
1.7525 -
1.7526 -
1.7527 -
1.7528 -COMPILER_NAME=gcc
1.7529 -COMPILER_TYPE=CC
1.7530 -if test "x$OPENJDK_TARGET_OS" = xwindows; then :
1.7531 + fi
1.7532 +
1.7533 +
1.7534 + # For hotspot, we need these in Windows mixed path; other platforms keep them the same
1.7535 + HOTSPOT_CXX="$CXX"
1.7536 + HOTSPOT_LD="$LD"
1.7537 +
1.7538 +
1.7539 +
1.7540 + COMPILER_NAME=gcc
1.7541 + COMPILER_TYPE=CC
1.7542 + if test "x$OPENJDK_TARGET_OS" = xwindows; then :
1.7543
1.7544 # For now, assume that we are always compiling using cl.exe.
1.7545 CC_OUT_OPTION=-Fo
1.7546 @@ -22558,8 +22555,8 @@
1.7547 # bat and cmd files are not always considered executable in cygwin causing which
1.7548 # to not find them
1.7549 if test "x$new_path" = x \
1.7550 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7551 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7552 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7553 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7554 new_path=`$CYGPATH -u "$path"`
1.7555 fi
1.7556 if test "x$new_path" = x; then
1.7557 @@ -22574,8 +22571,8 @@
1.7558 # bat and cmd files are not always considered executable in cygwin causing which
1.7559 # to not find them
1.7560 if test "x$new_path" = x \
1.7561 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7562 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7563 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7564 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7565 new_path=`$CYGPATH -u "$path"`
1.7566 fi
1.7567 if test "x$new_path" = x; then
1.7568 @@ -22603,9 +22600,9 @@
1.7569 # Short path failed, file does not exist as specified.
1.7570 # Try adding .exe or .cmd
1.7571 if test -f "${new_path}.exe"; then
1.7572 - input_to_shortpath="${new_path}.exe"
1.7573 + input_to_shortpath="${new_path}.exe"
1.7574 elif test -f "${new_path}.cmd"; then
1.7575 - input_to_shortpath="${new_path}.cmd"
1.7576 + input_to_shortpath="${new_path}.cmd"
1.7577 else
1.7578 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$new_path\", is invalid." >&5
1.7579 $as_echo "$as_me: The path of WINLD, which resolves as \"$new_path\", is invalid." >&6;}
1.7580 @@ -22781,29 +22778,29 @@
1.7581 fi
1.7582
1.7583 if test "x$new_path" = x; then
1.7584 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
1.7585 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
1.7586 $as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
1.7587 - has_space=`$ECHO "$complete" | $GREP " "`
1.7588 - if test "x$has_space" != x; then
1.7589 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7590 + has_space=`$ECHO "$complete" | $GREP " "`
1.7591 + if test "x$has_space" != x; then
1.7592 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7593 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7594 - fi
1.7595 - as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
1.7596 - fi
1.7597 - fi
1.7598 -
1.7599 - # Now join together the path and the arguments once again
1.7600 - if test "x$arguments" != xEOL; then
1.7601 - new_complete="$new_path ${arguments% *}"
1.7602 - else
1.7603 - new_complete="$new_path"
1.7604 - fi
1.7605 + fi
1.7606 + as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
1.7607 + fi
1.7608 + fi
1.7609 +
1.7610 + # Now join together the path and the arguments once again
1.7611 + if test "x$arguments" != xEOL; then
1.7612 + new_complete="$new_path ${arguments% *}"
1.7613 + else
1.7614 + new_complete="$new_path"
1.7615 + fi
1.7616
1.7617 if test "x$complete" != "x$new_complete"; then
1.7618 - WINLD="$new_complete"
1.7619 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINLD to \"$new_complete\"" >&5
1.7620 + WINLD="$new_complete"
1.7621 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINLD to \"$new_complete\"" >&5
1.7622 $as_echo "$as_me: Rewriting WINLD to \"$new_complete\"" >&6;}
1.7623 - fi
1.7624 + fi
1.7625
1.7626 printf "Windows linker was found at $WINLD\n"
1.7627 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the found link.exe is actually the Visual Studio linker" >&5
1.7628 @@ -22895,8 +22892,8 @@
1.7629 # bat and cmd files are not always considered executable in cygwin causing which
1.7630 # to not find them
1.7631 if test "x$new_path" = x \
1.7632 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7633 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7634 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7635 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7636 new_path=`$CYGPATH -u "$path"`
1.7637 fi
1.7638 if test "x$new_path" = x; then
1.7639 @@ -22911,8 +22908,8 @@
1.7640 # bat and cmd files are not always considered executable in cygwin causing which
1.7641 # to not find them
1.7642 if test "x$new_path" = x \
1.7643 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7644 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7645 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7646 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7647 new_path=`$CYGPATH -u "$path"`
1.7648 fi
1.7649 if test "x$new_path" = x; then
1.7650 @@ -22940,9 +22937,9 @@
1.7651 # Short path failed, file does not exist as specified.
1.7652 # Try adding .exe or .cmd
1.7653 if test -f "${new_path}.exe"; then
1.7654 - input_to_shortpath="${new_path}.exe"
1.7655 + input_to_shortpath="${new_path}.exe"
1.7656 elif test -f "${new_path}.cmd"; then
1.7657 - input_to_shortpath="${new_path}.cmd"
1.7658 + input_to_shortpath="${new_path}.cmd"
1.7659 else
1.7660 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$new_path\", is invalid." >&5
1.7661 $as_echo "$as_me: The path of MT, which resolves as \"$new_path\", is invalid." >&6;}
1.7662 @@ -23118,29 +23115,29 @@
1.7663 fi
1.7664
1.7665 if test "x$new_path" = x; then
1.7666 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
1.7667 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
1.7668 $as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
1.7669 - has_space=`$ECHO "$complete" | $GREP " "`
1.7670 - if test "x$has_space" != x; then
1.7671 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7672 + has_space=`$ECHO "$complete" | $GREP " "`
1.7673 + if test "x$has_space" != x; then
1.7674 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7675 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7676 - fi
1.7677 - as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7678 - fi
1.7679 - fi
1.7680 -
1.7681 - # Now join together the path and the arguments once again
1.7682 - if test "x$arguments" != xEOL; then
1.7683 - new_complete="$new_path ${arguments% *}"
1.7684 - else
1.7685 - new_complete="$new_path"
1.7686 - fi
1.7687 + fi
1.7688 + as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7689 + fi
1.7690 + fi
1.7691 +
1.7692 + # Now join together the path and the arguments once again
1.7693 + if test "x$arguments" != xEOL; then
1.7694 + new_complete="$new_path ${arguments% *}"
1.7695 + else
1.7696 + new_complete="$new_path"
1.7697 + fi
1.7698
1.7699 if test "x$complete" != "x$new_complete"; then
1.7700 - MT="$new_complete"
1.7701 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5
1.7702 + MT="$new_complete"
1.7703 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5
1.7704 $as_echo "$as_me: Rewriting MT to \"$new_complete\"" >&6;}
1.7705 - fi
1.7706 + fi
1.7707
1.7708 # The resource compiler
1.7709 # Extract the first word of "rc", so it can be a program name with args.
1.7710 @@ -23216,8 +23213,8 @@
1.7711 # bat and cmd files are not always considered executable in cygwin causing which
1.7712 # to not find them
1.7713 if test "x$new_path" = x \
1.7714 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7715 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7716 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7717 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7718 new_path=`$CYGPATH -u "$path"`
1.7719 fi
1.7720 if test "x$new_path" = x; then
1.7721 @@ -23232,8 +23229,8 @@
1.7722 # bat and cmd files are not always considered executable in cygwin causing which
1.7723 # to not find them
1.7724 if test "x$new_path" = x \
1.7725 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7726 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7727 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7728 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7729 new_path=`$CYGPATH -u "$path"`
1.7730 fi
1.7731 if test "x$new_path" = x; then
1.7732 @@ -23261,9 +23258,9 @@
1.7733 # Short path failed, file does not exist as specified.
1.7734 # Try adding .exe or .cmd
1.7735 if test -f "${new_path}.exe"; then
1.7736 - input_to_shortpath="${new_path}.exe"
1.7737 + input_to_shortpath="${new_path}.exe"
1.7738 elif test -f "${new_path}.cmd"; then
1.7739 - input_to_shortpath="${new_path}.cmd"
1.7740 + input_to_shortpath="${new_path}.cmd"
1.7741 else
1.7742 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$new_path\", is invalid." >&5
1.7743 $as_echo "$as_me: The path of RC, which resolves as \"$new_path\", is invalid." >&6;}
1.7744 @@ -23439,29 +23436,29 @@
1.7745 fi
1.7746
1.7747 if test "x$new_path" = x; then
1.7748 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
1.7749 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
1.7750 $as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
1.7751 - has_space=`$ECHO "$complete" | $GREP " "`
1.7752 - if test "x$has_space" != x; then
1.7753 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7754 + has_space=`$ECHO "$complete" | $GREP " "`
1.7755 + if test "x$has_space" != x; then
1.7756 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7757 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7758 - fi
1.7759 - as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7760 - fi
1.7761 - fi
1.7762 -
1.7763 - # Now join together the path and the arguments once again
1.7764 - if test "x$arguments" != xEOL; then
1.7765 - new_complete="$new_path ${arguments% *}"
1.7766 - else
1.7767 - new_complete="$new_path"
1.7768 - fi
1.7769 + fi
1.7770 + as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7771 + fi
1.7772 + fi
1.7773 +
1.7774 + # Now join together the path and the arguments once again
1.7775 + if test "x$arguments" != xEOL; then
1.7776 + new_complete="$new_path ${arguments% *}"
1.7777 + else
1.7778 + new_complete="$new_path"
1.7779 + fi
1.7780
1.7781 if test "x$complete" != "x$new_complete"; then
1.7782 - RC="$new_complete"
1.7783 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5
1.7784 + RC="$new_complete"
1.7785 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5
1.7786 $as_echo "$as_me: Rewriting RC to \"$new_complete\"" >&6;}
1.7787 - fi
1.7788 + fi
1.7789
1.7790
1.7791 # For hotspot, we need these in Windows mixed path,
1.7792 @@ -23516,26 +23513,26 @@
1.7793 RC_FLAGS="-nologo -l 0x409 -r"
1.7794 if test "x$VARIANT" = xOPT; then :
1.7795
1.7796 - RC_FLAGS="$RC_FLAGS -d NDEBUG"
1.7797 -
1.7798 -fi
1.7799 -
1.7800 - # The version variables used to create RC_FLAGS may be overridden
1.7801 - # in a custom configure script, or possibly the command line.
1.7802 - # Let those variables be expanded at make time in spec.gmk.
1.7803 - # The \$ are escaped to the shell, and the $(...) variables
1.7804 - # are evaluated by make.
1.7805 - RC_FLAGS="$RC_FLAGS \
1.7806 - -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
1.7807 - -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
1.7808 - -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
1.7809 - -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
1.7810 - -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
1.7811 - -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
1.7812 - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
1.7813 -
1.7814 - # lib.exe is used to create static libraries.
1.7815 - # Extract the first word of "lib", so it can be a program name with args.
1.7816 + RC_FLAGS="$RC_FLAGS -d NDEBUG"
1.7817 +
1.7818 +fi
1.7819 +
1.7820 + # The version variables used to create RC_FLAGS may be overridden
1.7821 + # in a custom configure script, or possibly the command line.
1.7822 + # Let those variables be expanded at make time in spec.gmk.
1.7823 + # The \$ are escaped to the shell, and the $(...) variables
1.7824 + # are evaluated by make.
1.7825 + RC_FLAGS="$RC_FLAGS \
1.7826 + -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
1.7827 + -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
1.7828 + -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
1.7829 + -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
1.7830 + -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
1.7831 + -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
1.7832 + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
1.7833 +
1.7834 + # lib.exe is used to create static libraries.
1.7835 + # Extract the first word of "lib", so it can be a program name with args.
1.7836 set dummy lib; ac_word=$2
1.7837 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7838 $as_echo_n "checking for $ac_word... " >&6; }
1.7839 @@ -23591,8 +23588,8 @@
1.7840 # bat and cmd files are not always considered executable in cygwin causing which
1.7841 # to not find them
1.7842 if test "x$new_path" = x \
1.7843 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7844 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7845 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7846 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7847 new_path=`$CYGPATH -u "$path"`
1.7848 fi
1.7849 if test "x$new_path" = x; then
1.7850 @@ -23607,8 +23604,8 @@
1.7851 # bat and cmd files are not always considered executable in cygwin causing which
1.7852 # to not find them
1.7853 if test "x$new_path" = x \
1.7854 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7855 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7856 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7857 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7858 new_path=`$CYGPATH -u "$path"`
1.7859 fi
1.7860 if test "x$new_path" = x; then
1.7861 @@ -23636,9 +23633,9 @@
1.7862 # Short path failed, file does not exist as specified.
1.7863 # Try adding .exe or .cmd
1.7864 if test -f "${new_path}.exe"; then
1.7865 - input_to_shortpath="${new_path}.exe"
1.7866 + input_to_shortpath="${new_path}.exe"
1.7867 elif test -f "${new_path}.cmd"; then
1.7868 - input_to_shortpath="${new_path}.cmd"
1.7869 + input_to_shortpath="${new_path}.cmd"
1.7870 else
1.7871 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$new_path\", is invalid." >&5
1.7872 $as_echo "$as_me: The path of WINAR, which resolves as \"$new_path\", is invalid." >&6;}
1.7873 @@ -23814,34 +23811,34 @@
1.7874 fi
1.7875
1.7876 if test "x$new_path" = x; then
1.7877 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
1.7878 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
1.7879 $as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
1.7880 - has_space=`$ECHO "$complete" | $GREP " "`
1.7881 - if test "x$has_space" != x; then
1.7882 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7883 + has_space=`$ECHO "$complete" | $GREP " "`
1.7884 + if test "x$has_space" != x; then
1.7885 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7886 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7887 - fi
1.7888 - as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
1.7889 - fi
1.7890 - fi
1.7891 -
1.7892 - # Now join together the path and the arguments once again
1.7893 - if test "x$arguments" != xEOL; then
1.7894 - new_complete="$new_path ${arguments% *}"
1.7895 - else
1.7896 - new_complete="$new_path"
1.7897 - fi
1.7898 + fi
1.7899 + as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
1.7900 + fi
1.7901 + fi
1.7902 +
1.7903 + # Now join together the path and the arguments once again
1.7904 + if test "x$arguments" != xEOL; then
1.7905 + new_complete="$new_path ${arguments% *}"
1.7906 + else
1.7907 + new_complete="$new_path"
1.7908 + fi
1.7909
1.7910 if test "x$complete" != "x$new_complete"; then
1.7911 - WINAR="$new_complete"
1.7912 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINAR to \"$new_complete\"" >&5
1.7913 + WINAR="$new_complete"
1.7914 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINAR to \"$new_complete\"" >&5
1.7915 $as_echo "$as_me: Rewriting WINAR to \"$new_complete\"" >&6;}
1.7916 - fi
1.7917 -
1.7918 - AR="$WINAR"
1.7919 - ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
1.7920 -
1.7921 - # Extract the first word of "dumpbin", so it can be a program name with args.
1.7922 + fi
1.7923 +
1.7924 + AR="$WINAR"
1.7925 + ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
1.7926 +
1.7927 + # Extract the first word of "dumpbin", so it can be a program name with args.
1.7928 set dummy dumpbin; ac_word=$2
1.7929 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7930 $as_echo_n "checking for $ac_word... " >&6; }
1.7931 @@ -23897,8 +23894,8 @@
1.7932 # bat and cmd files are not always considered executable in cygwin causing which
1.7933 # to not find them
1.7934 if test "x$new_path" = x \
1.7935 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7936 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7937 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7938 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7939 new_path=`$CYGPATH -u "$path"`
1.7940 fi
1.7941 if test "x$new_path" = x; then
1.7942 @@ -23913,8 +23910,8 @@
1.7943 # bat and cmd files are not always considered executable in cygwin causing which
1.7944 # to not find them
1.7945 if test "x$new_path" = x \
1.7946 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7947 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7948 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.7949 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.7950 new_path=`$CYGPATH -u "$path"`
1.7951 fi
1.7952 if test "x$new_path" = x; then
1.7953 @@ -23942,9 +23939,9 @@
1.7954 # Short path failed, file does not exist as specified.
1.7955 # Try adding .exe or .cmd
1.7956 if test -f "${new_path}.exe"; then
1.7957 - input_to_shortpath="${new_path}.exe"
1.7958 + input_to_shortpath="${new_path}.exe"
1.7959 elif test -f "${new_path}.cmd"; then
1.7960 - input_to_shortpath="${new_path}.cmd"
1.7961 + input_to_shortpath="${new_path}.cmd"
1.7962 else
1.7963 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&5
1.7964 $as_echo "$as_me: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&6;}
1.7965 @@ -24120,39 +24117,39 @@
1.7966 fi
1.7967
1.7968 if test "x$new_path" = x; then
1.7969 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
1.7970 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
1.7971 $as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
1.7972 - has_space=`$ECHO "$complete" | $GREP " "`
1.7973 - if test "x$has_space" != x; then
1.7974 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7975 + has_space=`$ECHO "$complete" | $GREP " "`
1.7976 + if test "x$has_space" != x; then
1.7977 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7978 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7979 - fi
1.7980 - as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.7981 - fi
1.7982 - fi
1.7983 -
1.7984 - # Now join together the path and the arguments once again
1.7985 - if test "x$arguments" != xEOL; then
1.7986 - new_complete="$new_path ${arguments% *}"
1.7987 - else
1.7988 - new_complete="$new_path"
1.7989 - fi
1.7990 + fi
1.7991 + as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.7992 + fi
1.7993 + fi
1.7994 +
1.7995 + # Now join together the path and the arguments once again
1.7996 + if test "x$arguments" != xEOL; then
1.7997 + new_complete="$new_path ${arguments% *}"
1.7998 + else
1.7999 + new_complete="$new_path"
1.8000 + fi
1.8001
1.8002 if test "x$complete" != "x$new_complete"; then
1.8003 - DUMPBIN="$new_complete"
1.8004 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5
1.8005 + DUMPBIN="$new_complete"
1.8006 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5
1.8007 $as_echo "$as_me: Rewriting DUMPBIN to \"$new_complete\"" >&6;}
1.8008 - fi
1.8009 -
1.8010 -
1.8011 - COMPILER_TYPE=CL
1.8012 - CCXXFLAGS="$CCXXFLAGS -nologo"
1.8013 -
1.8014 -fi
1.8015 -
1.8016 -
1.8017 -
1.8018 -ac_ext=c
1.8019 + fi
1.8020 +
1.8021 +
1.8022 + COMPILER_TYPE=CL
1.8023 + CCXXFLAGS="$CCXXFLAGS -nologo"
1.8024 +
1.8025 +fi
1.8026 +
1.8027 +
1.8028 +
1.8029 + ac_ext=c
1.8030 ac_cpp='$CPP $CPPFLAGS'
1.8031 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.8032 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.8033 @@ -24308,8 +24305,8 @@
1.8034 # bat and cmd files are not always considered executable in cygwin causing which
1.8035 # to not find them
1.8036 if test "x$new_path" = x \
1.8037 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8038 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8039 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8040 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8041 new_path=`$CYGPATH -u "$path"`
1.8042 fi
1.8043 if test "x$new_path" = x; then
1.8044 @@ -24324,8 +24321,8 @@
1.8045 # bat and cmd files are not always considered executable in cygwin causing which
1.8046 # to not find them
1.8047 if test "x$new_path" = x \
1.8048 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8049 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8050 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8051 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8052 new_path=`$CYGPATH -u "$path"`
1.8053 fi
1.8054 if test "x$new_path" = x; then
1.8055 @@ -24353,9 +24350,9 @@
1.8056 # Short path failed, file does not exist as specified.
1.8057 # Try adding .exe or .cmd
1.8058 if test -f "${new_path}.exe"; then
1.8059 - input_to_shortpath="${new_path}.exe"
1.8060 + input_to_shortpath="${new_path}.exe"
1.8061 elif test -f "${new_path}.cmd"; then
1.8062 - input_to_shortpath="${new_path}.cmd"
1.8063 + input_to_shortpath="${new_path}.cmd"
1.8064 else
1.8065 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$new_path\", is invalid." >&5
1.8066 $as_echo "$as_me: The path of CPP, which resolves as \"$new_path\", is invalid." >&6;}
1.8067 @@ -24531,32 +24528,32 @@
1.8068 fi
1.8069
1.8070 if test "x$new_path" = x; then
1.8071 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
1.8072 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
1.8073 $as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
1.8074 - has_space=`$ECHO "$complete" | $GREP " "`
1.8075 - if test "x$has_space" != x; then
1.8076 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8077 + has_space=`$ECHO "$complete" | $GREP " "`
1.8078 + if test "x$has_space" != x; then
1.8079 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8080 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8081 - fi
1.8082 - as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.8083 - fi
1.8084 - fi
1.8085 -
1.8086 - # Now join together the path and the arguments once again
1.8087 - if test "x$arguments" != xEOL; then
1.8088 - new_complete="$new_path ${arguments% *}"
1.8089 - else
1.8090 - new_complete="$new_path"
1.8091 - fi
1.8092 + fi
1.8093 + as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.8094 + fi
1.8095 + fi
1.8096 +
1.8097 + # Now join together the path and the arguments once again
1.8098 + if test "x$arguments" != xEOL; then
1.8099 + new_complete="$new_path ${arguments% *}"
1.8100 + else
1.8101 + new_complete="$new_path"
1.8102 + fi
1.8103
1.8104 if test "x$complete" != "x$new_complete"; then
1.8105 - CPP="$new_complete"
1.8106 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5
1.8107 + CPP="$new_complete"
1.8108 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5
1.8109 $as_echo "$as_me: Rewriting CPP to \"$new_complete\"" >&6;}
1.8110 - fi
1.8111 -
1.8112 -
1.8113 -ac_ext=cpp
1.8114 + fi
1.8115 +
1.8116 +
1.8117 + ac_ext=cpp
1.8118 ac_cpp='$CXXCPP $CPPFLAGS'
1.8119 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.8120 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.8121 @@ -24708,8 +24705,8 @@
1.8122 # bat and cmd files are not always considered executable in cygwin causing which
1.8123 # to not find them
1.8124 if test "x$new_path" = x \
1.8125 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8126 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8127 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8128 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8129 new_path=`$CYGPATH -u "$path"`
1.8130 fi
1.8131 if test "x$new_path" = x; then
1.8132 @@ -24724,8 +24721,8 @@
1.8133 # bat and cmd files are not always considered executable in cygwin causing which
1.8134 # to not find them
1.8135 if test "x$new_path" = x \
1.8136 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8137 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8138 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8139 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8140 new_path=`$CYGPATH -u "$path"`
1.8141 fi
1.8142 if test "x$new_path" = x; then
1.8143 @@ -24753,9 +24750,9 @@
1.8144 # Short path failed, file does not exist as specified.
1.8145 # Try adding .exe or .cmd
1.8146 if test -f "${new_path}.exe"; then
1.8147 - input_to_shortpath="${new_path}.exe"
1.8148 + input_to_shortpath="${new_path}.exe"
1.8149 elif test -f "${new_path}.cmd"; then
1.8150 - input_to_shortpath="${new_path}.cmd"
1.8151 + input_to_shortpath="${new_path}.cmd"
1.8152 else
1.8153 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&5
1.8154 $as_echo "$as_me: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&6;}
1.8155 @@ -24931,32 +24928,32 @@
1.8156 fi
1.8157
1.8158 if test "x$new_path" = x; then
1.8159 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
1.8160 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
1.8161 $as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
1.8162 - has_space=`$ECHO "$complete" | $GREP " "`
1.8163 - if test "x$has_space" != x; then
1.8164 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8165 + has_space=`$ECHO "$complete" | $GREP " "`
1.8166 + if test "x$has_space" != x; then
1.8167 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8168 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8169 - fi
1.8170 - as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.8171 - fi
1.8172 - fi
1.8173 -
1.8174 - # Now join together the path and the arguments once again
1.8175 - if test "x$arguments" != xEOL; then
1.8176 - new_complete="$new_path ${arguments% *}"
1.8177 - else
1.8178 - new_complete="$new_path"
1.8179 - fi
1.8180 + fi
1.8181 + as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.8182 + fi
1.8183 + fi
1.8184 +
1.8185 + # Now join together the path and the arguments once again
1.8186 + if test "x$arguments" != xEOL; then
1.8187 + new_complete="$new_path ${arguments% *}"
1.8188 + else
1.8189 + new_complete="$new_path"
1.8190 + fi
1.8191
1.8192 if test "x$complete" != "x$new_complete"; then
1.8193 - CXXCPP="$new_complete"
1.8194 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5
1.8195 + CXXCPP="$new_complete"
1.8196 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5
1.8197 $as_echo "$as_me: Rewriting CXXCPP to \"$new_complete\"" >&6;}
1.8198 - fi
1.8199 -
1.8200 -
1.8201 -if test "x$COMPILE_TYPE" != "xcross"; then
1.8202 + fi
1.8203 +
1.8204 +
1.8205 + if test "x$COMPILE_TYPE" != "xcross"; then
1.8206 # If we are not cross compiling, use the same compilers for
1.8207 # building the build platform executables. The cross-compilation
1.8208 # case needed to be done earlier, but this can only be done after
1.8209 @@ -24964,20 +24961,20 @@
1.8210 BUILD_CC="$CC"
1.8211 BUILD_CXX="$CXX"
1.8212 BUILD_LD="$LD"
1.8213 -fi
1.8214 -
1.8215 -# for solaris we really need solaris tools, and not gnu equivalent
1.8216 -# these seems to normally reside in /usr/ccs/bin so add that to path before
1.8217 -# starting to probe
1.8218 -#
1.8219 -# NOTE: I add this /usr/ccs/bin after TOOLS but before OLD_PATH
1.8220 -# so that it can be overriden --with-tools-dir
1.8221 -if test "x$OPENJDK_BUILD_OS" = xsolaris; then
1.8222 + fi
1.8223 +
1.8224 + # for solaris we really need solaris tools, and not gnu equivalent
1.8225 + # these seems to normally reside in /usr/ccs/bin so add that to path before
1.8226 + # starting to probe
1.8227 + #
1.8228 + # NOTE: I add this /usr/ccs/bin after TOOLS but before OLD_PATH
1.8229 + # so that it can be overriden --with-tools-dir
1.8230 + if test "x$OPENJDK_BUILD_OS" = xsolaris; then
1.8231 PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}"
1.8232 -fi
1.8233 -
1.8234 -# Find the right assembler.
1.8235 -if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.8236 + fi
1.8237 +
1.8238 + # Find the right assembler.
1.8239 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.8240 # Extract the first word of "as", so it can be a program name with args.
1.8241 set dummy as; ac_word=$2
1.8242 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8243 @@ -25037,8 +25034,8 @@
1.8244 # bat and cmd files are not always considered executable in cygwin causing which
1.8245 # to not find them
1.8246 if test "x$new_path" = x \
1.8247 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8248 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8249 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8250 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8251 new_path=`$CYGPATH -u "$path"`
1.8252 fi
1.8253 if test "x$new_path" = x; then
1.8254 @@ -25053,8 +25050,8 @@
1.8255 # bat and cmd files are not always considered executable in cygwin causing which
1.8256 # to not find them
1.8257 if test "x$new_path" = x \
1.8258 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8259 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8260 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8261 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8262 new_path=`$CYGPATH -u "$path"`
1.8263 fi
1.8264 if test "x$new_path" = x; then
1.8265 @@ -25082,9 +25079,9 @@
1.8266 # Short path failed, file does not exist as specified.
1.8267 # Try adding .exe or .cmd
1.8268 if test -f "${new_path}.exe"; then
1.8269 - input_to_shortpath="${new_path}.exe"
1.8270 + input_to_shortpath="${new_path}.exe"
1.8271 elif test -f "${new_path}.cmd"; then
1.8272 - input_to_shortpath="${new_path}.cmd"
1.8273 + input_to_shortpath="${new_path}.cmd"
1.8274 else
1.8275 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$new_path\", is invalid." >&5
1.8276 $as_echo "$as_me: The path of AS, which resolves as \"$new_path\", is invalid." >&6;}
1.8277 @@ -25260,36 +25257,36 @@
1.8278 fi
1.8279
1.8280 if test "x$new_path" = x; then
1.8281 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
1.8282 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
1.8283 $as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
1.8284 - has_space=`$ECHO "$complete" | $GREP " "`
1.8285 - if test "x$has_space" != x; then
1.8286 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8287 + has_space=`$ECHO "$complete" | $GREP " "`
1.8288 + if test "x$has_space" != x; then
1.8289 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8290 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8291 - fi
1.8292 - as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.8293 - fi
1.8294 - fi
1.8295 -
1.8296 - # Now join together the path and the arguments once again
1.8297 - if test "x$arguments" != xEOL; then
1.8298 - new_complete="$new_path ${arguments% *}"
1.8299 - else
1.8300 - new_complete="$new_path"
1.8301 - fi
1.8302 + fi
1.8303 + as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.8304 + fi
1.8305 + fi
1.8306 +
1.8307 + # Now join together the path and the arguments once again
1.8308 + if test "x$arguments" != xEOL; then
1.8309 + new_complete="$new_path ${arguments% *}"
1.8310 + else
1.8311 + new_complete="$new_path"
1.8312 + fi
1.8313
1.8314 if test "x$complete" != "x$new_complete"; then
1.8315 - AS="$new_complete"
1.8316 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5
1.8317 + AS="$new_complete"
1.8318 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5
1.8319 $as_echo "$as_me: Rewriting AS to \"$new_complete\"" >&6;}
1.8320 - fi
1.8321 -
1.8322 -else
1.8323 + fi
1.8324 +
1.8325 + else
1.8326 AS="$CC -c"
1.8327 -fi
1.8328 -
1.8329 -
1.8330 -if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.8331 + fi
1.8332 +
1.8333 +
1.8334 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.8335 # Extract the first word of "nm", so it can be a program name with args.
1.8336 set dummy nm; ac_word=$2
1.8337 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8338 @@ -25349,8 +25346,8 @@
1.8339 # bat and cmd files are not always considered executable in cygwin causing which
1.8340 # to not find them
1.8341 if test "x$new_path" = x \
1.8342 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8343 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8344 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8345 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8346 new_path=`$CYGPATH -u "$path"`
1.8347 fi
1.8348 if test "x$new_path" = x; then
1.8349 @@ -25365,8 +25362,8 @@
1.8350 # bat and cmd files are not always considered executable in cygwin causing which
1.8351 # to not find them
1.8352 if test "x$new_path" = x \
1.8353 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8354 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8355 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8356 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8357 new_path=`$CYGPATH -u "$path"`
1.8358 fi
1.8359 if test "x$new_path" = x; then
1.8360 @@ -25394,9 +25391,9 @@
1.8361 # Short path failed, file does not exist as specified.
1.8362 # Try adding .exe or .cmd
1.8363 if test -f "${new_path}.exe"; then
1.8364 - input_to_shortpath="${new_path}.exe"
1.8365 + input_to_shortpath="${new_path}.exe"
1.8366 elif test -f "${new_path}.cmd"; then
1.8367 - input_to_shortpath="${new_path}.cmd"
1.8368 + input_to_shortpath="${new_path}.cmd"
1.8369 else
1.8370 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5
1.8371 $as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;}
1.8372 @@ -25572,29 +25569,29 @@
1.8373 fi
1.8374
1.8375 if test "x$new_path" = x; then
1.8376 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.8377 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.8378 $as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.8379 - has_space=`$ECHO "$complete" | $GREP " "`
1.8380 - if test "x$has_space" != x; then
1.8381 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8382 + has_space=`$ECHO "$complete" | $GREP " "`
1.8383 + if test "x$has_space" != x; then
1.8384 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8385 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8386 - fi
1.8387 - as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.8388 - fi
1.8389 - fi
1.8390 -
1.8391 - # Now join together the path and the arguments once again
1.8392 - if test "x$arguments" != xEOL; then
1.8393 - new_complete="$new_path ${arguments% *}"
1.8394 - else
1.8395 - new_complete="$new_path"
1.8396 - fi
1.8397 + fi
1.8398 + as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.8399 + fi
1.8400 + fi
1.8401 +
1.8402 + # Now join together the path and the arguments once again
1.8403 + if test "x$arguments" != xEOL; then
1.8404 + new_complete="$new_path ${arguments% *}"
1.8405 + else
1.8406 + new_complete="$new_path"
1.8407 + fi
1.8408
1.8409 if test "x$complete" != "x$new_complete"; then
1.8410 - NM="$new_complete"
1.8411 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.8412 + NM="$new_complete"
1.8413 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.8414 $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
1.8415 - fi
1.8416 + fi
1.8417
1.8418 # Extract the first word of "gnm", so it can be a program name with args.
1.8419 set dummy gnm; ac_word=$2
1.8420 @@ -25655,8 +25652,8 @@
1.8421 # bat and cmd files are not always considered executable in cygwin causing which
1.8422 # to not find them
1.8423 if test "x$new_path" = x \
1.8424 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8425 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8426 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8427 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8428 new_path=`$CYGPATH -u "$path"`
1.8429 fi
1.8430 if test "x$new_path" = x; then
1.8431 @@ -25671,8 +25668,8 @@
1.8432 # bat and cmd files are not always considered executable in cygwin causing which
1.8433 # to not find them
1.8434 if test "x$new_path" = x \
1.8435 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8436 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8437 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8438 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8439 new_path=`$CYGPATH -u "$path"`
1.8440 fi
1.8441 if test "x$new_path" = x; then
1.8442 @@ -25700,9 +25697,9 @@
1.8443 # Short path failed, file does not exist as specified.
1.8444 # Try adding .exe or .cmd
1.8445 if test -f "${new_path}.exe"; then
1.8446 - input_to_shortpath="${new_path}.exe"
1.8447 + input_to_shortpath="${new_path}.exe"
1.8448 elif test -f "${new_path}.cmd"; then
1.8449 - input_to_shortpath="${new_path}.cmd"
1.8450 + input_to_shortpath="${new_path}.cmd"
1.8451 else
1.8452 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$new_path\", is invalid." >&5
1.8453 $as_echo "$as_me: The path of GNM, which resolves as \"$new_path\", is invalid." >&6;}
1.8454 @@ -25878,29 +25875,29 @@
1.8455 fi
1.8456
1.8457 if test "x$new_path" = x; then
1.8458 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
1.8459 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
1.8460 $as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
1.8461 - has_space=`$ECHO "$complete" | $GREP " "`
1.8462 - if test "x$has_space" != x; then
1.8463 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8464 + has_space=`$ECHO "$complete" | $GREP " "`
1.8465 + if test "x$has_space" != x; then
1.8466 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8467 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8468 - fi
1.8469 - as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.8470 - fi
1.8471 - fi
1.8472 -
1.8473 - # Now join together the path and the arguments once again
1.8474 - if test "x$arguments" != xEOL; then
1.8475 - new_complete="$new_path ${arguments% *}"
1.8476 - else
1.8477 - new_complete="$new_path"
1.8478 - fi
1.8479 + fi
1.8480 + as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.8481 + fi
1.8482 + fi
1.8483 +
1.8484 + # Now join together the path and the arguments once again
1.8485 + if test "x$arguments" != xEOL; then
1.8486 + new_complete="$new_path ${arguments% *}"
1.8487 + else
1.8488 + new_complete="$new_path"
1.8489 + fi
1.8490
1.8491 if test "x$complete" != "x$new_complete"; then
1.8492 - GNM="$new_complete"
1.8493 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting GNM to \"$new_complete\"" >&5
1.8494 + GNM="$new_complete"
1.8495 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting GNM to \"$new_complete\"" >&5
1.8496 $as_echo "$as_me: Rewriting GNM to \"$new_complete\"" >&6;}
1.8497 - fi
1.8498 + fi
1.8499
1.8500 # Extract the first word of "strip", so it can be a program name with args.
1.8501 set dummy strip; ac_word=$2
1.8502 @@ -25961,8 +25958,8 @@
1.8503 # bat and cmd files are not always considered executable in cygwin causing which
1.8504 # to not find them
1.8505 if test "x$new_path" = x \
1.8506 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8507 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8508 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8509 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8510 new_path=`$CYGPATH -u "$path"`
1.8511 fi
1.8512 if test "x$new_path" = x; then
1.8513 @@ -25977,8 +25974,8 @@
1.8514 # bat and cmd files are not always considered executable in cygwin causing which
1.8515 # to not find them
1.8516 if test "x$new_path" = x \
1.8517 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8518 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8519 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8520 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8521 new_path=`$CYGPATH -u "$path"`
1.8522 fi
1.8523 if test "x$new_path" = x; then
1.8524 @@ -26006,9 +26003,9 @@
1.8525 # Short path failed, file does not exist as specified.
1.8526 # Try adding .exe or .cmd
1.8527 if test -f "${new_path}.exe"; then
1.8528 - input_to_shortpath="${new_path}.exe"
1.8529 + input_to_shortpath="${new_path}.exe"
1.8530 elif test -f "${new_path}.cmd"; then
1.8531 - input_to_shortpath="${new_path}.cmd"
1.8532 + input_to_shortpath="${new_path}.cmd"
1.8533 else
1.8534 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
1.8535 $as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
1.8536 @@ -26184,29 +26181,29 @@
1.8537 fi
1.8538
1.8539 if test "x$new_path" = x; then
1.8540 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.8541 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.8542 $as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.8543 - has_space=`$ECHO "$complete" | $GREP " "`
1.8544 - if test "x$has_space" != x; then
1.8545 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8546 + has_space=`$ECHO "$complete" | $GREP " "`
1.8547 + if test "x$has_space" != x; then
1.8548 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8549 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8550 - fi
1.8551 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.8552 - fi
1.8553 - fi
1.8554 -
1.8555 - # Now join together the path and the arguments once again
1.8556 - if test "x$arguments" != xEOL; then
1.8557 - new_complete="$new_path ${arguments% *}"
1.8558 - else
1.8559 - new_complete="$new_path"
1.8560 - fi
1.8561 + fi
1.8562 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.8563 + fi
1.8564 + fi
1.8565 +
1.8566 + # Now join together the path and the arguments once again
1.8567 + if test "x$arguments" != xEOL; then
1.8568 + new_complete="$new_path ${arguments% *}"
1.8569 + else
1.8570 + new_complete="$new_path"
1.8571 + fi
1.8572
1.8573 if test "x$complete" != "x$new_complete"; then
1.8574 - STRIP="$new_complete"
1.8575 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.8576 + STRIP="$new_complete"
1.8577 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.8578 $as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
1.8579 - fi
1.8580 + fi
1.8581
1.8582 # Extract the first word of "mcs", so it can be a program name with args.
1.8583 set dummy mcs; ac_word=$2
1.8584 @@ -26267,8 +26264,8 @@
1.8585 # bat and cmd files are not always considered executable in cygwin causing which
1.8586 # to not find them
1.8587 if test "x$new_path" = x \
1.8588 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8589 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8590 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8591 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8592 new_path=`$CYGPATH -u "$path"`
1.8593 fi
1.8594 if test "x$new_path" = x; then
1.8595 @@ -26283,8 +26280,8 @@
1.8596 # bat and cmd files are not always considered executable in cygwin causing which
1.8597 # to not find them
1.8598 if test "x$new_path" = x \
1.8599 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8600 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8601 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8602 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8603 new_path=`$CYGPATH -u "$path"`
1.8604 fi
1.8605 if test "x$new_path" = x; then
1.8606 @@ -26312,9 +26309,9 @@
1.8607 # Short path failed, file does not exist as specified.
1.8608 # Try adding .exe or .cmd
1.8609 if test -f "${new_path}.exe"; then
1.8610 - input_to_shortpath="${new_path}.exe"
1.8611 + input_to_shortpath="${new_path}.exe"
1.8612 elif test -f "${new_path}.cmd"; then
1.8613 - input_to_shortpath="${new_path}.cmd"
1.8614 + input_to_shortpath="${new_path}.cmd"
1.8615 else
1.8616 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$new_path\", is invalid." >&5
1.8617 $as_echo "$as_me: The path of MCS, which resolves as \"$new_path\", is invalid." >&6;}
1.8618 @@ -26490,31 +26487,31 @@
1.8619 fi
1.8620
1.8621 if test "x$new_path" = x; then
1.8622 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
1.8623 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
1.8624 $as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
1.8625 - has_space=`$ECHO "$complete" | $GREP " "`
1.8626 - if test "x$has_space" != x; then
1.8627 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8628 + has_space=`$ECHO "$complete" | $GREP " "`
1.8629 + if test "x$has_space" != x; then
1.8630 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8631 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8632 - fi
1.8633 - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.8634 - fi
1.8635 - fi
1.8636 -
1.8637 - # Now join together the path and the arguments once again
1.8638 - if test "x$arguments" != xEOL; then
1.8639 - new_complete="$new_path ${arguments% *}"
1.8640 - else
1.8641 - new_complete="$new_path"
1.8642 - fi
1.8643 + fi
1.8644 + as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.8645 + fi
1.8646 + fi
1.8647 +
1.8648 + # Now join together the path and the arguments once again
1.8649 + if test "x$arguments" != xEOL; then
1.8650 + new_complete="$new_path ${arguments% *}"
1.8651 + else
1.8652 + new_complete="$new_path"
1.8653 + fi
1.8654
1.8655 if test "x$complete" != "x$new_complete"; then
1.8656 - MCS="$new_complete"
1.8657 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5
1.8658 + MCS="$new_complete"
1.8659 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5
1.8660 $as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;}
1.8661 - fi
1.8662 -
1.8663 -elif test "x$OPENJDK_TARGET_OS" != xwindows; then
1.8664 + fi
1.8665 +
1.8666 + elif test "x$OPENJDK_TARGET_OS" != xwindows; then
1.8667 if test -n "$ac_tool_prefix"; then
1.8668 # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
1.8669 set dummy ${ac_tool_prefix}nm; ac_word=$2
1.8670 @@ -26626,8 +26623,8 @@
1.8671 # bat and cmd files are not always considered executable in cygwin causing which
1.8672 # to not find them
1.8673 if test "x$new_path" = x \
1.8674 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8675 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8676 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8677 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8678 new_path=`$CYGPATH -u "$path"`
1.8679 fi
1.8680 if test "x$new_path" = x; then
1.8681 @@ -26642,8 +26639,8 @@
1.8682 # bat and cmd files are not always considered executable in cygwin causing which
1.8683 # to not find them
1.8684 if test "x$new_path" = x \
1.8685 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8686 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8687 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8688 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8689 new_path=`$CYGPATH -u "$path"`
1.8690 fi
1.8691 if test "x$new_path" = x; then
1.8692 @@ -26671,9 +26668,9 @@
1.8693 # Short path failed, file does not exist as specified.
1.8694 # Try adding .exe or .cmd
1.8695 if test -f "${new_path}.exe"; then
1.8696 - input_to_shortpath="${new_path}.exe"
1.8697 + input_to_shortpath="${new_path}.exe"
1.8698 elif test -f "${new_path}.cmd"; then
1.8699 - input_to_shortpath="${new_path}.cmd"
1.8700 + input_to_shortpath="${new_path}.cmd"
1.8701 else
1.8702 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5
1.8703 $as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;}
1.8704 @@ -26849,29 +26846,29 @@
1.8705 fi
1.8706
1.8707 if test "x$new_path" = x; then
1.8708 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.8709 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.8710 $as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.8711 - has_space=`$ECHO "$complete" | $GREP " "`
1.8712 - if test "x$has_space" != x; then
1.8713 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8714 + has_space=`$ECHO "$complete" | $GREP " "`
1.8715 + if test "x$has_space" != x; then
1.8716 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8717 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8718 - fi
1.8719 - as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.8720 - fi
1.8721 - fi
1.8722 -
1.8723 - # Now join together the path and the arguments once again
1.8724 - if test "x$arguments" != xEOL; then
1.8725 - new_complete="$new_path ${arguments% *}"
1.8726 - else
1.8727 - new_complete="$new_path"
1.8728 - fi
1.8729 + fi
1.8730 + as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.8731 + fi
1.8732 + fi
1.8733 +
1.8734 + # Now join together the path and the arguments once again
1.8735 + if test "x$arguments" != xEOL; then
1.8736 + new_complete="$new_path ${arguments% *}"
1.8737 + else
1.8738 + new_complete="$new_path"
1.8739 + fi
1.8740
1.8741 if test "x$complete" != "x$new_complete"; then
1.8742 - NM="$new_complete"
1.8743 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.8744 + NM="$new_complete"
1.8745 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.8746 $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
1.8747 - fi
1.8748 + fi
1.8749
1.8750 GNM="$NM"
1.8751
1.8752 @@ -26986,8 +26983,8 @@
1.8753 # bat and cmd files are not always considered executable in cygwin causing which
1.8754 # to not find them
1.8755 if test "x$new_path" = x \
1.8756 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8757 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8758 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8759 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8760 new_path=`$CYGPATH -u "$path"`
1.8761 fi
1.8762 if test "x$new_path" = x; then
1.8763 @@ -27002,8 +26999,8 @@
1.8764 # bat and cmd files are not always considered executable in cygwin causing which
1.8765 # to not find them
1.8766 if test "x$new_path" = x \
1.8767 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8768 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8769 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8770 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8771 new_path=`$CYGPATH -u "$path"`
1.8772 fi
1.8773 if test "x$new_path" = x; then
1.8774 @@ -27031,9 +27028,9 @@
1.8775 # Short path failed, file does not exist as specified.
1.8776 # Try adding .exe or .cmd
1.8777 if test -f "${new_path}.exe"; then
1.8778 - input_to_shortpath="${new_path}.exe"
1.8779 + input_to_shortpath="${new_path}.exe"
1.8780 elif test -f "${new_path}.cmd"; then
1.8781 - input_to_shortpath="${new_path}.cmd"
1.8782 + input_to_shortpath="${new_path}.cmd"
1.8783 else
1.8784 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
1.8785 $as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
1.8786 @@ -27209,35 +27206,35 @@
1.8787 fi
1.8788
1.8789 if test "x$new_path" = x; then
1.8790 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.8791 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.8792 $as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.8793 - has_space=`$ECHO "$complete" | $GREP " "`
1.8794 - if test "x$has_space" != x; then
1.8795 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8796 + has_space=`$ECHO "$complete" | $GREP " "`
1.8797 + if test "x$has_space" != x; then
1.8798 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8799 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8800 - fi
1.8801 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.8802 - fi
1.8803 - fi
1.8804 -
1.8805 - # Now join together the path and the arguments once again
1.8806 - if test "x$arguments" != xEOL; then
1.8807 - new_complete="$new_path ${arguments% *}"
1.8808 - else
1.8809 - new_complete="$new_path"
1.8810 - fi
1.8811 + fi
1.8812 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.8813 + fi
1.8814 + fi
1.8815 +
1.8816 + # Now join together the path and the arguments once again
1.8817 + if test "x$arguments" != xEOL; then
1.8818 + new_complete="$new_path ${arguments% *}"
1.8819 + else
1.8820 + new_complete="$new_path"
1.8821 + fi
1.8822
1.8823 if test "x$complete" != "x$new_complete"; then
1.8824 - STRIP="$new_complete"
1.8825 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.8826 + STRIP="$new_complete"
1.8827 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.8828 $as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
1.8829 - fi
1.8830 -
1.8831 -fi
1.8832 -
1.8833 -# objcopy is used for moving debug symbols to separate files when
1.8834 -# full debug symbols are enabled.
1.8835 -if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
1.8836 + fi
1.8837 +
1.8838 + fi
1.8839 +
1.8840 + # objcopy is used for moving debug symbols to separate files when
1.8841 + # full debug symbols are enabled.
1.8842 + if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
1.8843 if test -n "$ac_tool_prefix"; then
1.8844 for ac_prog in gobjcopy objcopy
1.8845 do
1.8846 @@ -27359,8 +27356,8 @@
1.8847 # bat and cmd files are not always considered executable in cygwin causing which
1.8848 # to not find them
1.8849 if test "x$new_path" = x \
1.8850 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8851 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8852 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8853 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8854 new_path=`$CYGPATH -u "$path"`
1.8855 fi
1.8856 if test "x$new_path" = x; then
1.8857 @@ -27375,8 +27372,8 @@
1.8858 # bat and cmd files are not always considered executable in cygwin causing which
1.8859 # to not find them
1.8860 if test "x$new_path" = x \
1.8861 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8862 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8863 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8864 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8865 new_path=`$CYGPATH -u "$path"`
1.8866 fi
1.8867 if test "x$new_path" = x; then
1.8868 @@ -27404,9 +27401,9 @@
1.8869 # Short path failed, file does not exist as specified.
1.8870 # Try adding .exe or .cmd
1.8871 if test -f "${new_path}.exe"; then
1.8872 - input_to_shortpath="${new_path}.exe"
1.8873 + input_to_shortpath="${new_path}.exe"
1.8874 elif test -f "${new_path}.cmd"; then
1.8875 - input_to_shortpath="${new_path}.cmd"
1.8876 + input_to_shortpath="${new_path}.cmd"
1.8877 else
1.8878 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&5
1.8879 $as_echo "$as_me: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&6;}
1.8880 @@ -27582,34 +27579,34 @@
1.8881 fi
1.8882
1.8883 if test "x$new_path" = x; then
1.8884 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
1.8885 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
1.8886 $as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
1.8887 - has_space=`$ECHO "$complete" | $GREP " "`
1.8888 - if test "x$has_space" != x; then
1.8889 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8890 + has_space=`$ECHO "$complete" | $GREP " "`
1.8891 + if test "x$has_space" != x; then
1.8892 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8893 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8894 - fi
1.8895 - as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.8896 - fi
1.8897 - fi
1.8898 -
1.8899 - # Now join together the path and the arguments once again
1.8900 - if test "x$arguments" != xEOL; then
1.8901 - new_complete="$new_path ${arguments% *}"
1.8902 - else
1.8903 - new_complete="$new_path"
1.8904 - fi
1.8905 + fi
1.8906 + as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.8907 + fi
1.8908 + fi
1.8909 +
1.8910 + # Now join together the path and the arguments once again
1.8911 + if test "x$arguments" != xEOL; then
1.8912 + new_complete="$new_path ${arguments% *}"
1.8913 + else
1.8914 + new_complete="$new_path"
1.8915 + fi
1.8916
1.8917 if test "x$complete" != "x$new_complete"; then
1.8918 - OBJCOPY="$new_complete"
1.8919 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5
1.8920 + OBJCOPY="$new_complete"
1.8921 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5
1.8922 $as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;}
1.8923 - fi
1.8924 -
1.8925 - fi
1.8926 -fi
1.8927 -
1.8928 -if test -n "$ac_tool_prefix"; then
1.8929 + fi
1.8930 +
1.8931 + fi
1.8932 + fi
1.8933 +
1.8934 + if test -n "$ac_tool_prefix"; then
1.8935 for ac_prog in gobjdump objdump
1.8936 do
1.8937 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.8938 @@ -27709,8 +27706,8 @@
1.8939 fi
1.8940 fi
1.8941
1.8942 -if test "x$OBJDUMP" != x; then
1.8943 - # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
1.8944 + if test "x$OBJDUMP" != x; then
1.8945 + # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
1.8946
1.8947 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.8948
1.8949 @@ -27730,8 +27727,8 @@
1.8950 # bat and cmd files are not always considered executable in cygwin causing which
1.8951 # to not find them
1.8952 if test "x$new_path" = x \
1.8953 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8954 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8955 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8956 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8957 new_path=`$CYGPATH -u "$path"`
1.8958 fi
1.8959 if test "x$new_path" = x; then
1.8960 @@ -27746,8 +27743,8 @@
1.8961 # bat and cmd files are not always considered executable in cygwin causing which
1.8962 # to not find them
1.8963 if test "x$new_path" = x \
1.8964 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8965 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8966 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.8967 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.8968 new_path=`$CYGPATH -u "$path"`
1.8969 fi
1.8970 if test "x$new_path" = x; then
1.8971 @@ -27775,9 +27772,9 @@
1.8972 # Short path failed, file does not exist as specified.
1.8973 # Try adding .exe or .cmd
1.8974 if test -f "${new_path}.exe"; then
1.8975 - input_to_shortpath="${new_path}.exe"
1.8976 + input_to_shortpath="${new_path}.exe"
1.8977 elif test -f "${new_path}.cmd"; then
1.8978 - input_to_shortpath="${new_path}.cmd"
1.8979 + input_to_shortpath="${new_path}.cmd"
1.8980 else
1.8981 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&5
1.8982 $as_echo "$as_me: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&6;}
1.8983 @@ -27953,34 +27950,34 @@
1.8984 fi
1.8985
1.8986 if test "x$new_path" = x; then
1.8987 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
1.8988 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
1.8989 $as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
1.8990 - has_space=`$ECHO "$complete" | $GREP " "`
1.8991 - if test "x$has_space" != x; then
1.8992 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8993 + has_space=`$ECHO "$complete" | $GREP " "`
1.8994 + if test "x$has_space" != x; then
1.8995 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8996 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8997 - fi
1.8998 - as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.8999 - fi
1.9000 - fi
1.9001 -
1.9002 - # Now join together the path and the arguments once again
1.9003 - if test "x$arguments" != xEOL; then
1.9004 - new_complete="$new_path ${arguments% *}"
1.9005 - else
1.9006 - new_complete="$new_path"
1.9007 - fi
1.9008 + fi
1.9009 + as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.9010 + fi
1.9011 + fi
1.9012 +
1.9013 + # Now join together the path and the arguments once again
1.9014 + if test "x$arguments" != xEOL; then
1.9015 + new_complete="$new_path ${arguments% *}"
1.9016 + else
1.9017 + new_complete="$new_path"
1.9018 + fi
1.9019
1.9020 if test "x$complete" != "x$new_complete"; then
1.9021 - OBJDUMP="$new_complete"
1.9022 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5
1.9023 + OBJDUMP="$new_complete"
1.9024 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5
1.9025 $as_echo "$as_me: Rewriting OBJDUMP to \"$new_complete\"" >&6;}
1.9026 - fi
1.9027 -
1.9028 -fi
1.9029 -
1.9030 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.9031 - # Extract the first word of "lipo", so it can be a program name with args.
1.9032 + fi
1.9033 +
1.9034 + fi
1.9035 +
1.9036 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.9037 + # Extract the first word of "lipo", so it can be a program name with args.
1.9038 set dummy lipo; ac_word=$2
1.9039 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9040 $as_echo_n "checking for $ac_word... " >&6; }
1.9041 @@ -28039,8 +28036,8 @@
1.9042 # bat and cmd files are not always considered executable in cygwin causing which
1.9043 # to not find them
1.9044 if test "x$new_path" = x \
1.9045 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.9046 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.9047 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.9048 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.9049 new_path=`$CYGPATH -u "$path"`
1.9050 fi
1.9051 if test "x$new_path" = x; then
1.9052 @@ -28055,8 +28052,8 @@
1.9053 # bat and cmd files are not always considered executable in cygwin causing which
1.9054 # to not find them
1.9055 if test "x$new_path" = x \
1.9056 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.9057 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.9058 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.9059 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.9060 new_path=`$CYGPATH -u "$path"`
1.9061 fi
1.9062 if test "x$new_path" = x; then
1.9063 @@ -28084,9 +28081,9 @@
1.9064 # Short path failed, file does not exist as specified.
1.9065 # Try adding .exe or .cmd
1.9066 if test -f "${new_path}.exe"; then
1.9067 - input_to_shortpath="${new_path}.exe"
1.9068 + input_to_shortpath="${new_path}.exe"
1.9069 elif test -f "${new_path}.cmd"; then
1.9070 - input_to_shortpath="${new_path}.cmd"
1.9071 + input_to_shortpath="${new_path}.cmd"
1.9072 else
1.9073 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$new_path\", is invalid." >&5
1.9074 $as_echo "$as_me: The path of LIPO, which resolves as \"$new_path\", is invalid." >&6;}
1.9075 @@ -28262,36 +28259,36 @@
1.9076 fi
1.9077
1.9078 if test "x$new_path" = x; then
1.9079 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
1.9080 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
1.9081 $as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
1.9082 - has_space=`$ECHO "$complete" | $GREP " "`
1.9083 - if test "x$has_space" != x; then
1.9084 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.9085 + has_space=`$ECHO "$complete" | $GREP " "`
1.9086 + if test "x$has_space" != x; then
1.9087 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.9088 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.9089 - fi
1.9090 - as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.9091 - fi
1.9092 - fi
1.9093 -
1.9094 - # Now join together the path and the arguments once again
1.9095 - if test "x$arguments" != xEOL; then
1.9096 - new_complete="$new_path ${arguments% *}"
1.9097 - else
1.9098 - new_complete="$new_path"
1.9099 - fi
1.9100 + fi
1.9101 + as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.9102 + fi
1.9103 + fi
1.9104 +
1.9105 + # Now join together the path and the arguments once again
1.9106 + if test "x$arguments" != xEOL; then
1.9107 + new_complete="$new_path ${arguments% *}"
1.9108 + else
1.9109 + new_complete="$new_path"
1.9110 + fi
1.9111
1.9112 if test "x$complete" != "x$new_complete"; then
1.9113 - LIPO="$new_complete"
1.9114 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5
1.9115 + LIPO="$new_complete"
1.9116 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5
1.9117 $as_echo "$as_me: Rewriting LIPO to \"$new_complete\"" >&6;}
1.9118 - fi
1.9119 -
1.9120 -fi
1.9121 -
1.9122 -
1.9123 -
1.9124 -# Restore old path without tools dir
1.9125 -PATH="$OLD_PATH"
1.9126 + fi
1.9127 +
1.9128 + fi
1.9129 +
1.9130 +
1.9131 +
1.9132 + # Restore old path without tools dir
1.9133 + PATH="$OLD_PATH"
1.9134
1.9135
1.9136 # FIXME: Currently we must test this after paths but before flags. Fix!
1.9137 @@ -28429,15 +28426,15 @@
1.9138
1.9139
1.9140
1.9141 -###############################################################################
1.9142 -#
1.9143 -# Now we check if libjvm.so will use 32 or 64 bit pointers for the C/C++ code.
1.9144 -# (The JVM can use 32 or 64 bit Java pointers but that decision
1.9145 -# is made at runtime.)
1.9146 -#
1.9147 -
1.9148 -if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.9149 - # Always specify -m flags on Solaris
1.9150 + ###############################################################################
1.9151 + #
1.9152 + # Now we check if libjvm.so will use 32 or 64 bit pointers for the C/C++ code.
1.9153 + # (The JVM can use 32 or 64 bit Java pointers but that decision
1.9154 + # is made at runtime.)
1.9155 + #
1.9156 +
1.9157 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.9158 + # Always specify -m flags on Solaris
1.9159
1.9160 # When we add flags to the "official" CFLAGS etc, we need to
1.9161 # keep track of these additions in ADDED_CFLAGS etc. These
1.9162 @@ -28455,9 +28452,9 @@
1.9163 CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.9164 LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.9165
1.9166 -elif test "x$COMPILE_TYPE" = xreduced; then
1.9167 - if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.9168 - # Specify -m if running reduced on other Posix platforms
1.9169 + elif test "x$COMPILE_TYPE" = xreduced; then
1.9170 + if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.9171 + # Specify -m if running reduced on other Posix platforms
1.9172
1.9173 # When we add flags to the "official" CFLAGS etc, we need to
1.9174 # keep track of these additions in ADDED_CFLAGS etc. These
1.9175 @@ -28475,11 +28472,11 @@
1.9176 CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.9177 LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.9178
1.9179 - fi
1.9180 -fi
1.9181 -
1.9182 -# Make compilation sanity check
1.9183 -for ac_header in stdio.h
1.9184 + fi
1.9185 + fi
1.9186 +
1.9187 + # Make compilation sanity check
1.9188 + for ac_header in stdio.h
1.9189 do :
1.9190 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
1.9191 if test "x$ac_cv_header_stdio_h" = xyes; then :
1.9192 @@ -28489,23 +28486,23 @@
1.9193
1.9194 else
1.9195
1.9196 - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to compile stdio.h. This likely implies missing compile dependencies." >&5
1.9197 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to compile stdio.h. This likely implies missing compile dependencies." >&5
1.9198 $as_echo "$as_me: Failed to compile stdio.h. This likely implies missing compile dependencies." >&6;}
1.9199 - if test "x$COMPILE_TYPE" = xreduced; then
1.9200 - { $as_echo "$as_me:${as_lineno-$LINENO}: You are doing a reduced build. Check that you have 32-bit libraries installed." >&5
1.9201 + if test "x$COMPILE_TYPE" = xreduced; then
1.9202 + { $as_echo "$as_me:${as_lineno-$LINENO}: You are doing a reduced build. Check that you have 32-bit libraries installed." >&5
1.9203 $as_echo "$as_me: You are doing a reduced build. Check that you have 32-bit libraries installed." >&6;}
1.9204 - elif test "x$COMPILE_TYPE" = xcross; then
1.9205 - { $as_echo "$as_me:${as_lineno-$LINENO}: You are doing a cross-compilation. Check that you have all target platform libraries installed." >&5
1.9206 + elif test "x$COMPILE_TYPE" = xcross; then
1.9207 + { $as_echo "$as_me:${as_lineno-$LINENO}: You are doing a cross-compilation. Check that you have all target platform libraries installed." >&5
1.9208 $as_echo "$as_me: You are doing a cross-compilation. Check that you have all target platform libraries installed." >&6;}
1.9209 - fi
1.9210 - as_fn_error $? "Cannot continue." "$LINENO" 5
1.9211 -
1.9212 -fi
1.9213 -
1.9214 -done
1.9215 -
1.9216 -
1.9217 -# The cast to long int works around a bug in the HP C Compiler
1.9218 + fi
1.9219 + as_fn_error $? "Cannot continue." "$LINENO" 5
1.9220 +
1.9221 +fi
1.9222 +
1.9223 +done
1.9224 +
1.9225 +
1.9226 + # The cast to long int works around a bug in the HP C Compiler
1.9227 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
1.9228 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
1.9229 # This bug is HP SR number 8606223364.
1.9230 @@ -28539,34 +28536,34 @@
1.9231
1.9232
1.9233
1.9234 -if test "x$SIZEOF_INT_P" != "x$ac_cv_sizeof_int_p"; then
1.9235 - # Workaround autoconf bug, see http://lists.gnu.org/archive/html/autoconf/2010-07/msg00004.html
1.9236 - SIZEOF_INT_P="$ac_cv_sizeof_int_p"
1.9237 -fi
1.9238 -
1.9239 -if test "x$SIZEOF_INT_P" = x; then
1.9240 + if test "x$SIZEOF_INT_P" != "x$ac_cv_sizeof_int_p"; then
1.9241 + # Workaround autoconf bug, see http://lists.gnu.org/archive/html/autoconf/2010-07/msg00004.html
1.9242 + SIZEOF_INT_P="$ac_cv_sizeof_int_p"
1.9243 + fi
1.9244 +
1.9245 + if test "x$SIZEOF_INT_P" = x; then
1.9246 # The test failed, lets stick to the assumed value.
1.9247 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&5
1.9248 $as_echo "$as_me: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&2;}
1.9249 -else
1.9250 + else
1.9251 TESTED_TARGET_CPU_BITS=`expr 8 \* $SIZEOF_INT_P`
1.9252
1.9253 if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
1.9254 - as_fn_error $? "The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)" "$LINENO" 5
1.9255 - fi
1.9256 -fi
1.9257 -
1.9258 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for target address size" >&5
1.9259 + as_fn_error $? "The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)" "$LINENO" 5
1.9260 + fi
1.9261 + fi
1.9262 +
1.9263 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for target address size" >&5
1.9264 $as_echo_n "checking for target address size... " >&6; }
1.9265 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_CPU_BITS bits" >&5
1.9266 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_CPU_BITS bits" >&5
1.9267 $as_echo "$OPENJDK_TARGET_CPU_BITS bits" >&6; }
1.9268
1.9269
1.9270 -###############################################################################
1.9271 -#
1.9272 -# Is the target little of big endian?
1.9273 -#
1.9274 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
1.9275 + ###############################################################################
1.9276 + #
1.9277 + # Is the target little of big endian?
1.9278 + #
1.9279 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
1.9280 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
1.9281 if ${ac_cv_c_bigendian+:} false; then :
1.9282 $as_echo_n "(cached) " >&6
1.9283 @@ -28787,23 +28784,23 @@
1.9284 esac
1.9285
1.9286
1.9287 -if test "x$ENDIAN" = xuniversal_endianness; then
1.9288 + if test "x$ENDIAN" = xuniversal_endianness; then
1.9289 as_fn_error $? "Building with both big and little endianness is not supported" "$LINENO" 5
1.9290 -fi
1.9291 -if test "x$ENDIAN" != "x$OPENJDK_TARGET_CPU_ENDIAN"; then
1.9292 + fi
1.9293 + if test "x$ENDIAN" != "x$OPENJDK_TARGET_CPU_ENDIAN"; then
1.9294 as_fn_error $? "The tested endian in the target ($ENDIAN) differs from the endian expected to be found in the target ($OPENJDK_TARGET_CPU_ENDIAN)" "$LINENO" 5
1.9295 -fi
1.9296 + fi
1.9297
1.9298
1.9299 # Configure flags for the tools
1.9300
1.9301
1.9302 -###############################################################################
1.9303 -#
1.9304 -# How to compile shared libraries.
1.9305 -#
1.9306 -
1.9307 -if test "x$GCC" = xyes; then
1.9308 + ###############################################################################
1.9309 + #
1.9310 + # How to compile shared libraries.
1.9311 + #
1.9312 +
1.9313 + if test "x$GCC" = xyes; then
1.9314 COMPILER_NAME=gcc
1.9315 PICFLAG="-fPIC"
1.9316 LIBRARY_PREFIX=lib
1.9317 @@ -28828,95 +28825,95 @@
1.9318
1.9319 # Linking is different on MacOSX
1.9320 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.9321 - # Might change in the future to clang.
1.9322 - COMPILER_NAME=gcc
1.9323 - SHARED_LIBRARY='lib$1.dylib'
1.9324 - SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
1.9325 - SHARED_LIBRARY_SUFFIX='.dylib'
1.9326 - EXE_SUFFIX=''
1.9327 - SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
1.9328 - SET_SHARED_LIBRARY_MAPFILE=''
1.9329 - SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
1.9330 - SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
1.9331 - POST_STRIP_CMD="$STRIP -S"
1.9332 - fi
1.9333 -else
1.9334 + # Might change in the future to clang.
1.9335 + COMPILER_NAME=gcc
1.9336 + SHARED_LIBRARY='lib$1.dylib'
1.9337 + SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
1.9338 + SHARED_LIBRARY_SUFFIX='.dylib'
1.9339 + EXE_SUFFIX=''
1.9340 + SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
1.9341 + SET_SHARED_LIBRARY_MAPFILE=''
1.9342 + SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
1.9343 + SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
1.9344 + POST_STRIP_CMD="$STRIP -S"
1.9345 + fi
1.9346 + else
1.9347 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.9348 - # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
1.9349 - COMPILER_NAME=ossc
1.9350 - PICFLAG="-KPIC"
1.9351 - LIBRARY_PREFIX=lib
1.9352 - SHARED_LIBRARY='lib$1.so'
1.9353 - STATIC_LIBRARY='lib$1.a'
1.9354 - SHARED_LIBRARY_FLAGS="-G"
1.9355 - SHARED_LIBRARY_SUFFIX='.so'
1.9356 - STATIC_LIBRARY_SUFFIX='.a'
1.9357 - OBJ_SUFFIX='.o'
1.9358 - EXE_SUFFIX=''
1.9359 - SET_SHARED_LIBRARY_NAME=''
1.9360 - SET_SHARED_LIBRARY_MAPFILE='-M$1'
1.9361 - C_FLAG_REORDER='-xF'
1.9362 - CXX_FLAG_REORDER='-xF'
1.9363 - SET_SHARED_LIBRARY_ORIGIN='-R\$$$$ORIGIN$1'
1.9364 - SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
1.9365 - CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
1.9366 - CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
1.9367 - CFLAGS_JDKLIB_EXTRA='-xstrconst'
1.9368 - POST_STRIP_CMD="$STRIP -x"
1.9369 - POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
1.9370 + # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
1.9371 + COMPILER_NAME=ossc
1.9372 + PICFLAG="-KPIC"
1.9373 + LIBRARY_PREFIX=lib
1.9374 + SHARED_LIBRARY='lib$1.so'
1.9375 + STATIC_LIBRARY='lib$1.a'
1.9376 + SHARED_LIBRARY_FLAGS="-G"
1.9377 + SHARED_LIBRARY_SUFFIX='.so'
1.9378 + STATIC_LIBRARY_SUFFIX='.a'
1.9379 + OBJ_SUFFIX='.o'
1.9380 + EXE_SUFFIX=''
1.9381 + SET_SHARED_LIBRARY_NAME=''
1.9382 + SET_SHARED_LIBRARY_MAPFILE='-M$1'
1.9383 + C_FLAG_REORDER='-xF'
1.9384 + CXX_FLAG_REORDER='-xF'
1.9385 + SET_SHARED_LIBRARY_ORIGIN='-R\$$$$ORIGIN$1'
1.9386 + SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
1.9387 + CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
1.9388 + CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
1.9389 + CFLAGS_JDKLIB_EXTRA='-xstrconst'
1.9390 + POST_STRIP_CMD="$STRIP -x"
1.9391 + POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
1.9392 fi
1.9393 if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.9394 - # If it is not gcc, then assume it is the MS Visual Studio compiler
1.9395 - COMPILER_NAME=cl
1.9396 - PICFLAG=""
1.9397 - LIBRARY_PREFIX=
1.9398 - SHARED_LIBRARY='$1.dll'
1.9399 - STATIC_LIBRARY='$1.lib'
1.9400 - SHARED_LIBRARY_FLAGS="-LD"
1.9401 - SHARED_LIBRARY_SUFFIX='.dll'
1.9402 - STATIC_LIBRARY_SUFFIX='.lib'
1.9403 - OBJ_SUFFIX='.obj'
1.9404 - EXE_SUFFIX='.exe'
1.9405 - SET_SHARED_LIBRARY_NAME=''
1.9406 - SET_SHARED_LIBRARY_MAPFILE=''
1.9407 - SET_SHARED_LIBRARY_ORIGIN=''
1.9408 - SET_EXECUTABLE_ORIGIN=''
1.9409 - fi
1.9410 -fi
1.9411 -
1.9412 -
1.9413 -
1.9414 -
1.9415 -
1.9416 -
1.9417 -
1.9418 -
1.9419 -
1.9420 -
1.9421 -
1.9422 -
1.9423 -
1.9424 -
1.9425 -
1.9426 -
1.9427 -
1.9428 -
1.9429 -
1.9430 -# The (cross) compiler is now configured, we can now test capabilities
1.9431 -# of the target platform.
1.9432 -
1.9433 -
1.9434 -
1.9435 -###############################################################################
1.9436 -#
1.9437 -# Setup the opt flags for different compilers
1.9438 -# and different operating systems.
1.9439 -#
1.9440 -
1.9441 -#
1.9442 -# NOTE: check for -mstackrealign needs to be below potential addition of -m32
1.9443 -#
1.9444 -if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.9445 + # If it is not gcc, then assume it is the MS Visual Studio compiler
1.9446 + COMPILER_NAME=cl
1.9447 + PICFLAG=""
1.9448 + LIBRARY_PREFIX=
1.9449 + SHARED_LIBRARY='$1.dll'
1.9450 + STATIC_LIBRARY='$1.lib'
1.9451 + SHARED_LIBRARY_FLAGS="-LD"
1.9452 + SHARED_LIBRARY_SUFFIX='.dll'
1.9453 + STATIC_LIBRARY_SUFFIX='.lib'
1.9454 + OBJ_SUFFIX='.obj'
1.9455 + EXE_SUFFIX='.exe'
1.9456 + SET_SHARED_LIBRARY_NAME=''
1.9457 + SET_SHARED_LIBRARY_MAPFILE=''
1.9458 + SET_SHARED_LIBRARY_ORIGIN=''
1.9459 + SET_EXECUTABLE_ORIGIN=''
1.9460 + fi
1.9461 + fi
1.9462 +
1.9463 +
1.9464 +
1.9465 +
1.9466 +
1.9467 +
1.9468 +
1.9469 +
1.9470 +
1.9471 +
1.9472 +
1.9473 +
1.9474 +
1.9475 +
1.9476 +
1.9477 +
1.9478 +
1.9479 +
1.9480 +
1.9481 + # The (cross) compiler is now configured, we can now test capabilities
1.9482 + # of the target platform.
1.9483 +
1.9484 +
1.9485 +
1.9486 + ###############################################################################
1.9487 + #
1.9488 + # Setup the opt flags for different compilers
1.9489 + # and different operating systems.
1.9490 + #
1.9491 +
1.9492 + #
1.9493 + # NOTE: check for -mstackrealign needs to be below potential addition of -m32
1.9494 + #
1.9495 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.9496 # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
1.9497 # While waiting for a better solution, the current workaround is to use -mstackrealign.
1.9498 CFLAGS="$CFLAGS -mstackrealign"
1.9499 @@ -28928,176 +28925,177 @@
1.9500 _ACEOF
1.9501 if ac_fn_cxx_try_link "$LINENO"; then :
1.9502
1.9503 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.9504 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.9505 $as_echo "yes" >&6; }
1.9506
1.9507 else
1.9508
1.9509 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9510 -$as_echo "no" >&6; }
1.9511 - as_fn_error $? "The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path." "$LINENO" 5
1.9512 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9513 +$as_echo "no" >&6; }
1.9514 + as_fn_error $? "The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path." "$LINENO" 5
1.9515 +
1.9516
1.9517 fi
1.9518 rm -f core conftest.err conftest.$ac_objext \
1.9519 conftest$ac_exeext conftest.$ac_ext
1.9520 -fi
1.9521 -
1.9522 -C_FLAG_DEPS="-MMD -MF"
1.9523 -CXX_FLAG_DEPS="-MMD -MF"
1.9524 -
1.9525 -case $COMPILER_TYPE in
1.9526 - CC )
1.9527 - case $COMPILER_NAME in
1.9528 - gcc )
1.9529 - case $OPENJDK_TARGET_OS in
1.9530 - macosx )
1.9531 - # On MacOSX we optimize for size, something
1.9532 - # we should do for all platforms?
1.9533 - C_O_FLAG_HI="-Os"
1.9534 - C_O_FLAG_NORM="-Os"
1.9535 - C_O_FLAG_NONE=""
1.9536 - ;;
1.9537 - *)
1.9538 - C_O_FLAG_HI="-O3"
1.9539 - C_O_FLAG_NORM="-O2"
1.9540 - C_O_FLAG_NONE="-O0"
1.9541 - ;;
1.9542 - esac
1.9543 - CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.9544 - CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.9545 - CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.9546 - CFLAGS_DEBUG_SYMBOLS="-g"
1.9547 - CXXFLAGS_DEBUG_SYMBOLS="-g"
1.9548 - if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
1.9549 + fi
1.9550 +
1.9551 + C_FLAG_DEPS="-MMD -MF"
1.9552 + CXX_FLAG_DEPS="-MMD -MF"
1.9553 +
1.9554 + case $COMPILER_TYPE in
1.9555 + CC )
1.9556 + case $COMPILER_NAME in
1.9557 + gcc )
1.9558 + case $OPENJDK_TARGET_OS in
1.9559 + macosx )
1.9560 + # On MacOSX we optimize for size, something
1.9561 + # we should do for all platforms?
1.9562 + C_O_FLAG_HI="-Os"
1.9563 + C_O_FLAG_NORM="-Os"
1.9564 + C_O_FLAG_NONE=""
1.9565 + ;;
1.9566 + *)
1.9567 + C_O_FLAG_HI="-O3"
1.9568 + C_O_FLAG_NORM="-O2"
1.9569 + C_O_FLAG_NONE="-O0"
1.9570 + ;;
1.9571 + esac
1.9572 + CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.9573 + CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.9574 + CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.9575 + CFLAGS_DEBUG_SYMBOLS="-g"
1.9576 + CXXFLAGS_DEBUG_SYMBOLS="-g"
1.9577 + if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
1.9578 CFLAGS_DEBUG_SYMBOLS="-g1"
1.9579 CXXFLAGS_DEBUG_SYMBOLS="-g1"
1.9580 - fi
1.9581 - ;;
1.9582 - ossc )
1.9583 - #
1.9584 - # Forte has different names for this with their C++ compiler...
1.9585 - #
1.9586 - C_FLAG_DEPS="-xMMD -xMF"
1.9587 - CXX_FLAG_DEPS="-xMMD -xMF"
1.9588 -
1.9589 - # Extra options used with HIGHEST
1.9590 - #
1.9591 - # WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
1.9592 - # done with care, there are some assumptions below that need to
1.9593 - # be understood about the use of pointers, and IEEE behavior.
1.9594 - #
1.9595 - # Use non-standard floating point mode (not IEEE 754)
1.9596 - CC_HIGHEST="$CC_HIGHEST -fns"
1.9597 - # Do some simplification of floating point arithmetic (not IEEE 754)
1.9598 - CC_HIGHEST="$CC_HIGHEST -fsimple"
1.9599 - # Use single precision floating point with 'float'
1.9600 - CC_HIGHEST="$CC_HIGHEST -fsingle"
1.9601 - # Assume memory references via basic pointer types do not alias
1.9602 - # (Source with excessing pointer casting and data access with mixed
1.9603 - # pointer types are not recommended)
1.9604 - CC_HIGHEST="$CC_HIGHEST -xalias_level=basic"
1.9605 - # Use intrinsic or inline versions for math/std functions
1.9606 - # (If you expect perfect errno behavior, do not use this)
1.9607 - CC_HIGHEST="$CC_HIGHEST -xbuiltin=%all"
1.9608 - # Loop data dependency optimizations (need -xO3 or higher)
1.9609 - CC_HIGHEST="$CC_HIGHEST -xdepend"
1.9610 - # Pointer parameters to functions do not overlap
1.9611 - # (Similar to -xalias_level=basic usage, but less obvious sometimes.
1.9612 - # If you pass in multiple pointers to the same data, do not use this)
1.9613 - CC_HIGHEST="$CC_HIGHEST -xrestrict"
1.9614 - # Inline some library routines
1.9615 - # (If you expect perfect errno behavior, do not use this)
1.9616 - CC_HIGHEST="$CC_HIGHEST -xlibmil"
1.9617 - # Use optimized math routines
1.9618 - # (If you expect perfect errno behavior, do not use this)
1.9619 - # Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
1.9620 - #CC_HIGHEST="$CC_HIGHEST -xlibmopt"
1.9621 -
1.9622 - if test "x$OPENJDK_TARGET_CPU" = xsparc; then
1.9623 - CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
1.9624 - CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
1.9625 - fi
1.9626 -
1.9627 - case $OPENJDK_TARGET_CPU_ARCH in
1.9628 - x86)
1.9629 - C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.9630 - C_O_FLAG_HI="-xO4 -Wu,-O4~yz -xregs=no%frameptr"
1.9631 - C_O_FLAG_NORM="-xO2 -Wu,-O2~yz -xregs=no%frameptr"
1.9632 - C_O_FLAG_NONE="-xregs=no%frameptr"
1.9633 - CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.9634 - CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz -xregs=no%frameptr"
1.9635 - CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz -xregs=no%frameptr"
1.9636 - CXX_O_FLAG_NONE="-xregs=no%frameptr"
1.9637 - if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.9638 - C_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST -xchip=pentium"
1.9639 - CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HIGHEST -xchip=pentium"
1.9640 - fi
1.9641 - ;;
1.9642 - sparc)
1.9643 - CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.9644 - CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.9645 - C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.9646 - C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.9647 - C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.9648 - C_O_FLAG_NONE=""
1.9649 - CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.9650 - CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.9651 - CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.9652 - CXX_O_FLAG_NONE=""
1.9653 - ;;
1.9654 - esac
1.9655 -
1.9656 - CFLAGS_DEBUG_SYMBOLS="-g -xs"
1.9657 - CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
1.9658 - esac
1.9659 - ;;
1.9660 - CL )
1.9661 - C_O_FLAG_HIGHEST="-O2"
1.9662 - C_O_FLAG_HI="-O1"
1.9663 - C_O_FLAG_NORM="-O1"
1.9664 - C_O_FLAG_NONE="-Od"
1.9665 - CXX_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST"
1.9666 - CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.9667 - CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.9668 - CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.9669 - ;;
1.9670 -esac
1.9671 -
1.9672 -if test -z "$C_O_FLAG_HIGHEST"; then
1.9673 - C_O_FLAG_HIGHEST="$C_O_FLAG_HI"
1.9674 -fi
1.9675 -
1.9676 -if test -z "$CXX_O_FLAG_HIGHEST"; then
1.9677 - CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HI"
1.9678 -fi
1.9679 -
1.9680 -
1.9681 -
1.9682 -
1.9683 -
1.9684 -
1.9685 -
1.9686 -
1.9687 -
1.9688 -
1.9689 -
1.9690 -
1.9691 -
1.9692 -
1.9693 -if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
1.9694 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&5
1.9695 + fi
1.9696 + ;;
1.9697 + ossc )
1.9698 + #
1.9699 + # Forte has different names for this with their C++ compiler...
1.9700 + #
1.9701 + C_FLAG_DEPS="-xMMD -xMF"
1.9702 + CXX_FLAG_DEPS="-xMMD -xMF"
1.9703 +
1.9704 + # Extra options used with HIGHEST
1.9705 + #
1.9706 + # WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
1.9707 + # done with care, there are some assumptions below that need to
1.9708 + # be understood about the use of pointers, and IEEE behavior.
1.9709 + #
1.9710 + # Use non-standard floating point mode (not IEEE 754)
1.9711 + CC_HIGHEST="$CC_HIGHEST -fns"
1.9712 + # Do some simplification of floating point arithmetic (not IEEE 754)
1.9713 + CC_HIGHEST="$CC_HIGHEST -fsimple"
1.9714 + # Use single precision floating point with 'float'
1.9715 + CC_HIGHEST="$CC_HIGHEST -fsingle"
1.9716 + # Assume memory references via basic pointer types do not alias
1.9717 + # (Source with excessing pointer casting and data access with mixed
1.9718 + # pointer types are not recommended)
1.9719 + CC_HIGHEST="$CC_HIGHEST -xalias_level=basic"
1.9720 + # Use intrinsic or inline versions for math/std functions
1.9721 + # (If you expect perfect errno behavior, do not use this)
1.9722 + CC_HIGHEST="$CC_HIGHEST -xbuiltin=%all"
1.9723 + # Loop data dependency optimizations (need -xO3 or higher)
1.9724 + CC_HIGHEST="$CC_HIGHEST -xdepend"
1.9725 + # Pointer parameters to functions do not overlap
1.9726 + # (Similar to -xalias_level=basic usage, but less obvious sometimes.
1.9727 + # If you pass in multiple pointers to the same data, do not use this)
1.9728 + CC_HIGHEST="$CC_HIGHEST -xrestrict"
1.9729 + # Inline some library routines
1.9730 + # (If you expect perfect errno behavior, do not use this)
1.9731 + CC_HIGHEST="$CC_HIGHEST -xlibmil"
1.9732 + # Use optimized math routines
1.9733 + # (If you expect perfect errno behavior, do not use this)
1.9734 + # Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
1.9735 + #CC_HIGHEST="$CC_HIGHEST -xlibmopt"
1.9736 +
1.9737 + if test "x$OPENJDK_TARGET_CPU" = xsparc; then
1.9738 + CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
1.9739 + CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
1.9740 + fi
1.9741 +
1.9742 + case $OPENJDK_TARGET_CPU_ARCH in
1.9743 + x86)
1.9744 + C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.9745 + C_O_FLAG_HI="-xO4 -Wu,-O4~yz -xregs=no%frameptr"
1.9746 + C_O_FLAG_NORM="-xO2 -Wu,-O2~yz -xregs=no%frameptr"
1.9747 + C_O_FLAG_NONE="-xregs=no%frameptr"
1.9748 + CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.9749 + CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz -xregs=no%frameptr"
1.9750 + CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz -xregs=no%frameptr"
1.9751 + CXX_O_FLAG_NONE="-xregs=no%frameptr"
1.9752 + if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.9753 + C_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST -xchip=pentium"
1.9754 + CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HIGHEST -xchip=pentium"
1.9755 + fi
1.9756 + ;;
1.9757 + sparc)
1.9758 + CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.9759 + CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.9760 + C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.9761 + C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.9762 + C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.9763 + C_O_FLAG_NONE=""
1.9764 + CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.9765 + CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.9766 + CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.9767 + CXX_O_FLAG_NONE=""
1.9768 + ;;
1.9769 + esac
1.9770 +
1.9771 + CFLAGS_DEBUG_SYMBOLS="-g -xs"
1.9772 + CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
1.9773 + esac
1.9774 + ;;
1.9775 + CL )
1.9776 + C_O_FLAG_HIGHEST="-O2"
1.9777 + C_O_FLAG_HI="-O1"
1.9778 + C_O_FLAG_NORM="-O1"
1.9779 + C_O_FLAG_NONE="-Od"
1.9780 + CXX_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST"
1.9781 + CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.9782 + CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.9783 + CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.9784 + ;;
1.9785 + esac
1.9786 +
1.9787 + if test -z "$C_O_FLAG_HIGHEST"; then
1.9788 + C_O_FLAG_HIGHEST="$C_O_FLAG_HI"
1.9789 + fi
1.9790 +
1.9791 + if test -z "$CXX_O_FLAG_HIGHEST"; then
1.9792 + CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HI"
1.9793 + fi
1.9794 +
1.9795 +
1.9796 +
1.9797 +
1.9798 +
1.9799 +
1.9800 +
1.9801 +
1.9802 +
1.9803 +
1.9804 +
1.9805 +
1.9806 +
1.9807 +
1.9808 + if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
1.9809 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&5
1.9810 $as_echo "$as_me: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&2;}
1.9811 -fi
1.9812 -
1.9813 -if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
1.9814 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags" >&5
1.9815 + fi
1.9816 +
1.9817 + if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
1.9818 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags" >&5
1.9819 $as_echo "$as_me: WARNING: Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags" >&2;}
1.9820 -fi
1.9821 -
1.9822 -if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
1.9823 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags" >&5
1.9824 + fi
1.9825 +
1.9826 + if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
1.9827 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags" >&5
1.9828 $as_echo "$as_me: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags" >&2;}
1.9829 -fi
1.9830 + fi
1.9831
1.9832
1.9833 # Check whether --with-extra-cflags was given.
1.9834 @@ -29120,128 +29118,128 @@
1.9835 fi
1.9836
1.9837
1.9838 -CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
1.9839 -CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
1.9840 -LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
1.9841 -
1.9842 -# Hotspot needs these set in their legacy form
1.9843 -LEGACY_EXTRA_CFLAGS=$with_extra_cflags
1.9844 -LEGACY_EXTRA_CXXFLAGS=$with_extra_cxxflags
1.9845 -LEGACY_EXTRA_LDFLAGS=$with_extra_ldflags
1.9846 -
1.9847 -
1.9848 -
1.9849 -
1.9850 -
1.9851 -###############################################################################
1.9852 -#
1.9853 -# Now setup the CFLAGS and LDFLAGS for the JDK build.
1.9854 -# Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
1.9855 -#
1.9856 -case $COMPILER_NAME in
1.9857 - gcc )
1.9858 - CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
1.9859 - -pipe \
1.9860 - -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
1.9861 - case $OPENJDK_TARGET_CPU_ARCH in
1.9862 - arm )
1.9863 - # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
1.9864 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.9865 - ;;
1.9866 - ppc )
1.9867 - # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
1.9868 - ;;
1.9869 - * )
1.9870 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
1.9871 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.9872 + CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
1.9873 + CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
1.9874 + LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
1.9875 +
1.9876 + # Hotspot needs these set in their legacy form
1.9877 + LEGACY_EXTRA_CFLAGS=$with_extra_cflags
1.9878 + LEGACY_EXTRA_CXXFLAGS=$with_extra_cxxflags
1.9879 + LEGACY_EXTRA_LDFLAGS=$with_extra_ldflags
1.9880 +
1.9881 +
1.9882 +
1.9883 +
1.9884 +
1.9885 + ###############################################################################
1.9886 + #
1.9887 + # Now setup the CFLAGS and LDFLAGS for the JDK build.
1.9888 + # Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
1.9889 + #
1.9890 + case $COMPILER_NAME in
1.9891 + gcc )
1.9892 + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
1.9893 + -pipe \
1.9894 + -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
1.9895 + case $OPENJDK_TARGET_CPU_ARCH in
1.9896 + arm )
1.9897 + # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
1.9898 + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.9899 ;;
1.9900 - esac
1.9901 + ppc )
1.9902 + # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
1.9903 ;;
1.9904 - ossc )
1.9905 - CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
1.9906 - case $OPENJDK_TARGET_CPU_ARCH in
1.9907 - x86 )
1.9908 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
1.9909 - CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
1.9910 + * )
1.9911 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
1.9912 + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.9913 ;;
1.9914 - esac
1.9915 -
1.9916 - CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal"
1.9917 - CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
1.9918 -
1.9919 - LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
1.9920 - LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
1.9921 + esac
1.9922 + ;;
1.9923 + ossc )
1.9924 + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
1.9925 + case $OPENJDK_TARGET_CPU_ARCH in
1.9926 + x86 )
1.9927 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
1.9928 + CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
1.9929 ;;
1.9930 - cl )
1.9931 - CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
1.9932 - -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
1.9933 - -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
1.9934 - -DWIN32 -DIAL"
1.9935 - case $OPENJDK_TARGET_CPU in
1.9936 - x86 )
1.9937 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_X86_ -Dx86"
1.9938 - ;;
1.9939 - x86_64 )
1.9940 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_AMD64_ -Damd64"
1.9941 - ;;
1.9942 - esac
1.9943 + esac
1.9944 +
1.9945 + CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal"
1.9946 + CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
1.9947 +
1.9948 + LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
1.9949 + LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
1.9950 + ;;
1.9951 + cl )
1.9952 + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
1.9953 + -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
1.9954 + -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
1.9955 + -DWIN32 -DIAL"
1.9956 + case $OPENJDK_TARGET_CPU in
1.9957 + x86 )
1.9958 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_X86_ -Dx86"
1.9959 ;;
1.9960 -esac
1.9961 -
1.9962 -###############################################################################
1.9963 -
1.9964 -# Adjust flags according to debug level.
1.9965 -case $DEBUG_LEVEL in
1.9966 - fastdebug )
1.9967 - CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
1.9968 - CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
1.9969 - C_O_FLAG_HI="$C_O_FLAG_NORM"
1.9970 - C_O_FLAG_NORM="$C_O_FLAG_NORM"
1.9971 - CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
1.9972 - CXX_O_FLAG_NORM="$CXX_O_FLAG_NORM"
1.9973 - JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.9974 - ;;
1.9975 - slowdebug )
1.9976 - CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
1.9977 - CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
1.9978 - C_O_FLAG_HI="$C_O_FLAG_NONE"
1.9979 - C_O_FLAG_NORM="$C_O_FLAG_NONE"
1.9980 - CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
1.9981 - CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
1.9982 - JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.9983 - ;;
1.9984 -esac
1.9985 -
1.9986 -CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
1.9987 -
1.9988 -# The package path is used only on macosx?
1.9989 -PACKAGE_PATH=/opt/local
1.9990 -
1.9991 -
1.9992 -if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
1.9993 + x86_64 )
1.9994 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_AMD64_ -Damd64"
1.9995 + ;;
1.9996 + esac
1.9997 + ;;
1.9998 + esac
1.9999 +
1.10000 + ###############################################################################
1.10001 +
1.10002 + # Adjust flags according to debug level.
1.10003 + case $DEBUG_LEVEL in
1.10004 + fastdebug )
1.10005 + CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
1.10006 + CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
1.10007 + C_O_FLAG_HI="$C_O_FLAG_NORM"
1.10008 + C_O_FLAG_NORM="$C_O_FLAG_NORM"
1.10009 + CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
1.10010 + CXX_O_FLAG_NORM="$CXX_O_FLAG_NORM"
1.10011 + JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.10012 + ;;
1.10013 + slowdebug )
1.10014 + CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
1.10015 + CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
1.10016 + C_O_FLAG_HI="$C_O_FLAG_NONE"
1.10017 + C_O_FLAG_NORM="$C_O_FLAG_NONE"
1.10018 + CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
1.10019 + CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
1.10020 + JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.10021 + ;;
1.10022 + esac
1.10023 +
1.10024 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
1.10025 +
1.10026 + # The package path is used only on macosx?
1.10027 + PACKAGE_PATH=/opt/local
1.10028 +
1.10029 +
1.10030 + if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
1.10031 # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
1.10032 # Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
1.10033 # (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
1.10034 # Note: -Dmacro is the same as #define macro 1
1.10035 - # -Dmacro= is the same as #define macro
1.10036 + # -Dmacro= is the same as #define macro
1.10037 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10038 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
1.10039 - else
1.10040 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
1.10041 - fi
1.10042 -else
1.10043 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
1.10044 + else
1.10045 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
1.10046 + fi
1.10047 + else
1.10048 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
1.10049 -fi
1.10050 -if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10051 + fi
1.10052 + if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10053 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX"
1.10054 -fi
1.10055 -if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.10056 + fi
1.10057 + if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.10058 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DWINDOWS"
1.10059 -fi
1.10060 -if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10061 + fi
1.10062 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10063 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
1.10064 -fi
1.10065 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.10066 + fi
1.10067 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.10068 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
1.10069 # Setting these parameters makes it an error to link to macosx APIs that are
1.10070 # newer than the given OS version and makes the linked binaries compatible even
1.10071 @@ -29254,106 +29252,106 @@
1.10072 # command line.
1.10073 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1.10074 LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1.10075 -fi
1.10076 -if test "x$OPENJDK_TARGET_OS" = xbsd; then
1.10077 + fi
1.10078 + if test "x$OPENJDK_TARGET_OS" = xbsd; then
1.10079 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
1.10080 -fi
1.10081 -if test "x$DEBUG_LEVEL" = xrelease; then
1.10082 + fi
1.10083 + if test "x$DEBUG_LEVEL" = xrelease; then
1.10084 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DNDEBUG"
1.10085 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10086 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DTRIMMED"
1.10087 - fi
1.10088 -else
1.10089 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10090 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DTRIMMED"
1.10091 + fi
1.10092 + else
1.10093 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DDEBUG"
1.10094 -fi
1.10095 -
1.10096 -CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
1.10097 -CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
1.10098 -
1.10099 -CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
1.10100 - -I${JDK_OUTPUTDIR}/include \
1.10101 - -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
1.10102 - -I${JDK_TOPDIR}/src/share/javavm/export \
1.10103 - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/javavm/export \
1.10104 - -I${JDK_TOPDIR}/src/share/native/common \
1.10105 - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
1.10106 -
1.10107 -# The shared libraries are compiled using the picflag.
1.10108 -CFLAGS_JDKLIB="$CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
1.10109 -CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
1.10110 -
1.10111 -# Executable flags
1.10112 -CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
1.10113 -CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
1.10114 -
1.10115 -# Now this is odd. The JDK native libraries have to link against libjvm.so
1.10116 -# On 32-bit machines there is normally two distinct libjvm.so:s, client and server.
1.10117 -# Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
1.10118 -# is identical for client and server? Yes. Which is picked at runtime (client or server)?
1.10119 -# Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following
1.10120 -# libraries will link to whatever is in memory. Yuck.
1.10121 -#
1.10122 -# Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
1.10123 -if test "x$COMPILER_NAME" = xcl; then
1.10124 + fi
1.10125 +
1.10126 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
1.10127 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
1.10128 +
1.10129 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
1.10130 + -I${JDK_OUTPUTDIR}/include \
1.10131 + -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
1.10132 + -I${JDK_TOPDIR}/src/share/javavm/export \
1.10133 + -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/javavm/export \
1.10134 + -I${JDK_TOPDIR}/src/share/native/common \
1.10135 + -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
1.10136 +
1.10137 + # The shared libraries are compiled using the picflag.
1.10138 + CFLAGS_JDKLIB="$CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
1.10139 + CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
1.10140 +
1.10141 + # Executable flags
1.10142 + CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
1.10143 + CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
1.10144 +
1.10145 + # Now this is odd. The JDK native libraries have to link against libjvm.so
1.10146 + # On 32-bit machines there is normally two distinct libjvm.so:s, client and server.
1.10147 + # Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
1.10148 + # is identical for client and server? Yes. Which is picked at runtime (client or server)?
1.10149 + # Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following
1.10150 + # libraries will link to whatever is in memory. Yuck.
1.10151 + #
1.10152 + # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
1.10153 + if test "x$COMPILER_NAME" = xcl; then
1.10154 LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
1.10155 if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.10156 - LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
1.10157 + LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
1.10158 fi
1.10159 # TODO: make -debug optional "--disable-full-debug-symbols"
1.10160 LDFLAGS_JDK="$LDFLAGS_JDK -debug"
1.10161 LDFLAGS_JDKLIB="${LDFLAGS_JDK} -dll -libpath:${JDK_OUTPUTDIR}/lib"
1.10162 LDFLAGS_JDKLIB_SUFFIX=""
1.10163 if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
1.10164 - LDFLAGS_STACK_SIZE=1048576
1.10165 - else
1.10166 - LDFLAGS_STACK_SIZE=327680
1.10167 + LDFLAGS_STACK_SIZE=1048576
1.10168 + else
1.10169 + LDFLAGS_STACK_SIZE=327680
1.10170 fi
1.10171 LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
1.10172 -else
1.10173 + else
1.10174 if test "x$COMPILER_NAME" = xgcc; then
1.10175 - # If this is a --hash-style=gnu system, use --hash-style=both, why?
1.10176 - HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
1.10177 - if test -n "$HAS_GNU_HASH"; then
1.10178 - LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
1.10179 - fi
1.10180 - if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10181 - # And since we now know that the linker is gnu, then add -z defs, to forbid
1.10182 - # undefined symbols in object files.
1.10183 - LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
1.10184 - if test "x$DEBUG_LEVEL" = "xrelease"; then
1.10185 - # When building release libraries, tell the linker optimize them.
1.10186 - # Should this be supplied to the OSS linker as well?
1.10187 - LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
1.10188 - fi
1.10189 - fi
1.10190 + # If this is a --hash-style=gnu system, use --hash-style=both, why?
1.10191 + HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
1.10192 + if test -n "$HAS_GNU_HASH"; then
1.10193 + LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
1.10194 + fi
1.10195 + if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10196 + # And since we now know that the linker is gnu, then add -z defs, to forbid
1.10197 + # undefined symbols in object files.
1.10198 + LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
1.10199 + if test "x$DEBUG_LEVEL" = "xrelease"; then
1.10200 + # When building release libraries, tell the linker optimize them.
1.10201 + # Should this be supplied to the OSS linker as well?
1.10202 + LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
1.10203 + fi
1.10204 + fi
1.10205 fi
1.10206 LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
1.10207 - -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
1.10208 + -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
1.10209
1.10210 # On some platforms (mac) the linker warns about non existing -L dirs.
1.10211 # Add server first if available. Linking aginst client does not always produce the same results.
1.10212 # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1.
1.10213 # Default to server for other variants.
1.10214 if test "x$JVM_VARIANT_SERVER" = xtrue; then
1.10215 - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
1.10216 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
1.10217 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.10218 - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
1.10219 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
1.10220 elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.10221 - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal"
1.10222 - else
1.10223 - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
1.10224 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal"
1.10225 + else
1.10226 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
1.10227 fi
1.10228
1.10229 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
1.10230 if test "x$COMPILER_NAME" = xossc; then
1.10231 - LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
1.10232 + LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
1.10233 fi
1.10234
1.10235 LDFLAGS_JDKEXE="${LDFLAGS_JDK}"
1.10236 if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10237 - LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
1.10238 - fi
1.10239 -fi
1.10240 + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
1.10241 + fi
1.10242 + fi
1.10243
1.10244
1.10245
1.10246 @@ -29393,9 +29391,7 @@
1.10247
1.10248 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.10249 /* end confdefs.h. */
1.10250 -
1.10251 - int i;
1.10252 -
1.10253 +int i;
1.10254 _ACEOF
1.10255 if ac_fn_c_try_compile "$LINENO"; then :
1.10256
1.10257 @@ -29421,9 +29417,7 @@
1.10258
1.10259 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.10260 /* end confdefs.h. */
1.10261 -
1.10262 - int i;
1.10263 -
1.10264 +int i;
1.10265 _ACEOF
1.10266 if ac_fn_cxx_try_compile "$LINENO"; then :
1.10267
1.10268 @@ -29466,9 +29460,7 @@
1.10269
1.10270 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.10271 /* end confdefs.h. */
1.10272 -
1.10273 - int i;
1.10274 -
1.10275 +int i;
1.10276 _ACEOF
1.10277 if ac_fn_c_try_compile "$LINENO"; then :
1.10278
1.10279 @@ -29494,9 +29486,7 @@
1.10280
1.10281 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.10282 /* end confdefs.h. */
1.10283 -
1.10284 - int i;
1.10285 -
1.10286 +int i;
1.10287 _ACEOF
1.10288 if ac_fn_cxx_try_compile "$LINENO"; then :
1.10289
1.10290 @@ -29525,64 +29515,64 @@
1.10291
1.10292 # Setup debug symbols (need objcopy from the toolchain for that)
1.10293
1.10294 -#
1.10295 -# ENABLE_DEBUG_SYMBOLS
1.10296 -# This must be done after the toolchain is setup, since we're looking at objcopy.
1.10297 -#
1.10298 -# Check whether --enable-debug-symbols was given.
1.10299 + #
1.10300 + # ENABLE_DEBUG_SYMBOLS
1.10301 + # This must be done after the toolchain is setup, since we're looking at objcopy.
1.10302 + #
1.10303 + # Check whether --enable-debug-symbols was given.
1.10304 if test "${enable_debug_symbols+set}" = set; then :
1.10305 enableval=$enable_debug_symbols;
1.10306 fi
1.10307
1.10308
1.10309 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug symbols" >&5
1.10310 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug symbols" >&5
1.10311 $as_echo_n "checking if we should generate debug symbols... " >&6; }
1.10312
1.10313 -if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
1.10314 - # explicit enabling of enable-debug-symbols and can't find objcopy
1.10315 - # this is an error
1.10316 - as_fn_error $? "Unable to find objcopy, cannot enable debug-symbols" "$LINENO" 5
1.10317 -fi
1.10318 -
1.10319 -if test "x$enable_debug_symbols" = "xyes"; then
1.10320 - ENABLE_DEBUG_SYMBOLS=true
1.10321 -elif test "x$enable_debug_symbols" = "xno"; then
1.10322 - ENABLE_DEBUG_SYMBOLS=false
1.10323 -else
1.10324 - # default on macosx is false
1.10325 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.10326 + if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
1.10327 + # explicit enabling of enable-debug-symbols and can't find objcopy
1.10328 + # this is an error
1.10329 + as_fn_error $? "Unable to find objcopy, cannot enable debug-symbols" "$LINENO" 5
1.10330 + fi
1.10331 +
1.10332 + if test "x$enable_debug_symbols" = "xyes"; then
1.10333 + ENABLE_DEBUG_SYMBOLS=true
1.10334 + elif test "x$enable_debug_symbols" = "xno"; then
1.10335 ENABLE_DEBUG_SYMBOLS=false
1.10336 - # Default is on if objcopy is found, otherwise off
1.10337 - elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.10338 - ENABLE_DEBUG_SYMBOLS=true
1.10339 - else
1.10340 - ENABLE_DEBUG_SYMBOLS=false
1.10341 - fi
1.10342 -fi
1.10343 -
1.10344 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_DEBUG_SYMBOLS" >&5
1.10345 + else
1.10346 + # default on macosx is false
1.10347 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.10348 + ENABLE_DEBUG_SYMBOLS=false
1.10349 + # Default is on if objcopy is found, otherwise off
1.10350 + elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.10351 + ENABLE_DEBUG_SYMBOLS=true
1.10352 + else
1.10353 + ENABLE_DEBUG_SYMBOLS=false
1.10354 + fi
1.10355 + fi
1.10356 +
1.10357 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_DEBUG_SYMBOLS" >&5
1.10358 $as_echo "$ENABLE_DEBUG_SYMBOLS" >&6; }
1.10359
1.10360 -#
1.10361 -# ZIP_DEBUGINFO_FILES
1.10362 -#
1.10363 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5
1.10364 + #
1.10365 + # ZIP_DEBUGINFO_FILES
1.10366 + #
1.10367 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5
1.10368 $as_echo_n "checking if we should zip debug-info files... " >&6; }
1.10369 -# Check whether --enable-zip-debug-info was given.
1.10370 + # Check whether --enable-zip-debug-info was given.
1.10371 if test "${enable_zip_debug_info+set}" = set; then :
1.10372 enableval=$enable_zip_debug_info; enable_zip_debug_info="${enableval}"
1.10373 else
1.10374 enable_zip_debug_info="yes"
1.10375 fi
1.10376
1.10377 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5
1.10378 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5
1.10379 $as_echo "${enable_zip_debug_info}" >&6; }
1.10380
1.10381 -if test "x${enable_zip_debug_info}" = "xno"; then
1.10382 - ZIP_DEBUGINFO_FILES=false
1.10383 -else
1.10384 - ZIP_DEBUGINFO_FILES=true
1.10385 -fi
1.10386 + if test "x${enable_zip_debug_info}" = "xno"; then
1.10387 + ZIP_DEBUGINFO_FILES=false
1.10388 + else
1.10389 + ZIP_DEBUGINFO_FILES=true
1.10390 + fi
1.10391
1.10392
1.10393
1.10394 @@ -29598,28 +29588,28 @@
1.10395
1.10396
1.10397
1.10398 -###############################################################################
1.10399 -#
1.10400 -# OS specific settings that we never will need to probe.
1.10401 -#
1.10402 -if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10403 + ###############################################################################
1.10404 + #
1.10405 + # OS specific settings that we never will need to probe.
1.10406 + #
1.10407 + if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10408 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Linux?" >&5
1.10409 $as_echo_n "checking what is not needed on Linux?... " >&6; }
1.10410 PULSE_NOT_NEEDED=yes
1.10411 { $as_echo "$as_me:${as_lineno-$LINENO}: result: pulse" >&5
1.10412 $as_echo "pulse" >&6; }
1.10413 -fi
1.10414 -
1.10415 -if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10416 + fi
1.10417 +
1.10418 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10419 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Solaris?" >&5
1.10420 $as_echo_n "checking what is not needed on Solaris?... " >&6; }
1.10421 ALSA_NOT_NEEDED=yes
1.10422 PULSE_NOT_NEEDED=yes
1.10423 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
1.10424 $as_echo "alsa pulse" >&6; }
1.10425 -fi
1.10426 -
1.10427 -if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.10428 + fi
1.10429 +
1.10430 + if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.10431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Windows?" >&5
1.10432 $as_echo_n "checking what is not needed on Windows?... " >&6; }
1.10433 CUPS_NOT_NEEDED=yes
1.10434 @@ -29628,9 +29618,9 @@
1.10435 X11_NOT_NEEDED=yes
1.10436 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa cups pulse x11" >&5
1.10437 $as_echo "alsa cups pulse x11" >&6; }
1.10438 -fi
1.10439 -
1.10440 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.10441 + fi
1.10442 +
1.10443 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.10444 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on MacOSX?" >&5
1.10445 $as_echo_n "checking what is not needed on MacOSX?... " >&6; }
1.10446 ALSA_NOT_NEEDED=yes
1.10447 @@ -29641,30 +29631,30 @@
1.10448 # This will be adjusted below.
1.10449 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
1.10450 $as_echo "alsa pulse x11" >&6; }
1.10451 -fi
1.10452 -
1.10453 -if test "x$OPENJDK_TARGET_OS" = xbsd; then
1.10454 + fi
1.10455 +
1.10456 + if test "x$OPENJDK_TARGET_OS" = xbsd; then
1.10457 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on bsd?" >&5
1.10458 $as_echo_n "checking what is not needed on bsd?... " >&6; }
1.10459 ALSA_NOT_NEEDED=yes
1.10460 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa" >&5
1.10461 $as_echo "alsa" >&6; }
1.10462 -fi
1.10463 -
1.10464 -if test "x$OPENJDK" = "xfalse"; then
1.10465 + fi
1.10466 +
1.10467 + if test "x$OPENJDK" = "xfalse"; then
1.10468 FREETYPE2_NOT_NEEDED=yes
1.10469 -fi
1.10470 -
1.10471 -if test "x$SUPPORT_HEADFUL" = xno; then
1.10472 + fi
1.10473 +
1.10474 + if test "x$SUPPORT_HEADFUL" = xno; then
1.10475 X11_NOT_NEEDED=yes
1.10476 -fi
1.10477 -
1.10478 -###############################################################################
1.10479 -#
1.10480 -# Check for MacOSX support for OpenJDK. If this exists, try to build a JVM
1.10481 -# that uses this API.
1.10482 -#
1.10483 -# Check whether --enable-macosx-runtime-support was given.
1.10484 + fi
1.10485 +
1.10486 + ###############################################################################
1.10487 + #
1.10488 + # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM
1.10489 + # that uses this API.
1.10490 + #
1.10491 + # Check whether --enable-macosx-runtime-support was given.
1.10492 if test "${enable_macosx_runtime_support+set}" = set; then :
1.10493 enableval=$enable_macosx_runtime_support; MACOSX_RUNTIME_SUPPORT="${enableval}"
1.10494 else
1.10495 @@ -29672,64 +29662,64 @@
1.10496 fi
1.10497
1.10498
1.10499 -USE_MACOSX_RUNTIME_SUPPORT=no
1.10500 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit Java runtime support in the OS" >&5
1.10501 + USE_MACOSX_RUNTIME_SUPPORT=no
1.10502 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit Java runtime support in the OS" >&5
1.10503 $as_echo_n "checking for explicit Java runtime support in the OS... " >&6; }
1.10504 -if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
1.10505 + if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
1.10506 if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then
1.10507 - MACOSX_RUNTIME_SUPPORT=yes
1.10508 - USE_MACOSX_RUNTIME_SUPPORT=yes
1.10509 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, does not need alsa freetype2 pulse and X11" >&5
1.10510 + MACOSX_RUNTIME_SUPPORT=yes
1.10511 + USE_MACOSX_RUNTIME_SUPPORT=yes
1.10512 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, does not need alsa freetype2 pulse and X11" >&5
1.10513 $as_echo "yes, does not need alsa freetype2 pulse and X11" >&6; }
1.10514 else
1.10515 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but explicitly disabled." >&5
1.10516 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but explicitly disabled." >&5
1.10517 $as_echo "yes, but explicitly disabled." >&6; }
1.10518 fi
1.10519 -else
1.10520 + else
1.10521 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10522 $as_echo "no" >&6; }
1.10523 -fi
1.10524 -
1.10525 -if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then
1.10526 + fi
1.10527 +
1.10528 + if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then
1.10529 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on an X11 build on MacOSX?" >&5
1.10530 $as_echo_n "checking what is not needed on an X11 build on MacOSX?... " >&6; }
1.10531 X11_NOT_NEEDED=
1.10532 FREETYPE2_NOT_NEEDED=
1.10533 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
1.10534 $as_echo "alsa pulse" >&6; }
1.10535 -fi
1.10536 -
1.10537 -
1.10538 -
1.10539 -###############################################################################
1.10540 -#
1.10541 -# Check for X Windows
1.10542 -#
1.10543 -
1.10544 -# Check if the user has specified sysroot, but not --x-includes or --x-libraries.
1.10545 -# Make a simple check for the libraries at the sysroot, and setup --x-includes and
1.10546 -# --x-libraries for the sysroot, if that seems to be correct.
1.10547 -if test "x$SYS_ROOT" != "x/"; then
1.10548 - if test "x$x_includes" = xNONE; then
1.10549 - if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
1.10550 - x_includes="$SYS_ROOT/usr/X11R6/include"
1.10551 - elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
1.10552 - x_includes="$SYS_ROOT/usr/include"
1.10553 - fi
1.10554 - fi
1.10555 - if test "x$x_libraries" = xNONE; then
1.10556 - if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
1.10557 - x_libraries="$SYS_ROOT/usr/X11R6/lib"
1.10558 - elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.10559 - x_libraries="$SYS_ROOT/usr/lib64"
1.10560 - elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
1.10561 - x_libraries="$SYS_ROOT/usr/lib"
1.10562 - fi
1.10563 - fi
1.10564 -fi
1.10565 -
1.10566 -# Now let autoconf do it's magic
1.10567 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
1.10568 + fi
1.10569 +
1.10570 +
1.10571 +
1.10572 + ###############################################################################
1.10573 + #
1.10574 + # Check for X Windows
1.10575 + #
1.10576 +
1.10577 + # Check if the user has specified sysroot, but not --x-includes or --x-libraries.
1.10578 + # Make a simple check for the libraries at the sysroot, and setup --x-includes and
1.10579 + # --x-libraries for the sysroot, if that seems to be correct.
1.10580 + if test "x$SYS_ROOT" != "x/"; then
1.10581 + if test "x$x_includes" = xNONE; then
1.10582 + if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
1.10583 + x_includes="$SYS_ROOT/usr/X11R6/include"
1.10584 + elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
1.10585 + x_includes="$SYS_ROOT/usr/include"
1.10586 + fi
1.10587 + fi
1.10588 + if test "x$x_libraries" = xNONE; then
1.10589 + if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
1.10590 + x_libraries="$SYS_ROOT/usr/X11R6/lib"
1.10591 + elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.10592 + x_libraries="$SYS_ROOT/usr/lib64"
1.10593 + elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
1.10594 + x_libraries="$SYS_ROOT/usr/lib"
1.10595 + fi
1.10596 + fi
1.10597 + fi
1.10598 +
1.10599 + # Now let autoconf do it's magic
1.10600 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
1.10601 $as_echo_n "checking for X... " >&6; }
1.10602
1.10603
1.10604 @@ -29922,7 +29912,7 @@
1.10605 $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
1.10606 fi
1.10607
1.10608 -if test "$no_x" = yes; then
1.10609 + if test "$no_x" = yes; then
1.10610 # Not all programs may use this symbol, but it does not hurt to define it.
1.10611
1.10612 $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
1.10613 @@ -30413,83 +30403,85 @@
1.10614 fi
1.10615
1.10616
1.10617 -# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
1.10618 -# this doesn't make sense so we remove it.
1.10619 -if test "x$COMPILE_TYPE" = xcross; then
1.10620 - X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'`
1.10621 -fi
1.10622 -
1.10623 -if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
1.10624 -
1.10625 - # Print a helpful message on how to acquire the necessary build dependency.
1.10626 - # x11 is the help tag: freetyp2, cups, pulse, alsa etc
1.10627 - MISSING_DEPENDENCY=x11
1.10628 - PKGHANDLER_COMMAND=
1.10629 -
1.10630 - case $PKGHANDLER in
1.10631 - apt-get)
1.10632 - apt_help $MISSING_DEPENDENCY ;;
1.10633 + # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
1.10634 + # this doesn't make sense so we remove it.
1.10635 + if test "x$COMPILE_TYPE" = xcross; then
1.10636 + X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'`
1.10637 + fi
1.10638 +
1.10639 + if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
1.10640 +
1.10641 + # Print a helpful message on how to acquire the necessary build dependency.
1.10642 + # x11 is the help tag: freetyp2, cups, pulse, alsa etc
1.10643 + MISSING_DEPENDENCY=x11
1.10644 + PKGHANDLER_COMMAND=
1.10645 +
1.10646 + case $PKGHANDLER in
1.10647 + apt-get)
1.10648 + apt_help $MISSING_DEPENDENCY ;;
1.10649 yum)
1.10650 - yum_help $MISSING_DEPENDENCY ;;
1.10651 - port)
1.10652 - port_help $MISSING_DEPENDENCY ;;
1.10653 - pkgutil)
1.10654 - pkgutil_help $MISSING_DEPENDENCY ;;
1.10655 - pkgadd)
1.10656 - pkgadd_help $MISSING_DEPENDENCY ;;
1.10657 + yum_help $MISSING_DEPENDENCY ;;
1.10658 + port)
1.10659 + port_help $MISSING_DEPENDENCY ;;
1.10660 + pkgutil)
1.10661 + pkgutil_help $MISSING_DEPENDENCY ;;
1.10662 + pkgadd)
1.10663 + pkgadd_help $MISSING_DEPENDENCY ;;
1.10664 * )
1.10665 break ;;
1.10666 - esac
1.10667 -
1.10668 - if test "x$PKGHANDLER_COMMAND" != x; then
1.10669 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.10670 - fi
1.10671 + esac
1.10672 +
1.10673 + if test "x$PKGHANDLER_COMMAND" != x; then
1.10674 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.10675 + fi
1.10676
1.10677 as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5
1.10678 -fi
1.10679 -
1.10680 -# Some of the old makefiles require a setting of OPENWIN_HOME
1.10681 -# Since the X11R6 directory has disappeared on later Linuxes,
1.10682 -# we need to probe for it.
1.10683 -if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10684 + fi
1.10685 +
1.10686 + # Some of the old makefiles require a setting of OPENWIN_HOME
1.10687 + # Since the X11R6 directory has disappeared on later Linuxes,
1.10688 + # we need to probe for it.
1.10689 + if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10690 if test -d "$SYS_ROOT/usr/X11R6"; then
1.10691 - OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
1.10692 + OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
1.10693 elif test -d "$SYS_ROOT/usr/include/X11"; then
1.10694 - OPENWIN_HOME="$SYS_ROOT/usr"
1.10695 - fi
1.10696 -fi
1.10697 -if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10698 + OPENWIN_HOME="$SYS_ROOT/usr"
1.10699 + fi
1.10700 + fi
1.10701 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10702 OPENWIN_HOME="/usr/openwin"
1.10703 -fi
1.10704 -
1.10705 -
1.10706 -
1.10707 -#
1.10708 -# Weird Sol10 something check...TODO change to try compile
1.10709 -#
1.10710 -if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
1.10711 - if test "`uname -r`" = "5.10"; then
1.10712 - if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
1.10713 - X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
1.10714 - fi
1.10715 - fi
1.10716 -fi
1.10717 -
1.10718 -ac_ext=c
1.10719 + fi
1.10720 +
1.10721 +
1.10722 +
1.10723 + #
1.10724 + # Weird Sol10 something check...TODO change to try compile
1.10725 + #
1.10726 + if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
1.10727 + if test "`uname -r`" = "5.10"; then
1.10728 + if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
1.10729 + X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
1.10730 + fi
1.10731 + fi
1.10732 + fi
1.10733 +
1.10734 + ac_ext=c
1.10735 ac_cpp='$CPP $CPPFLAGS'
1.10736 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.10737 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.10738 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.10739
1.10740 -OLD_CFLAGS="$CFLAGS"
1.10741 -CFLAGS="$CFLAGS $X_CFLAGS"
1.10742 -
1.10743 -# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
1.10744 -for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
1.10745 + OLD_CFLAGS="$CFLAGS"
1.10746 + CFLAGS="$CFLAGS $X_CFLAGS"
1.10747 +
1.10748 + # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
1.10749 + for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
1.10750 do :
1.10751 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.10752 -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " # include <X11/Xlib.h>
1.10753 - # include <X11/Xutil.h>
1.10754 +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
1.10755 + # include <X11/Xlib.h>
1.10756 + # include <X11/Xutil.h>
1.10757 +
1.10758
1.10759 "
1.10760 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1.10761 @@ -30504,52 +30496,52 @@
1.10762 done
1.10763
1.10764
1.10765 -CFLAGS="$OLD_CFLAGS"
1.10766 -ac_ext=cpp
1.10767 + CFLAGS="$OLD_CFLAGS"
1.10768 + ac_ext=cpp
1.10769 ac_cpp='$CXXCPP $CPPFLAGS'
1.10770 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.10771 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.10772 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.10773
1.10774
1.10775 -if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
1.10776 -
1.10777 - # Print a helpful message on how to acquire the necessary build dependency.
1.10778 - # x11 is the help tag: freetyp2, cups, pulse, alsa etc
1.10779 - MISSING_DEPENDENCY=x11
1.10780 - PKGHANDLER_COMMAND=
1.10781 -
1.10782 - case $PKGHANDLER in
1.10783 - apt-get)
1.10784 - apt_help $MISSING_DEPENDENCY ;;
1.10785 + if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
1.10786 +
1.10787 + # Print a helpful message on how to acquire the necessary build dependency.
1.10788 + # x11 is the help tag: freetyp2, cups, pulse, alsa etc
1.10789 + MISSING_DEPENDENCY=x11
1.10790 + PKGHANDLER_COMMAND=
1.10791 +
1.10792 + case $PKGHANDLER in
1.10793 + apt-get)
1.10794 + apt_help $MISSING_DEPENDENCY ;;
1.10795 yum)
1.10796 - yum_help $MISSING_DEPENDENCY ;;
1.10797 - port)
1.10798 - port_help $MISSING_DEPENDENCY ;;
1.10799 - pkgutil)
1.10800 - pkgutil_help $MISSING_DEPENDENCY ;;
1.10801 - pkgadd)
1.10802 - pkgadd_help $MISSING_DEPENDENCY ;;
1.10803 + yum_help $MISSING_DEPENDENCY ;;
1.10804 + port)
1.10805 + port_help $MISSING_DEPENDENCY ;;
1.10806 + pkgutil)
1.10807 + pkgutil_help $MISSING_DEPENDENCY ;;
1.10808 + pkgadd)
1.10809 + pkgadd_help $MISSING_DEPENDENCY ;;
1.10810 * )
1.10811 break ;;
1.10812 - esac
1.10813 -
1.10814 - if test "x$PKGHANDLER_COMMAND" != x; then
1.10815 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.10816 - fi
1.10817 + esac
1.10818 +
1.10819 + if test "x$PKGHANDLER_COMMAND" != x; then
1.10820 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.10821 + fi
1.10822
1.10823 as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5
1.10824 -fi
1.10825 -
1.10826 -
1.10827 -
1.10828 -
1.10829 -
1.10830 -
1.10831 -###############################################################################
1.10832 -#
1.10833 -# The common unix printing system cups is used to print from java.
1.10834 -#
1.10835 + fi
1.10836 +
1.10837 +
1.10838 +
1.10839 +
1.10840 +
1.10841 +
1.10842 + ###############################################################################
1.10843 + #
1.10844 + # The common unix printing system cups is used to print from java.
1.10845 + #
1.10846
1.10847 # Check whether --with-cups was given.
1.10848 if test "${with_cups+set}" = set; then :
1.10849 @@ -30563,175 +30555,175 @@
1.10850 fi
1.10851
1.10852
1.10853 -if test "x$CUPS_NOT_NEEDED" = xyes; then
1.10854 - if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
1.10855 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups not used, so --with-cups is ignored" >&5
1.10856 + if test "x$CUPS_NOT_NEEDED" = xyes; then
1.10857 + if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
1.10858 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups not used, so --with-cups is ignored" >&5
1.10859 $as_echo "$as_me: WARNING: cups not used, so --with-cups is ignored" >&2;}
1.10860 - fi
1.10861 - CUPS_CFLAGS=
1.10862 -else
1.10863 - CUPS_FOUND=no
1.10864 -
1.10865 - if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
1.10866 - as_fn_error $? "It is not possible to disable the use of cups. Remove the --without-cups option." "$LINENO" 5
1.10867 - fi
1.10868 -
1.10869 - if test "x${with_cups}" != x; then
1.10870 - CUPS_CFLAGS="-I${with_cups}/include"
1.10871 - CUPS_FOUND=yes
1.10872 - fi
1.10873 - if test "x${with_cups_include}" != x; then
1.10874 - CUPS_CFLAGS="-I${with_cups_include}"
1.10875 - CUPS_FOUND=yes
1.10876 - fi
1.10877 - if test "x$CUPS_FOUND" = xno; then
1.10878 -
1.10879 -
1.10880 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.10881 - # Source the builddeps file again, to make sure it uses the latest variables!
1.10882 - . $builddepsfile
1.10883 - # Look for a target and build machine specific resource!
1.10884 - eval resource=\${builddep_cups_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.10885 - if test "x$resource" = x; then
1.10886 - # Ok, lets instead look for a target specific resource
1.10887 - eval resource=\${builddep_cups_TARGET_${rewritten_target_var}}
1.10888 - fi
1.10889 - if test "x$resource" = x; then
1.10890 - # Ok, lets instead look for a build specific resource
1.10891 - eval resource=\${builddep_cups_BUILD_${rewritten_build_var}}
1.10892 - fi
1.10893 - if test "x$resource" = x; then
1.10894 - # Ok, lets instead look for a generic resource
1.10895 - # (The cups comes from M4 and not the shell, thus no need for eval here.)
1.10896 - resource=${builddep_cups}
1.10897 - fi
1.10898 - if test "x$resource" != x; then
1.10899 - { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for cups" >&5
1.10900 + fi
1.10901 + CUPS_CFLAGS=
1.10902 + else
1.10903 + CUPS_FOUND=no
1.10904 +
1.10905 + if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
1.10906 + as_fn_error $? "It is not possible to disable the use of cups. Remove the --without-cups option." "$LINENO" 5
1.10907 + fi
1.10908 +
1.10909 + if test "x${with_cups}" != x; then
1.10910 + CUPS_CFLAGS="-I${with_cups}/include"
1.10911 + CUPS_FOUND=yes
1.10912 + fi
1.10913 + if test "x${with_cups_include}" != x; then
1.10914 + CUPS_CFLAGS="-I${with_cups_include}"
1.10915 + CUPS_FOUND=yes
1.10916 + fi
1.10917 + if test "x$CUPS_FOUND" = xno; then
1.10918 +
1.10919 +
1.10920 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.10921 + # Source the builddeps file again, to make sure it uses the latest variables!
1.10922 + . $builddepsfile
1.10923 + # Look for a target and build machine specific resource!
1.10924 + eval resource=\${builddep_cups_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.10925 + if test "x$resource" = x; then
1.10926 + # Ok, lets instead look for a target specific resource
1.10927 + eval resource=\${builddep_cups_TARGET_${rewritten_target_var}}
1.10928 + fi
1.10929 + if test "x$resource" = x; then
1.10930 + # Ok, lets instead look for a build specific resource
1.10931 + eval resource=\${builddep_cups_BUILD_${rewritten_build_var}}
1.10932 + fi
1.10933 + if test "x$resource" = x; then
1.10934 + # Ok, lets instead look for a generic resource
1.10935 + # (The cups comes from M4 and not the shell, thus no need for eval here.)
1.10936 + resource=${builddep_cups}
1.10937 + fi
1.10938 + if test "x$resource" != x; then
1.10939 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for cups" >&5
1.10940 $as_echo "$as_me: Using builddeps $resource for cups" >&6;}
1.10941 - # If the resource in the builddeps.conf file is an existing directory,
1.10942 - # for example /java/linux/cups
1.10943 - if test -d ${resource}; then
1.10944 - depdir=${resource}
1.10945 - else
1.10946 -
1.10947 -# cups is for example mymodule
1.10948 -# $resource is for example libs/general/libmymod_1_2_3.zip
1.10949 -# $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.10950 -# $with_builddeps_dir is for example /localhome/builddeps
1.10951 -# depdir is the name of the variable into which we store the depdir, eg MYMOD
1.10952 -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.10953 -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.10954 - filename=`basename $resource`
1.10955 - filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.10956 - filebase=${filename%%.*}
1.10957 - extension=${filename#*.}
1.10958 - installdir=$with_builddeps_dir/$filebase
1.10959 - if test ! -f $installdir/$filename.unpacked; then
1.10960 - { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency cups from $with_builddeps_server/$resource and installing into $installdir" >&5
1.10961 + # If the resource in the builddeps.conf file is an existing directory,
1.10962 + # for example /java/linux/cups
1.10963 + if test -d ${resource}; then
1.10964 + depdir=${resource}
1.10965 + else
1.10966 +
1.10967 + # cups is for example mymodule
1.10968 + # $resource is for example libs/general/libmymod_1_2_3.zip
1.10969 + # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.10970 + # $with_builddeps_dir is for example /localhome/builddeps
1.10971 + # depdir is the name of the variable into which we store the depdir, eg MYMOD
1.10972 + # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.10973 + # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.10974 + filename=`basename $resource`
1.10975 + filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.10976 + filebase=${filename%%.*}
1.10977 + extension=${filename#*.}
1.10978 + installdir=$with_builddeps_dir/$filebase
1.10979 + if test ! -f $installdir/$filename.unpacked; then
1.10980 + { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency cups from $with_builddeps_server/$resource and installing into $installdir" >&5
1.10981 $as_echo "$as_me: Downloading build dependency cups from $with_builddeps_server/$resource and installing into $installdir" >&6;}
1.10982 - if test ! -d $installdir; then
1.10983 - mkdir -p $installdir
1.10984 - fi
1.10985 - if test ! -d $installdir; then
1.10986 - as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.10987 - fi
1.10988 - tmpfile=`mktemp $installdir/cups.XXXXXXXXX`
1.10989 - touch $tmpfile
1.10990 - if test ! -f $tmpfile; then
1.10991 - as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.10992 - fi
1.10993 -
1.10994 - # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.10995 - # $tmpfile is the local file name for the downloaded file.
1.10996 - VALID_TOOL=no
1.10997 - if test "x$BDEPS_FTP" = xwget; then
1.10998 - VALID_TOOL=yes
1.10999 - wget -O $tmpfile $with_builddeps_server/$resource
1.11000 - fi
1.11001 - if test "x$BDEPS_FTP" = xlftp; then
1.11002 - VALID_TOOL=yes
1.11003 - lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.11004 - fi
1.11005 - if test "x$BDEPS_FTP" = xftp; then
1.11006 - VALID_TOOL=yes
1.11007 - FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.11008 - FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.11009 - FTPUSERPWD=${FTPSERVER%%@*}
1.11010 - if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.11011 - FTPUSER=${userpwd%%:*}
1.11012 - FTPPWD=${userpwd#*@}
1.11013 - FTPSERVER=${FTPSERVER#*@}
1.11014 - else
1.11015 - FTPUSER=ftp
1.11016 - FTPPWD=ftp
1.11017 - fi
1.11018 - # the "pass" command does not work on some
1.11019 - # ftp clients (read ftp.exe) but if it works,
1.11020 - # passive mode is better!
1.11021 - (\
1.11022 - echo "user $FTPUSER $FTPPWD" ;\
1.11023 - echo "pass" ;\
1.11024 - echo "bin" ;\
1.11025 - echo "get $FTPPATH $tmpfile" ;\
1.11026 - ) | ftp -in $FTPSERVER
1.11027 - fi
1.11028 - if test "x$VALID_TOOL" != xyes; then
1.11029 - as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.11030 - fi
1.11031 -
1.11032 - mv $tmpfile $installdir/$filename
1.11033 - if test ! -s $installdir/$filename; then
1.11034 - as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.11035 - fi
1.11036 - case "$extension" in
1.11037 - zip) echo "Unzipping $installdir/$filename..."
1.11038 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.11039 - ;;
1.11040 - tar.gz) echo "Untaring $installdir/$filename..."
1.11041 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.11042 - ;;
1.11043 - tgz) echo "Untaring $installdir/$filename..."
1.11044 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.11045 - ;;
1.11046 - *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.11047 - ;;
1.11048 - esac
1.11049 - fi
1.11050 - if test -f $installdir/$filename.unpacked; then
1.11051 - depdir=$installdir
1.11052 - fi
1.11053 -
1.11054 - fi
1.11055 - # Source the builddeps file again, because in the previous command, the depdir
1.11056 - # was updated to point at the current build dependency install directory.
1.11057 - . $builddepsfile
1.11058 - # Now extract variables from the builddeps.conf files.
1.11059 - theroot=${builddep_cups_ROOT}
1.11060 - thecflags=${builddep_cups_CFLAGS}
1.11061 - thelibs=${builddep_cups_LIBS}
1.11062 - if test "x$depdir" = x; then
1.11063 - as_fn_error $? "Could not download build dependency cups" "$LINENO" 5
1.11064 - fi
1.11065 - CUPS=$depdir
1.11066 - if test "x$theroot" != x; then
1.11067 - CUPS="$theroot"
1.11068 - fi
1.11069 - if test "x$thecflags" != x; then
1.11070 - CUPS_CFLAGS="$thecflags"
1.11071 - fi
1.11072 - if test "x$thelibs" != x; then
1.11073 - CUPS_LIBS="$thelibs"
1.11074 - fi
1.11075 - CUPS_FOUND=yes
1.11076 -
1.11077 - fi
1.11078 -
1.11079 - fi
1.11080 -
1.11081 - fi
1.11082 - if test "x$CUPS_FOUND" = xno; then
1.11083 - # Are the cups headers installed in the default /usr/include location?
1.11084 - for ac_header in cups/cups.h cups/ppd.h
1.11085 + if test ! -d $installdir; then
1.11086 + mkdir -p $installdir
1.11087 + fi
1.11088 + if test ! -d $installdir; then
1.11089 + as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.11090 + fi
1.11091 + tmpfile=`mktemp $installdir/cups.XXXXXXXXX`
1.11092 + touch $tmpfile
1.11093 + if test ! -f $tmpfile; then
1.11094 + as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.11095 + fi
1.11096 +
1.11097 + # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.11098 + # $tmpfile is the local file name for the downloaded file.
1.11099 + VALID_TOOL=no
1.11100 + if test "x$BDEPS_FTP" = xwget; then
1.11101 + VALID_TOOL=yes
1.11102 + wget -O $tmpfile $with_builddeps_server/$resource
1.11103 + fi
1.11104 + if test "x$BDEPS_FTP" = xlftp; then
1.11105 + VALID_TOOL=yes
1.11106 + lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.11107 + fi
1.11108 + if test "x$BDEPS_FTP" = xftp; then
1.11109 + VALID_TOOL=yes
1.11110 + FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.11111 + FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.11112 + FTPUSERPWD=${FTPSERVER%%@*}
1.11113 + if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.11114 + FTPUSER=${userpwd%%:*}
1.11115 + FTPPWD=${userpwd#*@}
1.11116 + FTPSERVER=${FTPSERVER#*@}
1.11117 + else
1.11118 + FTPUSER=ftp
1.11119 + FTPPWD=ftp
1.11120 + fi
1.11121 + # the "pass" command does not work on some
1.11122 + # ftp clients (read ftp.exe) but if it works,
1.11123 + # passive mode is better!
1.11124 + ( \
1.11125 + echo "user $FTPUSER $FTPPWD" ; \
1.11126 + echo "pass" ; \
1.11127 + echo "bin" ; \
1.11128 + echo "get $FTPPATH $tmpfile" ; \
1.11129 + ) | ftp -in $FTPSERVER
1.11130 + fi
1.11131 + if test "x$VALID_TOOL" != xyes; then
1.11132 + as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.11133 + fi
1.11134 +
1.11135 + mv $tmpfile $installdir/$filename
1.11136 + if test ! -s $installdir/$filename; then
1.11137 + as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.11138 + fi
1.11139 + case "$extension" in
1.11140 + zip) echo "Unzipping $installdir/$filename..."
1.11141 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.11142 + ;;
1.11143 + tar.gz) echo "Untaring $installdir/$filename..."
1.11144 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.11145 + ;;
1.11146 + tgz) echo "Untaring $installdir/$filename..."
1.11147 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.11148 + ;;
1.11149 + *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.11150 + ;;
1.11151 + esac
1.11152 + fi
1.11153 + if test -f $installdir/$filename.unpacked; then
1.11154 + depdir=$installdir
1.11155 + fi
1.11156 +
1.11157 + fi
1.11158 + # Source the builddeps file again, because in the previous command, the depdir
1.11159 + # was updated to point at the current build dependency install directory.
1.11160 + . $builddepsfile
1.11161 + # Now extract variables from the builddeps.conf files.
1.11162 + theroot=${builddep_cups_ROOT}
1.11163 + thecflags=${builddep_cups_CFLAGS}
1.11164 + thelibs=${builddep_cups_LIBS}
1.11165 + if test "x$depdir" = x; then
1.11166 + as_fn_error $? "Could not download build dependency cups" "$LINENO" 5
1.11167 + fi
1.11168 + CUPS=$depdir
1.11169 + if test "x$theroot" != x; then
1.11170 + CUPS="$theroot"
1.11171 + fi
1.11172 + if test "x$thecflags" != x; then
1.11173 + CUPS_CFLAGS="$thecflags"
1.11174 + fi
1.11175 + if test "x$thelibs" != x; then
1.11176 + CUPS_LIBS="$thelibs"
1.11177 + fi
1.11178 + CUPS_FOUND=yes
1.11179 +
1.11180 + fi
1.11181 +
1.11182 + fi
1.11183 +
1.11184 + fi
1.11185 + if test "x$CUPS_FOUND" = xno; then
1.11186 + # Are the cups headers installed in the default /usr/include location?
1.11187 + for ac_header in cups/cups.h cups/ppd.h
1.11188 do :
1.11189 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.11190 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1.11191 @@ -30739,70 +30731,73 @@
1.11192 cat >>confdefs.h <<_ACEOF
1.11193 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1.11194 _ACEOF
1.11195 - CUPS_FOUND=yes
1.11196 - CUPS_CFLAGS=
1.11197 - DEFAULT_CUPS=yes
1.11198 -fi
1.11199 -
1.11200 -done
1.11201 -
1.11202 - fi
1.11203 - if test "x$CUPS_FOUND" = xno; then
1.11204 - # Getting nervous now? Lets poke around for standard Solaris third-party
1.11205 - # package installation locations.
1.11206 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers" >&5
1.11207 +
1.11208 + CUPS_FOUND=yes
1.11209 + CUPS_CFLAGS=
1.11210 + DEFAULT_CUPS=yes
1.11211 +
1.11212 +
1.11213 +fi
1.11214 +
1.11215 +done
1.11216 +
1.11217 + fi
1.11218 + if test "x$CUPS_FOUND" = xno; then
1.11219 + # Getting nervous now? Lets poke around for standard Solaris third-party
1.11220 + # package installation locations.
1.11221 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers" >&5
1.11222 $as_echo_n "checking for cups headers... " >&6; }
1.11223 - if test -s /opt/sfw/cups/include/cups/cups.h; then
1.11224 - # An SFW package seems to be installed!
1.11225 - CUPS_FOUND=yes
1.11226 - CUPS_CFLAGS="-I/opt/sfw/cups/include"
1.11227 - elif test -s /opt/csw/include/cups/cups.h; then
1.11228 - # A CSW package seems to be installed!
1.11229 - CUPS_FOUND=yes
1.11230 - CUPS_CFLAGS="-I/opt/csw/include"
1.11231 - fi
1.11232 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5
1.11233 + if test -s /opt/sfw/cups/include/cups/cups.h; then
1.11234 + # An SFW package seems to be installed!
1.11235 + CUPS_FOUND=yes
1.11236 + CUPS_CFLAGS="-I/opt/sfw/cups/include"
1.11237 + elif test -s /opt/csw/include/cups/cups.h; then
1.11238 + # A CSW package seems to be installed!
1.11239 + CUPS_FOUND=yes
1.11240 + CUPS_CFLAGS="-I/opt/csw/include"
1.11241 + fi
1.11242 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5
1.11243 $as_echo "$CUPS_FOUND" >&6; }
1.11244 - fi
1.11245 - if test "x$CUPS_FOUND" = xno; then
1.11246 -
1.11247 - # Print a helpful message on how to acquire the necessary build dependency.
1.11248 - # cups is the help tag: freetyp2, cups, pulse, alsa etc
1.11249 - MISSING_DEPENDENCY=cups
1.11250 - PKGHANDLER_COMMAND=
1.11251 -
1.11252 - case $PKGHANDLER in
1.11253 - apt-get)
1.11254 - apt_help $MISSING_DEPENDENCY ;;
1.11255 + fi
1.11256 + if test "x$CUPS_FOUND" = xno; then
1.11257 +
1.11258 + # Print a helpful message on how to acquire the necessary build dependency.
1.11259 + # cups is the help tag: freetyp2, cups, pulse, alsa etc
1.11260 + MISSING_DEPENDENCY=cups
1.11261 + PKGHANDLER_COMMAND=
1.11262 +
1.11263 + case $PKGHANDLER in
1.11264 + apt-get)
1.11265 + apt_help $MISSING_DEPENDENCY ;;
1.11266 yum)
1.11267 - yum_help $MISSING_DEPENDENCY ;;
1.11268 - port)
1.11269 - port_help $MISSING_DEPENDENCY ;;
1.11270 - pkgutil)
1.11271 - pkgutil_help $MISSING_DEPENDENCY ;;
1.11272 - pkgadd)
1.11273 - pkgadd_help $MISSING_DEPENDENCY ;;
1.11274 + yum_help $MISSING_DEPENDENCY ;;
1.11275 + port)
1.11276 + port_help $MISSING_DEPENDENCY ;;
1.11277 + pkgutil)
1.11278 + pkgutil_help $MISSING_DEPENDENCY ;;
1.11279 + pkgadd)
1.11280 + pkgadd_help $MISSING_DEPENDENCY ;;
1.11281 * )
1.11282 break ;;
1.11283 - esac
1.11284 -
1.11285 - if test "x$PKGHANDLER_COMMAND" != x; then
1.11286 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.11287 - fi
1.11288 -
1.11289 - as_fn_error $? "Could not find cups! $HELP_MSG " "$LINENO" 5
1.11290 - fi
1.11291 -fi
1.11292 -
1.11293 -
1.11294 -
1.11295 -
1.11296 -
1.11297 -
1.11298 -###############################################################################
1.11299 -#
1.11300 -# The ubiquitous freetype2 library is used to render fonts.
1.11301 -#
1.11302 + esac
1.11303 +
1.11304 + if test "x$PKGHANDLER_COMMAND" != x; then
1.11305 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.11306 + fi
1.11307 +
1.11308 + as_fn_error $? "Could not find cups! $HELP_MSG " "$LINENO" 5
1.11309 + fi
1.11310 + fi
1.11311 +
1.11312 +
1.11313 +
1.11314 +
1.11315 +
1.11316 +
1.11317 + ###############################################################################
1.11318 + #
1.11319 + # The ubiquitous freetype2 library is used to render fonts.
1.11320 + #
1.11321
1.11322 # Check whether --with-freetype was given.
1.11323 if test "${with_freetype+set}" = set; then :
1.11324 @@ -30810,21 +30805,21 @@
1.11325 fi
1.11326
1.11327
1.11328 -# If we are using the OS installed system lib for freetype, then we do not need to copy it to the build tree
1.11329 -USING_SYSTEM_FT_LIB=false
1.11330 -
1.11331 -if test "x$FREETYPE2_NOT_NEEDED" = xyes; then
1.11332 - if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
1.11333 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetype not used, so --with-freetype is ignored" >&5
1.11334 + # If we are using the OS installed system lib for freetype, then we do not need to copy it to the build tree
1.11335 + USING_SYSTEM_FT_LIB=false
1.11336 +
1.11337 + if test "x$FREETYPE2_NOT_NEEDED" = xyes; then
1.11338 + if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
1.11339 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetype not used, so --with-freetype is ignored" >&5
1.11340 $as_echo "$as_me: WARNING: freetype not used, so --with-freetype is ignored" >&2;}
1.11341 - fi
1.11342 - FREETYPE2_CFLAGS=
1.11343 - FREETYPE2_LIBS=
1.11344 - FREETYPE2_LIB_PATH=
1.11345 -else
1.11346 - FREETYPE2_FOUND=no
1.11347 -
1.11348 - if test "x$with_freetype" != x; then
1.11349 + fi
1.11350 + FREETYPE2_CFLAGS=
1.11351 + FREETYPE2_LIBS=
1.11352 + FREETYPE2_LIB_PATH=
1.11353 + else
1.11354 + FREETYPE2_FOUND=no
1.11355 +
1.11356 + if test "x$with_freetype" != x; then
1.11357
1.11358 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.11359
1.11360 @@ -30947,186 +30942,186 @@
1.11361 with_freetype="`cd "$path"; $THEPWDCMD -L`"
1.11362 fi
1.11363
1.11364 - FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
1.11365 - FREETYPE2_LIB_PATH="$with_freetype/lib"
1.11366 - if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -d "$with_freetype/lib/amd64"; then
1.11367 - FREETYPE2_LIBS="-L$with_freetype/lib/amd64 -lfreetype"
1.11368 - FREETYPE2_LIB_PATH="$with_freetype/lib/amd64"
1.11369 - fi
1.11370 - if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.11371 - FREETYPE2_LIBS="$with_freetype/lib/freetype.lib"
1.11372 - fi
1.11373 - FREETYPE2_CFLAGS="-I$with_freetype/include"
1.11374 - if test -s $with_freetype/include/ft2build.h && test -d $with_freetype/include/freetype2/freetype; then
1.11375 - FREETYPE2_CFLAGS="-I$with_freetype/include/freetype2 -I$with_freetype/include"
1.11376 - fi
1.11377 - FREETYPE2_FOUND=yes
1.11378 - if test "x$FREETYPE2_FOUND" = xyes; then
1.11379 - # Verify that the directories exist
1.11380 - if ! test -d "$with_freetype/lib" || ! test -d "$with_freetype/include"; then
1.11381 - as_fn_error $? "Could not find the expected directories $with_freetype/lib and $with_freetype/include" "$LINENO" 5
1.11382 - fi
1.11383 - # List the contents of the lib.
1.11384 - FREETYPELIB=`ls $with_freetype/lib/libfreetype.so $with_freetype/lib/freetype.dll 2> /dev/null`
1.11385 - if test "x$FREETYPELIB" = x; then
1.11386 - as_fn_error $? "Could not find libfreetype.so nor freetype.dll in $with_freetype/lib" "$LINENO" 5
1.11387 - fi
1.11388 - # Check one h-file
1.11389 - if ! test -s "$with_freetype/include/ft2build.h"; then
1.11390 - as_fn_error $? "Could not find $with_freetype/include/ft2build.h" "$LINENO" 5
1.11391 - fi
1.11392 - fi
1.11393 - fi
1.11394 - if test "x$FREETYPE2_FOUND" = xno; then
1.11395 -
1.11396 -
1.11397 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.11398 - # Source the builddeps file again, to make sure it uses the latest variables!
1.11399 - . $builddepsfile
1.11400 - # Look for a target and build machine specific resource!
1.11401 - eval resource=\${builddep_freetype2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.11402 - if test "x$resource" = x; then
1.11403 - # Ok, lets instead look for a target specific resource
1.11404 - eval resource=\${builddep_freetype2_TARGET_${rewritten_target_var}}
1.11405 - fi
1.11406 - if test "x$resource" = x; then
1.11407 - # Ok, lets instead look for a build specific resource
1.11408 - eval resource=\${builddep_freetype2_BUILD_${rewritten_build_var}}
1.11409 - fi
1.11410 - if test "x$resource" = x; then
1.11411 - # Ok, lets instead look for a generic resource
1.11412 - # (The freetype2 comes from M4 and not the shell, thus no need for eval here.)
1.11413 - resource=${builddep_freetype2}
1.11414 - fi
1.11415 - if test "x$resource" != x; then
1.11416 - { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for freetype2" >&5
1.11417 + FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
1.11418 + FREETYPE2_LIB_PATH="$with_freetype/lib"
1.11419 + if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -d "$with_freetype/lib/amd64"; then
1.11420 + FREETYPE2_LIBS="-L$with_freetype/lib/amd64 -lfreetype"
1.11421 + FREETYPE2_LIB_PATH="$with_freetype/lib/amd64"
1.11422 + fi
1.11423 + if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.11424 + FREETYPE2_LIBS="$with_freetype/lib/freetype.lib"
1.11425 + fi
1.11426 + FREETYPE2_CFLAGS="-I$with_freetype/include"
1.11427 + if test -s $with_freetype/include/ft2build.h && test -d $with_freetype/include/freetype2/freetype; then
1.11428 + FREETYPE2_CFLAGS="-I$with_freetype/include/freetype2 -I$with_freetype/include"
1.11429 + fi
1.11430 + FREETYPE2_FOUND=yes
1.11431 + if test "x$FREETYPE2_FOUND" = xyes; then
1.11432 + # Verify that the directories exist
1.11433 + if ! test -d "$with_freetype/lib" || ! test -d "$with_freetype/include"; then
1.11434 + as_fn_error $? "Could not find the expected directories $with_freetype/lib and $with_freetype/include" "$LINENO" 5
1.11435 + fi
1.11436 + # List the contents of the lib.
1.11437 + FREETYPELIB=`ls $with_freetype/lib/libfreetype.so $with_freetype/lib/freetype.dll 2> /dev/null`
1.11438 + if test "x$FREETYPELIB" = x; then
1.11439 + as_fn_error $? "Could not find libfreetype.so nor freetype.dll in $with_freetype/lib" "$LINENO" 5
1.11440 + fi
1.11441 + # Check one h-file
1.11442 + if ! test -s "$with_freetype/include/ft2build.h"; then
1.11443 + as_fn_error $? "Could not find $with_freetype/include/ft2build.h" "$LINENO" 5
1.11444 + fi
1.11445 + fi
1.11446 + fi
1.11447 + if test "x$FREETYPE2_FOUND" = xno; then
1.11448 +
1.11449 +
1.11450 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.11451 + # Source the builddeps file again, to make sure it uses the latest variables!
1.11452 + . $builddepsfile
1.11453 + # Look for a target and build machine specific resource!
1.11454 + eval resource=\${builddep_freetype2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.11455 + if test "x$resource" = x; then
1.11456 + # Ok, lets instead look for a target specific resource
1.11457 + eval resource=\${builddep_freetype2_TARGET_${rewritten_target_var}}
1.11458 + fi
1.11459 + if test "x$resource" = x; then
1.11460 + # Ok, lets instead look for a build specific resource
1.11461 + eval resource=\${builddep_freetype2_BUILD_${rewritten_build_var}}
1.11462 + fi
1.11463 + if test "x$resource" = x; then
1.11464 + # Ok, lets instead look for a generic resource
1.11465 + # (The freetype2 comes from M4 and not the shell, thus no need for eval here.)
1.11466 + resource=${builddep_freetype2}
1.11467 + fi
1.11468 + if test "x$resource" != x; then
1.11469 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for freetype2" >&5
1.11470 $as_echo "$as_me: Using builddeps $resource for freetype2" >&6;}
1.11471 - # If the resource in the builddeps.conf file is an existing directory,
1.11472 - # for example /java/linux/cups
1.11473 - if test -d ${resource}; then
1.11474 - depdir=${resource}
1.11475 - else
1.11476 -
1.11477 -# freetype2 is for example mymodule
1.11478 -# $resource is for example libs/general/libmymod_1_2_3.zip
1.11479 -# $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.11480 -# $with_builddeps_dir is for example /localhome/builddeps
1.11481 -# depdir is the name of the variable into which we store the depdir, eg MYMOD
1.11482 -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.11483 -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.11484 - filename=`basename $resource`
1.11485 - filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.11486 - filebase=${filename%%.*}
1.11487 - extension=${filename#*.}
1.11488 - installdir=$with_builddeps_dir/$filebase
1.11489 - if test ! -f $installdir/$filename.unpacked; then
1.11490 - { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency freetype2 from $with_builddeps_server/$resource and installing into $installdir" >&5
1.11491 + # If the resource in the builddeps.conf file is an existing directory,
1.11492 + # for example /java/linux/cups
1.11493 + if test -d ${resource}; then
1.11494 + depdir=${resource}
1.11495 + else
1.11496 +
1.11497 + # freetype2 is for example mymodule
1.11498 + # $resource is for example libs/general/libmymod_1_2_3.zip
1.11499 + # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.11500 + # $with_builddeps_dir is for example /localhome/builddeps
1.11501 + # depdir is the name of the variable into which we store the depdir, eg MYMOD
1.11502 + # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.11503 + # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.11504 + filename=`basename $resource`
1.11505 + filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.11506 + filebase=${filename%%.*}
1.11507 + extension=${filename#*.}
1.11508 + installdir=$with_builddeps_dir/$filebase
1.11509 + if test ! -f $installdir/$filename.unpacked; then
1.11510 + { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency freetype2 from $with_builddeps_server/$resource and installing into $installdir" >&5
1.11511 $as_echo "$as_me: Downloading build dependency freetype2 from $with_builddeps_server/$resource and installing into $installdir" >&6;}
1.11512 - if test ! -d $installdir; then
1.11513 - mkdir -p $installdir
1.11514 - fi
1.11515 - if test ! -d $installdir; then
1.11516 - as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.11517 - fi
1.11518 - tmpfile=`mktemp $installdir/freetype2.XXXXXXXXX`
1.11519 - touch $tmpfile
1.11520 - if test ! -f $tmpfile; then
1.11521 - as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.11522 - fi
1.11523 -
1.11524 - # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.11525 - # $tmpfile is the local file name for the downloaded file.
1.11526 - VALID_TOOL=no
1.11527 - if test "x$BDEPS_FTP" = xwget; then
1.11528 - VALID_TOOL=yes
1.11529 - wget -O $tmpfile $with_builddeps_server/$resource
1.11530 - fi
1.11531 - if test "x$BDEPS_FTP" = xlftp; then
1.11532 - VALID_TOOL=yes
1.11533 - lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.11534 - fi
1.11535 - if test "x$BDEPS_FTP" = xftp; then
1.11536 - VALID_TOOL=yes
1.11537 - FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.11538 - FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.11539 - FTPUSERPWD=${FTPSERVER%%@*}
1.11540 - if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.11541 - FTPUSER=${userpwd%%:*}
1.11542 - FTPPWD=${userpwd#*@}
1.11543 - FTPSERVER=${FTPSERVER#*@}
1.11544 - else
1.11545 - FTPUSER=ftp
1.11546 - FTPPWD=ftp
1.11547 - fi
1.11548 - # the "pass" command does not work on some
1.11549 - # ftp clients (read ftp.exe) but if it works,
1.11550 - # passive mode is better!
1.11551 - (\
1.11552 - echo "user $FTPUSER $FTPPWD" ;\
1.11553 - echo "pass" ;\
1.11554 - echo "bin" ;\
1.11555 - echo "get $FTPPATH $tmpfile" ;\
1.11556 - ) | ftp -in $FTPSERVER
1.11557 - fi
1.11558 - if test "x$VALID_TOOL" != xyes; then
1.11559 - as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.11560 - fi
1.11561 -
1.11562 - mv $tmpfile $installdir/$filename
1.11563 - if test ! -s $installdir/$filename; then
1.11564 - as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.11565 - fi
1.11566 - case "$extension" in
1.11567 - zip) echo "Unzipping $installdir/$filename..."
1.11568 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.11569 - ;;
1.11570 - tar.gz) echo "Untaring $installdir/$filename..."
1.11571 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.11572 - ;;
1.11573 - tgz) echo "Untaring $installdir/$filename..."
1.11574 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.11575 - ;;
1.11576 - *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.11577 - ;;
1.11578 - esac
1.11579 - fi
1.11580 - if test -f $installdir/$filename.unpacked; then
1.11581 - depdir=$installdir
1.11582 - fi
1.11583 -
1.11584 - fi
1.11585 - # Source the builddeps file again, because in the previous command, the depdir
1.11586 - # was updated to point at the current build dependency install directory.
1.11587 - . $builddepsfile
1.11588 - # Now extract variables from the builddeps.conf files.
1.11589 - theroot=${builddep_freetype2_ROOT}
1.11590 - thecflags=${builddep_freetype2_CFLAGS}
1.11591 - thelibs=${builddep_freetype2_LIBS}
1.11592 - if test "x$depdir" = x; then
1.11593 - as_fn_error $? "Could not download build dependency freetype2" "$LINENO" 5
1.11594 - fi
1.11595 - FREETYPE2=$depdir
1.11596 - if test "x$theroot" != x; then
1.11597 - FREETYPE2="$theroot"
1.11598 - fi
1.11599 - if test "x$thecflags" != x; then
1.11600 - FREETYPE2_CFLAGS="$thecflags"
1.11601 - fi
1.11602 - if test "x$thelibs" != x; then
1.11603 - FREETYPE2_LIBS="$thelibs"
1.11604 - fi
1.11605 - FREETYPE2_FOUND=yes
1.11606 - else FREETYPE2_FOUND=no
1.11607 -
1.11608 - fi
1.11609 - else FREETYPE2_FOUND=no
1.11610 -
1.11611 - fi
1.11612 -
1.11613 - USING_SYSTEM_FT_LIB=true
1.11614 - fi
1.11615 - if test "x$FREETYPE2_FOUND" = xno && test "x$OPENJDK_TARGET_OS" = xwindows; then
1.11616 - FREETYPELOCATION="$PROGRAMFILES/GnuWin32"
1.11617 + if test ! -d $installdir; then
1.11618 + mkdir -p $installdir
1.11619 + fi
1.11620 + if test ! -d $installdir; then
1.11621 + as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.11622 + fi
1.11623 + tmpfile=`mktemp $installdir/freetype2.XXXXXXXXX`
1.11624 + touch $tmpfile
1.11625 + if test ! -f $tmpfile; then
1.11626 + as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.11627 + fi
1.11628 +
1.11629 + # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.11630 + # $tmpfile is the local file name for the downloaded file.
1.11631 + VALID_TOOL=no
1.11632 + if test "x$BDEPS_FTP" = xwget; then
1.11633 + VALID_TOOL=yes
1.11634 + wget -O $tmpfile $with_builddeps_server/$resource
1.11635 + fi
1.11636 + if test "x$BDEPS_FTP" = xlftp; then
1.11637 + VALID_TOOL=yes
1.11638 + lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.11639 + fi
1.11640 + if test "x$BDEPS_FTP" = xftp; then
1.11641 + VALID_TOOL=yes
1.11642 + FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.11643 + FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.11644 + FTPUSERPWD=${FTPSERVER%%@*}
1.11645 + if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.11646 + FTPUSER=${userpwd%%:*}
1.11647 + FTPPWD=${userpwd#*@}
1.11648 + FTPSERVER=${FTPSERVER#*@}
1.11649 + else
1.11650 + FTPUSER=ftp
1.11651 + FTPPWD=ftp
1.11652 + fi
1.11653 + # the "pass" command does not work on some
1.11654 + # ftp clients (read ftp.exe) but if it works,
1.11655 + # passive mode is better!
1.11656 + ( \
1.11657 + echo "user $FTPUSER $FTPPWD" ; \
1.11658 + echo "pass" ; \
1.11659 + echo "bin" ; \
1.11660 + echo "get $FTPPATH $tmpfile" ; \
1.11661 + ) | ftp -in $FTPSERVER
1.11662 + fi
1.11663 + if test "x$VALID_TOOL" != xyes; then
1.11664 + as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.11665 + fi
1.11666 +
1.11667 + mv $tmpfile $installdir/$filename
1.11668 + if test ! -s $installdir/$filename; then
1.11669 + as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.11670 + fi
1.11671 + case "$extension" in
1.11672 + zip) echo "Unzipping $installdir/$filename..."
1.11673 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.11674 + ;;
1.11675 + tar.gz) echo "Untaring $installdir/$filename..."
1.11676 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.11677 + ;;
1.11678 + tgz) echo "Untaring $installdir/$filename..."
1.11679 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.11680 + ;;
1.11681 + *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.11682 + ;;
1.11683 + esac
1.11684 + fi
1.11685 + if test -f $installdir/$filename.unpacked; then
1.11686 + depdir=$installdir
1.11687 + fi
1.11688 +
1.11689 + fi
1.11690 + # Source the builddeps file again, because in the previous command, the depdir
1.11691 + # was updated to point at the current build dependency install directory.
1.11692 + . $builddepsfile
1.11693 + # Now extract variables from the builddeps.conf files.
1.11694 + theroot=${builddep_freetype2_ROOT}
1.11695 + thecflags=${builddep_freetype2_CFLAGS}
1.11696 + thelibs=${builddep_freetype2_LIBS}
1.11697 + if test "x$depdir" = x; then
1.11698 + as_fn_error $? "Could not download build dependency freetype2" "$LINENO" 5
1.11699 + fi
1.11700 + FREETYPE2=$depdir
1.11701 + if test "x$theroot" != x; then
1.11702 + FREETYPE2="$theroot"
1.11703 + fi
1.11704 + if test "x$thecflags" != x; then
1.11705 + FREETYPE2_CFLAGS="$thecflags"
1.11706 + fi
1.11707 + if test "x$thelibs" != x; then
1.11708 + FREETYPE2_LIBS="$thelibs"
1.11709 + fi
1.11710 + FREETYPE2_FOUND=yes
1.11711 + else FREETYPE2_FOUND=no
1.11712 +
1.11713 + fi
1.11714 + else FREETYPE2_FOUND=no
1.11715 +
1.11716 + fi
1.11717 +
1.11718 + USING_SYSTEM_FT_LIB=true
1.11719 + fi
1.11720 + if test "x$FREETYPE2_FOUND" = xno && test "x$OPENJDK_TARGET_OS" = xwindows; then
1.11721 + FREETYPELOCATION="$PROGRAMFILES/GnuWin32"
1.11722
1.11723 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.11724
1.11725 @@ -31249,25 +31244,25 @@
1.11726 FREETYPELOCATION="`cd "$path"; $THEPWDCMD -L`"
1.11727 fi
1.11728
1.11729 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
1.11730 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
1.11731 $as_echo_n "checking for freetype in some standard windows locations... " >&6; }
1.11732 - if test -s "$FREETYPELOCATION/include/ft2build.h" && test -d "$FREETYPELOCATION/include/freetype2/freetype"; then
1.11733 - FREETYPE2_CFLAGS="-I$FREETYPELOCATION/include/freetype2 -I$FREETYPELOCATION/include"
1.11734 - FREETYPE2_LIBS="$FREETYPELOCATION/lib/freetype.lib"
1.11735 - FREETYPE2_LIB_PATH="$FREETYPELOCATION/lib"
1.11736 - if ! test -s "$FREETYPE2_LIBS"; then
1.11737 - as_fn_error $? "Could not find $FREETYPE2_LIBS" "$LINENO" 5
1.11738 - fi
1.11739 - if ! test -s "$FREETYPE2_LIB_PATH/freetype.dll"; then
1.11740 - as_fn_error $? "Could not find $FREETYPE2_LIB_PATH/freetype.dll" "$LINENO" 5
1.11741 - fi
1.11742 - USING_SYSTEM_FT_LIB=true
1.11743 - FREETYPE2_FOUND=yes
1.11744 - fi
1.11745 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE2_FOUND" >&5
1.11746 + if test -s "$FREETYPELOCATION/include/ft2build.h" && test -d "$FREETYPELOCATION/include/freetype2/freetype"; then
1.11747 + FREETYPE2_CFLAGS="-I$FREETYPELOCATION/include/freetype2 -I$FREETYPELOCATION/include"
1.11748 + FREETYPE2_LIBS="$FREETYPELOCATION/lib/freetype.lib"
1.11749 + FREETYPE2_LIB_PATH="$FREETYPELOCATION/lib"
1.11750 + if ! test -s "$FREETYPE2_LIBS"; then
1.11751 + as_fn_error $? "Could not find $FREETYPE2_LIBS" "$LINENO" 5
1.11752 + fi
1.11753 + if ! test -s "$FREETYPE2_LIB_PATH/freetype.dll"; then
1.11754 + as_fn_error $? "Could not find $FREETYPE2_LIB_PATH/freetype.dll" "$LINENO" 5
1.11755 + fi
1.11756 + USING_SYSTEM_FT_LIB=true
1.11757 + FREETYPE2_FOUND=yes
1.11758 + fi
1.11759 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE2_FOUND" >&5
1.11760 $as_echo "$FREETYPE2_FOUND" >&6; }
1.11761 - fi
1.11762 - if test "x$FREETYPE2_FOUND" = xno; then
1.11763 + fi
1.11764 + if test "x$FREETYPE2_FOUND" = xno; then
1.11765
1.11766 pkg_failed=no
1.11767 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE2" >&5
1.11768 @@ -31335,92 +31330,94 @@
1.11769 $as_echo "yes" >&6; }
1.11770 FREETYPE2_FOUND=yes
1.11771 fi
1.11772 - # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
1.11773 - FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's/-lz//g'`
1.11774 - USING_SYSTEM_FT_LIB=true
1.11775 - # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
1.11776 - if test "x$FREETYPE2_FOUND" = xyes && test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.11777 - FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's?/lib?/lib/amd64?g'`
1.11778 - fi
1.11779 - fi
1.11780 - if test "x$FREETYPE2_FOUND" = xno; then
1.11781 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard locations" >&5
1.11782 + # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
1.11783 + FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's/-lz//g'`
1.11784 + USING_SYSTEM_FT_LIB=true
1.11785 + # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
1.11786 + if test "x$FREETYPE2_FOUND" = xyes && test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.11787 + FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's?/lib?/lib/amd64?g'`
1.11788 + fi
1.11789 + fi
1.11790 + if test "x$FREETYPE2_FOUND" = xno; then
1.11791 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard locations" >&5
1.11792 $as_echo_n "checking for freetype in some standard locations... " >&6; }
1.11793
1.11794 - if test -s $SYS_ROOT/usr/X11/include/ft2build.h && test -d $SYS_ROOT/usr/X11/include/freetype2/freetype; then
1.11795 - DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/X11/include/freetype2 -I$SYS_ROOT/usr/X11/include"
1.11796 - DEFAULT_FREETYPE_LIBS="-L$SYS_ROOT/usr/X11/lib -lfreetype"
1.11797 - fi
1.11798 - if test -s $SYS_ROOT/usr/include/ft2build.h && test -d $SYS_ROOT/usr/include/freetype2/freetype; then
1.11799 - DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/include/freetype2"
1.11800 - DEFAULT_FREETYPE_LIBS="-lfreetype"
1.11801 - fi
1.11802 -
1.11803 - PREV_CXXCFLAGS="$CXXFLAGS"
1.11804 - PREV_LDFLAGS="$LDFLAGS"
1.11805 - CXXFLAGS="$CXXFLAGS $DEFAULT_FREETYPE_CFLAGS"
1.11806 - LDFLAGS="$LDFLAGS $DEFAULT_FREETYPE_LIBS"
1.11807 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.11808 -/* end confdefs.h. */
1.11809 -#include<ft2build.h>
1.11810 - #include FT_FREETYPE_H
1.11811 - int main() { return 0; }
1.11812 + if test -s $SYS_ROOT/usr/X11/include/ft2build.h && test -d $SYS_ROOT/usr/X11/include/freetype2/freetype; then
1.11813 + DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/X11/include/freetype2 -I$SYS_ROOT/usr/X11/include"
1.11814 + DEFAULT_FREETYPE_LIBS="-L$SYS_ROOT/usr/X11/lib -lfreetype"
1.11815 + fi
1.11816 + if test -s $SYS_ROOT/usr/include/ft2build.h && test -d $SYS_ROOT/usr/include/freetype2/freetype; then
1.11817 + DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/include/freetype2"
1.11818 + DEFAULT_FREETYPE_LIBS="-lfreetype"
1.11819 + fi
1.11820 +
1.11821 + PREV_CXXCFLAGS="$CXXFLAGS"
1.11822 + PREV_LDFLAGS="$LDFLAGS"
1.11823 + CXXFLAGS="$CXXFLAGS $DEFAULT_FREETYPE_CFLAGS"
1.11824 + LDFLAGS="$LDFLAGS $DEFAULT_FREETYPE_LIBS"
1.11825 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.11826 +/* end confdefs.h. */
1.11827 +
1.11828 + #include<ft2build.h>
1.11829 + #include FT_FREETYPE_H
1.11830 + int main() { return 0; }
1.11831
1.11832 _ACEOF
1.11833 if ac_fn_cxx_try_link "$LINENO"; then :
1.11834
1.11835 - # Yes, the default cflags and libs did the trick.
1.11836 - FREETYPE2_FOUND=yes
1.11837 - FREETYPE2_CFLAGS="$DEFAULT_FREETYPE_CFLAGS"
1.11838 - FREETYPE2_LIBS="$DEFAULT_FREETYPE_LIBS"
1.11839 -
1.11840 -else
1.11841 -
1.11842 - FREETYPE2_FOUND=no
1.11843 + # Yes, the default cflags and libs did the trick.
1.11844 + FREETYPE2_FOUND=yes
1.11845 + FREETYPE2_CFLAGS="$DEFAULT_FREETYPE_CFLAGS"
1.11846 + FREETYPE2_LIBS="$DEFAULT_FREETYPE_LIBS"
1.11847 +
1.11848 +else
1.11849 +
1.11850 + FREETYPE2_FOUND=no
1.11851 +
1.11852
1.11853 fi
1.11854 rm -f core conftest.err conftest.$ac_objext \
1.11855 conftest$ac_exeext conftest.$ac_ext
1.11856 - CXXCFLAGS="$PREV_CXXFLAGS"
1.11857 - LDFLAGS="$PREV_LDFLAGS"
1.11858 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE2_FOUND" >&5
1.11859 + CXXCFLAGS="$PREV_CXXFLAGS"
1.11860 + LDFLAGS="$PREV_LDFLAGS"
1.11861 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE2_FOUND" >&5
1.11862 $as_echo "$FREETYPE2_FOUND" >&6; }
1.11863 - USING_SYSTEM_FT_LIB=true
1.11864 - fi
1.11865 - if test "x$FREETYPE2_FOUND" = xno; then
1.11866 -
1.11867 - # Print a helpful message on how to acquire the necessary build dependency.
1.11868 - # freetype2 is the help tag: freetyp2, cups, pulse, alsa etc
1.11869 - MISSING_DEPENDENCY=freetype2
1.11870 - PKGHANDLER_COMMAND=
1.11871 -
1.11872 - case $PKGHANDLER in
1.11873 - apt-get)
1.11874 - apt_help $MISSING_DEPENDENCY ;;
1.11875 + USING_SYSTEM_FT_LIB=true
1.11876 + fi
1.11877 + if test "x$FREETYPE2_FOUND" = xno; then
1.11878 +
1.11879 + # Print a helpful message on how to acquire the necessary build dependency.
1.11880 + # freetype2 is the help tag: freetyp2, cups, pulse, alsa etc
1.11881 + MISSING_DEPENDENCY=freetype2
1.11882 + PKGHANDLER_COMMAND=
1.11883 +
1.11884 + case $PKGHANDLER in
1.11885 + apt-get)
1.11886 + apt_help $MISSING_DEPENDENCY ;;
1.11887 yum)
1.11888 - yum_help $MISSING_DEPENDENCY ;;
1.11889 - port)
1.11890 - port_help $MISSING_DEPENDENCY ;;
1.11891 - pkgutil)
1.11892 - pkgutil_help $MISSING_DEPENDENCY ;;
1.11893 - pkgadd)
1.11894 - pkgadd_help $MISSING_DEPENDENCY ;;
1.11895 + yum_help $MISSING_DEPENDENCY ;;
1.11896 + port)
1.11897 + port_help $MISSING_DEPENDENCY ;;
1.11898 + pkgutil)
1.11899 + pkgutil_help $MISSING_DEPENDENCY ;;
1.11900 + pkgadd)
1.11901 + pkgadd_help $MISSING_DEPENDENCY ;;
1.11902 * )
1.11903 break ;;
1.11904 - esac
1.11905 -
1.11906 - if test "x$PKGHANDLER_COMMAND" != x; then
1.11907 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.11908 - fi
1.11909 -
1.11910 - as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
1.11911 - fi
1.11912 -
1.11913 - if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.11914 - # AC_CHECK_LIB does not support use of cl.exe
1.11915 - PREV_LDFLAGS="$LDFLAGS"
1.11916 - LDFLAGS="$FREETYPE2_LIBS"
1.11917 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
1.11918 + esac
1.11919 +
1.11920 + if test "x$PKGHANDLER_COMMAND" != x; then
1.11921 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.11922 + fi
1.11923 +
1.11924 + as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
1.11925 + fi
1.11926 +
1.11927 + if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.11928 + # AC_CHECK_LIB does not support use of cl.exe
1.11929 + PREV_LDFLAGS="$LDFLAGS"
1.11930 + LDFLAGS="$FREETYPE2_LIBS"
1.11931 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
1.11932 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
1.11933 if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
1.11934 $as_echo_n "(cached) " >&6
1.11935 @@ -31462,22 +31459,21 @@
1.11936 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
1.11937 fi
1.11938
1.11939 - LDFLAGS="$PREV_LDFLAGS"
1.11940 - fi
1.11941 -fi
1.11942 -
1.11943 -
1.11944 -
1.11945 -
1.11946 -
1.11947 -
1.11948 -
1.11949 -
1.11950 -
1.11951 -###############################################################################
1.11952 -#
1.11953 -# Check for alsa headers and libraries. Used on Linux/GNU systems.
1.11954 -#
1.11955 + LDFLAGS="$PREV_LDFLAGS"
1.11956 + fi
1.11957 + fi
1.11958 +
1.11959 +
1.11960 +
1.11961 +
1.11962 +
1.11963 +
1.11964 +
1.11965 +
1.11966 + ###############################################################################
1.11967 + #
1.11968 + # Check for alsa headers and libraries. Used on Linux/GNU systems.
1.11969 + #
1.11970
1.11971 # Check whether --with-alsa was given.
1.11972 if test "${with_alsa+set}" = set; then :
1.11973 @@ -31497,181 +31493,181 @@
1.11974 fi
1.11975
1.11976
1.11977 -if test "x$ALSA_NOT_NEEDED" = xyes; then
1.11978 - if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
1.11979 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: alsa not used, so --with-alsa is ignored" >&5
1.11980 + if test "x$ALSA_NOT_NEEDED" = xyes; then
1.11981 + if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
1.11982 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: alsa not used, so --with-alsa is ignored" >&5
1.11983 $as_echo "$as_me: WARNING: alsa not used, so --with-alsa is ignored" >&2;}
1.11984 - fi
1.11985 - ALSA_CFLAGS=
1.11986 - ALSA_LIBS=
1.11987 -else
1.11988 - ALSA_FOUND=no
1.11989 -
1.11990 - if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then
1.11991 - as_fn_error $? "It is not possible to disable the use of alsa. Remove the --without-alsa option." "$LINENO" 5
1.11992 - fi
1.11993 -
1.11994 - if test "x${with_alsa}" != x; then
1.11995 - ALSA_LIBS="-L${with_alsa}/lib -lalsa"
1.11996 - ALSA_CFLAGS="-I${with_alsa}/include"
1.11997 - ALSA_FOUND=yes
1.11998 - fi
1.11999 - if test "x${with_alsa_include}" != x; then
1.12000 - ALSA_CFLAGS="-I${with_alsa_include}"
1.12001 - ALSA_FOUND=yes
1.12002 - fi
1.12003 - if test "x${with_alsa_lib}" != x; then
1.12004 - ALSA_LIBS="-L${with_alsa_lib} -lalsa"
1.12005 - ALSA_FOUND=yes
1.12006 - fi
1.12007 - if test "x$ALSA_FOUND" = xno; then
1.12008 -
1.12009 -
1.12010 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.12011 - # Source the builddeps file again, to make sure it uses the latest variables!
1.12012 - . $builddepsfile
1.12013 - # Look for a target and build machine specific resource!
1.12014 - eval resource=\${builddep_alsa_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.12015 - if test "x$resource" = x; then
1.12016 - # Ok, lets instead look for a target specific resource
1.12017 - eval resource=\${builddep_alsa_TARGET_${rewritten_target_var}}
1.12018 - fi
1.12019 - if test "x$resource" = x; then
1.12020 - # Ok, lets instead look for a build specific resource
1.12021 - eval resource=\${builddep_alsa_BUILD_${rewritten_build_var}}
1.12022 - fi
1.12023 - if test "x$resource" = x; then
1.12024 - # Ok, lets instead look for a generic resource
1.12025 - # (The alsa comes from M4 and not the shell, thus no need for eval here.)
1.12026 - resource=${builddep_alsa}
1.12027 - fi
1.12028 - if test "x$resource" != x; then
1.12029 - { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for alsa" >&5
1.12030 + fi
1.12031 + ALSA_CFLAGS=
1.12032 + ALSA_LIBS=
1.12033 + else
1.12034 + ALSA_FOUND=no
1.12035 +
1.12036 + if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then
1.12037 + as_fn_error $? "It is not possible to disable the use of alsa. Remove the --without-alsa option." "$LINENO" 5
1.12038 + fi
1.12039 +
1.12040 + if test "x${with_alsa}" != x; then
1.12041 + ALSA_LIBS="-L${with_alsa}/lib -lalsa"
1.12042 + ALSA_CFLAGS="-I${with_alsa}/include"
1.12043 + ALSA_FOUND=yes
1.12044 + fi
1.12045 + if test "x${with_alsa_include}" != x; then
1.12046 + ALSA_CFLAGS="-I${with_alsa_include}"
1.12047 + ALSA_FOUND=yes
1.12048 + fi
1.12049 + if test "x${with_alsa_lib}" != x; then
1.12050 + ALSA_LIBS="-L${with_alsa_lib} -lalsa"
1.12051 + ALSA_FOUND=yes
1.12052 + fi
1.12053 + if test "x$ALSA_FOUND" = xno; then
1.12054 +
1.12055 +
1.12056 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
1.12057 + # Source the builddeps file again, to make sure it uses the latest variables!
1.12058 + . $builddepsfile
1.12059 + # Look for a target and build machine specific resource!
1.12060 + eval resource=\${builddep_alsa_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
1.12061 + if test "x$resource" = x; then
1.12062 + # Ok, lets instead look for a target specific resource
1.12063 + eval resource=\${builddep_alsa_TARGET_${rewritten_target_var}}
1.12064 + fi
1.12065 + if test "x$resource" = x; then
1.12066 + # Ok, lets instead look for a build specific resource
1.12067 + eval resource=\${builddep_alsa_BUILD_${rewritten_build_var}}
1.12068 + fi
1.12069 + if test "x$resource" = x; then
1.12070 + # Ok, lets instead look for a generic resource
1.12071 + # (The alsa comes from M4 and not the shell, thus no need for eval here.)
1.12072 + resource=${builddep_alsa}
1.12073 + fi
1.12074 + if test "x$resource" != x; then
1.12075 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for alsa" >&5
1.12076 $as_echo "$as_me: Using builddeps $resource for alsa" >&6;}
1.12077 - # If the resource in the builddeps.conf file is an existing directory,
1.12078 - # for example /java/linux/cups
1.12079 - if test -d ${resource}; then
1.12080 - depdir=${resource}
1.12081 - else
1.12082 -
1.12083 -# alsa is for example mymodule
1.12084 -# $resource is for example libs/general/libmymod_1_2_3.zip
1.12085 -# $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.12086 -# $with_builddeps_dir is for example /localhome/builddeps
1.12087 -# depdir is the name of the variable into which we store the depdir, eg MYMOD
1.12088 -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.12089 -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.12090 - filename=`basename $resource`
1.12091 - filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.12092 - filebase=${filename%%.*}
1.12093 - extension=${filename#*.}
1.12094 - installdir=$with_builddeps_dir/$filebase
1.12095 - if test ! -f $installdir/$filename.unpacked; then
1.12096 - { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency alsa from $with_builddeps_server/$resource and installing into $installdir" >&5
1.12097 + # If the resource in the builddeps.conf file is an existing directory,
1.12098 + # for example /java/linux/cups
1.12099 + if test -d ${resource}; then
1.12100 + depdir=${resource}
1.12101 + else
1.12102 +
1.12103 + # alsa is for example mymodule
1.12104 + # $resource is for example libs/general/libmymod_1_2_3.zip
1.12105 + # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
1.12106 + # $with_builddeps_dir is for example /localhome/builddeps
1.12107 + # depdir is the name of the variable into which we store the depdir, eg MYMOD
1.12108 + # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
1.12109 + # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
1.12110 + filename=`basename $resource`
1.12111 + filebase=`echo $filename | sed 's/\.[^\.]*$//'`
1.12112 + filebase=${filename%%.*}
1.12113 + extension=${filename#*.}
1.12114 + installdir=$with_builddeps_dir/$filebase
1.12115 + if test ! -f $installdir/$filename.unpacked; then
1.12116 + { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency alsa from $with_builddeps_server/$resource and installing into $installdir" >&5
1.12117 $as_echo "$as_me: Downloading build dependency alsa from $with_builddeps_server/$resource and installing into $installdir" >&6;}
1.12118 - if test ! -d $installdir; then
1.12119 - mkdir -p $installdir
1.12120 - fi
1.12121 - if test ! -d $installdir; then
1.12122 - as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.12123 - fi
1.12124 - tmpfile=`mktemp $installdir/alsa.XXXXXXXXX`
1.12125 - touch $tmpfile
1.12126 - if test ! -f $tmpfile; then
1.12127 - as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.12128 - fi
1.12129 -
1.12130 - # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.12131 - # $tmpfile is the local file name for the downloaded file.
1.12132 - VALID_TOOL=no
1.12133 - if test "x$BDEPS_FTP" = xwget; then
1.12134 - VALID_TOOL=yes
1.12135 - wget -O $tmpfile $with_builddeps_server/$resource
1.12136 - fi
1.12137 - if test "x$BDEPS_FTP" = xlftp; then
1.12138 - VALID_TOOL=yes
1.12139 - lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.12140 - fi
1.12141 - if test "x$BDEPS_FTP" = xftp; then
1.12142 - VALID_TOOL=yes
1.12143 - FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.12144 - FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.12145 - FTPUSERPWD=${FTPSERVER%%@*}
1.12146 - if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.12147 - FTPUSER=${userpwd%%:*}
1.12148 - FTPPWD=${userpwd#*@}
1.12149 - FTPSERVER=${FTPSERVER#*@}
1.12150 - else
1.12151 - FTPUSER=ftp
1.12152 - FTPPWD=ftp
1.12153 - fi
1.12154 - # the "pass" command does not work on some
1.12155 - # ftp clients (read ftp.exe) but if it works,
1.12156 - # passive mode is better!
1.12157 - (\
1.12158 - echo "user $FTPUSER $FTPPWD" ;\
1.12159 - echo "pass" ;\
1.12160 - echo "bin" ;\
1.12161 - echo "get $FTPPATH $tmpfile" ;\
1.12162 - ) | ftp -in $FTPSERVER
1.12163 - fi
1.12164 - if test "x$VALID_TOOL" != xyes; then
1.12165 - as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.12166 - fi
1.12167 -
1.12168 - mv $tmpfile $installdir/$filename
1.12169 - if test ! -s $installdir/$filename; then
1.12170 - as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.12171 - fi
1.12172 - case "$extension" in
1.12173 - zip) echo "Unzipping $installdir/$filename..."
1.12174 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.12175 - ;;
1.12176 - tar.gz) echo "Untaring $installdir/$filename..."
1.12177 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.12178 - ;;
1.12179 - tgz) echo "Untaring $installdir/$filename..."
1.12180 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.12181 - ;;
1.12182 - *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.12183 - ;;
1.12184 - esac
1.12185 - fi
1.12186 - if test -f $installdir/$filename.unpacked; then
1.12187 - depdir=$installdir
1.12188 - fi
1.12189 -
1.12190 - fi
1.12191 - # Source the builddeps file again, because in the previous command, the depdir
1.12192 - # was updated to point at the current build dependency install directory.
1.12193 - . $builddepsfile
1.12194 - # Now extract variables from the builddeps.conf files.
1.12195 - theroot=${builddep_alsa_ROOT}
1.12196 - thecflags=${builddep_alsa_CFLAGS}
1.12197 - thelibs=${builddep_alsa_LIBS}
1.12198 - if test "x$depdir" = x; then
1.12199 - as_fn_error $? "Could not download build dependency alsa" "$LINENO" 5
1.12200 - fi
1.12201 - ALSA=$depdir
1.12202 - if test "x$theroot" != x; then
1.12203 - ALSA="$theroot"
1.12204 - fi
1.12205 - if test "x$thecflags" != x; then
1.12206 - ALSA_CFLAGS="$thecflags"
1.12207 - fi
1.12208 - if test "x$thelibs" != x; then
1.12209 - ALSA_LIBS="$thelibs"
1.12210 - fi
1.12211 - ALSA_FOUND=yes
1.12212 - else ALSA_FOUND=no
1.12213 -
1.12214 - fi
1.12215 - else ALSA_FOUND=no
1.12216 -
1.12217 - fi
1.12218 -
1.12219 - fi
1.12220 - if test "x$ALSA_FOUND" = xno; then
1.12221 + if test ! -d $installdir; then
1.12222 + mkdir -p $installdir
1.12223 + fi
1.12224 + if test ! -d $installdir; then
1.12225 + as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
1.12226 + fi
1.12227 + tmpfile=`mktemp $installdir/alsa.XXXXXXXXX`
1.12228 + touch $tmpfile
1.12229 + if test ! -f $tmpfile; then
1.12230 + as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
1.12231 + fi
1.12232 +
1.12233 + # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip
1.12234 + # $tmpfile is the local file name for the downloaded file.
1.12235 + VALID_TOOL=no
1.12236 + if test "x$BDEPS_FTP" = xwget; then
1.12237 + VALID_TOOL=yes
1.12238 + wget -O $tmpfile $with_builddeps_server/$resource
1.12239 + fi
1.12240 + if test "x$BDEPS_FTP" = xlftp; then
1.12241 + VALID_TOOL=yes
1.12242 + lftp -c "get $with_builddeps_server/$resource -o $tmpfile"
1.12243 + fi
1.12244 + if test "x$BDEPS_FTP" = xftp; then
1.12245 + VALID_TOOL=yes
1.12246 + FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'`
1.12247 + FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'`
1.12248 + FTPUSERPWD=${FTPSERVER%%@*}
1.12249 + if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
1.12250 + FTPUSER=${userpwd%%:*}
1.12251 + FTPPWD=${userpwd#*@}
1.12252 + FTPSERVER=${FTPSERVER#*@}
1.12253 + else
1.12254 + FTPUSER=ftp
1.12255 + FTPPWD=ftp
1.12256 + fi
1.12257 + # the "pass" command does not work on some
1.12258 + # ftp clients (read ftp.exe) but if it works,
1.12259 + # passive mode is better!
1.12260 + ( \
1.12261 + echo "user $FTPUSER $FTPPWD" ; \
1.12262 + echo "pass" ; \
1.12263 + echo "bin" ; \
1.12264 + echo "get $FTPPATH $tmpfile" ; \
1.12265 + ) | ftp -in $FTPSERVER
1.12266 + fi
1.12267 + if test "x$VALID_TOOL" != xyes; then
1.12268 + as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
1.12269 + fi
1.12270 +
1.12271 + mv $tmpfile $installdir/$filename
1.12272 + if test ! -s $installdir/$filename; then
1.12273 + as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
1.12274 + fi
1.12275 + case "$extension" in
1.12276 + zip) echo "Unzipping $installdir/$filename..."
1.12277 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
1.12278 + ;;
1.12279 + tar.gz) echo "Untaring $installdir/$filename..."
1.12280 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.12281 + ;;
1.12282 + tgz) echo "Untaring $installdir/$filename..."
1.12283 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.12284 + ;;
1.12285 + *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
1.12286 + ;;
1.12287 + esac
1.12288 + fi
1.12289 + if test -f $installdir/$filename.unpacked; then
1.12290 + depdir=$installdir
1.12291 + fi
1.12292 +
1.12293 + fi
1.12294 + # Source the builddeps file again, because in the previous command, the depdir
1.12295 + # was updated to point at the current build dependency install directory.
1.12296 + . $builddepsfile
1.12297 + # Now extract variables from the builddeps.conf files.
1.12298 + theroot=${builddep_alsa_ROOT}
1.12299 + thecflags=${builddep_alsa_CFLAGS}
1.12300 + thelibs=${builddep_alsa_LIBS}
1.12301 + if test "x$depdir" = x; then
1.12302 + as_fn_error $? "Could not download build dependency alsa" "$LINENO" 5
1.12303 + fi
1.12304 + ALSA=$depdir
1.12305 + if test "x$theroot" != x; then
1.12306 + ALSA="$theroot"
1.12307 + fi
1.12308 + if test "x$thecflags" != x; then
1.12309 + ALSA_CFLAGS="$thecflags"
1.12310 + fi
1.12311 + if test "x$thelibs" != x; then
1.12312 + ALSA_LIBS="$thelibs"
1.12313 + fi
1.12314 + ALSA_FOUND=yes
1.12315 + else ALSA_FOUND=no
1.12316 +
1.12317 + fi
1.12318 + else ALSA_FOUND=no
1.12319 +
1.12320 + fi
1.12321 +
1.12322 + fi
1.12323 + if test "x$ALSA_FOUND" = xno; then
1.12324
1.12325 pkg_failed=no
1.12326 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
1.12327 @@ -31739,69 +31735,70 @@
1.12328 $as_echo "yes" >&6; }
1.12329 ALSA_FOUND=yes
1.12330 fi
1.12331 - fi
1.12332 - if test "x$ALSA_FOUND" = xno; then
1.12333 - for ac_header in alsa/asoundlib.h
1.12334 + fi
1.12335 + if test "x$ALSA_FOUND" = xno; then
1.12336 + for ac_header in alsa/asoundlib.h
1.12337 do :
1.12338 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
1.12339 if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
1.12340 cat >>confdefs.h <<_ACEOF
1.12341 #define HAVE_ALSA_ASOUNDLIB_H 1
1.12342 _ACEOF
1.12343 - ALSA_FOUND=yes
1.12344 - ALSA_CFLAGS=-Iignoreme
1.12345 - ALSA_LIBS=-lasound
1.12346 - DEFAULT_ALSA=yes
1.12347 +
1.12348 + ALSA_FOUND=yes
1.12349 + ALSA_CFLAGS=-Iignoreme
1.12350 + ALSA_LIBS=-lasound
1.12351 + DEFAULT_ALSA=yes
1.12352 +
1.12353 else
1.12354 ALSA_FOUND=no
1.12355 fi
1.12356
1.12357 done
1.12358
1.12359 - fi
1.12360 - if test "x$ALSA_FOUND" = xno; then
1.12361 -
1.12362 - # Print a helpful message on how to acquire the necessary build dependency.
1.12363 - # alsa is the help tag: freetyp2, cups, pulse, alsa etc
1.12364 - MISSING_DEPENDENCY=alsa
1.12365 - PKGHANDLER_COMMAND=
1.12366 -
1.12367 - case $PKGHANDLER in
1.12368 - apt-get)
1.12369 - apt_help $MISSING_DEPENDENCY ;;
1.12370 + fi
1.12371 + if test "x$ALSA_FOUND" = xno; then
1.12372 +
1.12373 + # Print a helpful message on how to acquire the necessary build dependency.
1.12374 + # alsa is the help tag: freetyp2, cups, pulse, alsa etc
1.12375 + MISSING_DEPENDENCY=alsa
1.12376 + PKGHANDLER_COMMAND=
1.12377 +
1.12378 + case $PKGHANDLER in
1.12379 + apt-get)
1.12380 + apt_help $MISSING_DEPENDENCY ;;
1.12381 yum)
1.12382 - yum_help $MISSING_DEPENDENCY ;;
1.12383 - port)
1.12384 - port_help $MISSING_DEPENDENCY ;;
1.12385 - pkgutil)
1.12386 - pkgutil_help $MISSING_DEPENDENCY ;;
1.12387 - pkgadd)
1.12388 - pkgadd_help $MISSING_DEPENDENCY ;;
1.12389 + yum_help $MISSING_DEPENDENCY ;;
1.12390 + port)
1.12391 + port_help $MISSING_DEPENDENCY ;;
1.12392 + pkgutil)
1.12393 + pkgutil_help $MISSING_DEPENDENCY ;;
1.12394 + pkgadd)
1.12395 + pkgadd_help $MISSING_DEPENDENCY ;;
1.12396 * )
1.12397 break ;;
1.12398 - esac
1.12399 -
1.12400 - if test "x$PKGHANDLER_COMMAND" != x; then
1.12401 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.12402 - fi
1.12403 -
1.12404 - as_fn_error $? "Could not find alsa! $HELP_MSG " "$LINENO" 5
1.12405 - fi
1.12406 -fi
1.12407 -
1.12408 -
1.12409 -
1.12410 -
1.12411 -
1.12412 -
1.12413 -
1.12414 -###############################################################################
1.12415 -#
1.12416 -# Check for the jpeg library
1.12417 -#
1.12418 -
1.12419 -USE_EXTERNAL_LIBJPEG=true
1.12420 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
1.12421 + esac
1.12422 +
1.12423 + if test "x$PKGHANDLER_COMMAND" != x; then
1.12424 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.12425 + fi
1.12426 +
1.12427 + as_fn_error $? "Could not find alsa! $HELP_MSG " "$LINENO" 5
1.12428 + fi
1.12429 + fi
1.12430 +
1.12431 +
1.12432 +
1.12433 +
1.12434 +
1.12435 +
1.12436 + ###############################################################################
1.12437 + #
1.12438 + # Check for the jpeg library
1.12439 + #
1.12440 +
1.12441 + USE_EXTERNAL_LIBJPEG=true
1.12442 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
1.12443 $as_echo_n "checking for main in -ljpeg... " >&6; }
1.12444 if ${ac_cv_lib_jpeg_main+:} false; then :
1.12445 $as_echo_n "(cached) " >&6
1.12446 @@ -31840,17 +31837,17 @@
1.12447
1.12448 else
1.12449 USE_EXTERNAL_LIBJPEG=false
1.12450 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use jpeg decoder bundled with the OpenJDK source" >&5
1.12451 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use jpeg decoder bundled with the OpenJDK source" >&5
1.12452 $as_echo "$as_me: Will use jpeg decoder bundled with the OpenJDK source" >&6;}
1.12453
1.12454 fi
1.12455
1.12456
1.12457
1.12458 -###############################################################################
1.12459 -#
1.12460 -# Check for the gif library
1.12461 -#
1.12462 + ###############################################################################
1.12463 + #
1.12464 + # Check for the gif library
1.12465 + #
1.12466
1.12467
1.12468 # Check whether --with-giflib was given.
1.12469 @@ -31860,25 +31857,25 @@
1.12470
1.12471
1.12472
1.12473 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for which giflib to use" >&5
1.12474 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which giflib to use" >&5
1.12475 $as_echo_n "checking for which giflib to use... " >&6; }
1.12476
1.12477 -# default is bundled
1.12478 -DEFAULT_GIFLIB=bundled
1.12479 -
1.12480 -#
1.12481 -# if user didn't specify, use DEFAULT_GIFLIB
1.12482 -#
1.12483 -if test "x${with_giflib}" = "x"; then
1.12484 + # default is bundled
1.12485 + DEFAULT_GIFLIB=bundled
1.12486 +
1.12487 + #
1.12488 + # if user didn't specify, use DEFAULT_GIFLIB
1.12489 + #
1.12490 + if test "x${with_giflib}" = "x"; then
1.12491 with_giflib=${DEFAULT_GIFLIB}
1.12492 -fi
1.12493 -
1.12494 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_giflib}" >&5
1.12495 + fi
1.12496 +
1.12497 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_giflib}" >&5
1.12498 $as_echo "${with_giflib}" >&6; }
1.12499
1.12500 -if test "x${with_giflib}" = "xbundled"; then
1.12501 + if test "x${with_giflib}" = "xbundled"; then
1.12502 USE_EXTERNAL_LIBGIF=false
1.12503 -elif test "x${with_giflib}" = "xsystem"; then
1.12504 + elif test "x${with_giflib}" = "xsystem"; then
1.12505 ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
1.12506 if test "x$ac_cv_header_gif_lib_h" = xyes; then :
1.12507
1.12508 @@ -31936,15 +31933,15 @@
1.12509
1.12510
1.12511 USE_EXTERNAL_LIBGIF=true
1.12512 -else
1.12513 + else
1.12514 as_fn_error $? "Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled'" "$LINENO" 5
1.12515 -fi
1.12516 -
1.12517 -
1.12518 -###############################################################################
1.12519 -#
1.12520 -# Check for the zlib library
1.12521 -#
1.12522 + fi
1.12523 +
1.12524 +
1.12525 + ###############################################################################
1.12526 + #
1.12527 + # Check for the zlib library
1.12528 + #
1.12529
1.12530
1.12531 # Check whether --with-zlib was given.
1.12532 @@ -31953,7 +31950,7 @@
1.12533 fi
1.12534
1.12535
1.12536 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
1.12537 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
1.12538 $as_echo_n "checking for compress in -lz... " >&6; }
1.12539 if ${ac_cv_lib_z_compress+:} false; then :
1.12540 $as_echo_n "(cached) " >&6
1.12541 @@ -31996,62 +31993,62 @@
1.12542 fi
1.12543
1.12544
1.12545 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for which zlib to use" >&5
1.12546 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which zlib to use" >&5
1.12547 $as_echo_n "checking for which zlib to use... " >&6; }
1.12548
1.12549 -DEFAULT_ZLIB=bundled
1.12550 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.12551 -#
1.12552 -# On macosx default is system...on others default is
1.12553 -#
1.12554 + DEFAULT_ZLIB=bundled
1.12555 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.12556 + #
1.12557 + # On macosx default is system...on others default is
1.12558 + #
1.12559 DEFAULT_ZLIB=system
1.12560 -fi
1.12561 -
1.12562 -if test "x${ZLIB_FOUND}" != "xyes"; then
1.12563 -#
1.12564 -# If we don't find any system...set default to bundled
1.12565 -#
1.12566 + fi
1.12567 +
1.12568 + if test "x${ZLIB_FOUND}" != "xyes"; then
1.12569 + #
1.12570 + # If we don't find any system...set default to bundled
1.12571 + #
1.12572 DEFAULT_ZLIB=bundled
1.12573 -fi
1.12574 -
1.12575 -#
1.12576 -# If user didn't specify, use DEFAULT_ZLIB
1.12577 -#
1.12578 -if test "x${with_zlib}" = "x"; then
1.12579 + fi
1.12580 +
1.12581 + #
1.12582 + # If user didn't specify, use DEFAULT_ZLIB
1.12583 + #
1.12584 + if test "x${with_zlib}" = "x"; then
1.12585 with_zlib=${DEFAULT_ZLIB}
1.12586 -fi
1.12587 -
1.12588 -if test "x${with_zlib}" = "xbundled"; then
1.12589 + fi
1.12590 +
1.12591 + if test "x${with_zlib}" = "xbundled"; then
1.12592 USE_EXTERNAL_LIBZ=false
1.12593 { $as_echo "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
1.12594 $as_echo "bundled" >&6; }
1.12595 -elif test "x${with_zlib}" = "xsystem"; then
1.12596 + elif test "x${with_zlib}" = "xsystem"; then
1.12597 if test "x${ZLIB_FOUND}" = "xyes"; then
1.12598 - USE_EXTERNAL_LIBZ=true
1.12599 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
1.12600 + USE_EXTERNAL_LIBZ=true
1.12601 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
1.12602 $as_echo "system" >&6; }
1.12603 else
1.12604 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: system not found" >&5
1.12605 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: system not found" >&5
1.12606 $as_echo "system not found" >&6; }
1.12607 - as_fn_error $? "--with-zlib=system specified, but no zlib found!" "$LINENO" 5
1.12608 - fi
1.12609 -else
1.12610 + as_fn_error $? "--with-zlib=system specified, but no zlib found!" "$LINENO" 5
1.12611 + fi
1.12612 + else
1.12613 as_fn_error $? "Invalid value for --with-zlib: ${with_zlib}, use 'system' or 'bundled'" "$LINENO" 5
1.12614 -fi
1.12615 -
1.12616 -
1.12617 -
1.12618 -###############################################################################
1.12619 -LIBZIP_CAN_USE_MMAP=true
1.12620 -
1.12621 -
1.12622 -
1.12623 -###############################################################################
1.12624 -#
1.12625 -# Check if altzone exists in time.h
1.12626 -#
1.12627 -
1.12628 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.12629 + fi
1.12630 +
1.12631 +
1.12632 +
1.12633 + ###############################################################################
1.12634 + LIBZIP_CAN_USE_MMAP=true
1.12635 +
1.12636 +
1.12637 +
1.12638 + ###############################################################################
1.12639 + #
1.12640 + # Check if altzone exists in time.h
1.12641 + #
1.12642 +
1.12643 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.12644 /* end confdefs.h. */
1.12645 #include <time.h>
1.12646 int
1.12647 @@ -32069,18 +32066,18 @@
1.12648 fi
1.12649 rm -f core conftest.err conftest.$ac_objext \
1.12650 conftest$ac_exeext conftest.$ac_ext
1.12651 -if test "x$has_altzone" = xyes; then
1.12652 + if test "x$has_altzone" = xyes; then
1.12653
1.12654 $as_echo "#define HAVE_ALTZONE 1" >>confdefs.h
1.12655
1.12656 -fi
1.12657 -
1.12658 -###############################################################################
1.12659 -#
1.12660 -# Check the maths library
1.12661 -#
1.12662 -
1.12663 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
1.12664 + fi
1.12665 +
1.12666 + ###############################################################################
1.12667 + #
1.12668 + # Check the maths library
1.12669 + #
1.12670 +
1.12671 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
1.12672 $as_echo_n "checking for cos in -lm... " >&6; }
1.12673 if ${ac_cv_lib_m_cos+:} false; then :
1.12674 $as_echo_n "(cached) " >&6
1.12675 @@ -32125,20 +32122,21 @@
1.12676
1.12677 else
1.12678
1.12679 - { $as_echo "$as_me:${as_lineno-$LINENO}: Maths library was not found" >&5
1.12680 + { $as_echo "$as_me:${as_lineno-$LINENO}: Maths library was not found" >&5
1.12681 $as_echo "$as_me: Maths library was not found" >&6;}
1.12682
1.12683 -fi
1.12684 -
1.12685 -
1.12686 -
1.12687 -###############################################################################
1.12688 -#
1.12689 -# Check for libdl.so
1.12690 -
1.12691 -save_LIBS="$LIBS"
1.12692 -LIBS=""
1.12693 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
1.12694 +
1.12695 +fi
1.12696 +
1.12697 +
1.12698 +
1.12699 + ###############################################################################
1.12700 + #
1.12701 + # Check for libdl.so
1.12702 +
1.12703 + save_LIBS="$LIBS"
1.12704 + LIBS=""
1.12705 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
1.12706 $as_echo_n "checking for dlopen in -ldl... " >&6; }
1.12707 if ${ac_cv_lib_dl_dlopen+:} false; then :
1.12708 $as_echo_n "(cached) " >&6
1.12709 @@ -32183,25 +32181,24 @@
1.12710
1.12711 fi
1.12712
1.12713 -LIBDL="$LIBS"
1.12714 -
1.12715 -LIBS="$save_LIBS"
1.12716 -
1.12717 -
1.12718 -
1.12719 -###############################################################################
1.12720 -#
1.12721 -# statically link libstdc++ before C++ ABI is stablized on Linux unless
1.12722 -# dynamic build is configured on command line.
1.12723 -#
1.12724 + LIBDL="$LIBS"
1.12725 +
1.12726 + LIBS="$save_LIBS"
1.12727 +
1.12728 +
1.12729 + ###############################################################################
1.12730 + #
1.12731 + # statically link libstdc++ before C++ ABI is stablized on Linux unless
1.12732 + # dynamic build is configured on command line.
1.12733 + #
1.12734
1.12735 # Check whether --with-stdc++lib was given.
1.12736 if test "${with_stdc__lib+set}" = set; then :
1.12737 withval=$with_stdc__lib;
1.12738 - if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \
1.12739 - && test "x$with_stdc__lib" != xdefault; then
1.12740 - as_fn_error $? "Bad parameter value --with-stdc++lib=$with_stdc__lib!" "$LINENO" 5
1.12741 - fi
1.12742 + if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \
1.12743 + && test "x$with_stdc__lib" != xdefault; then
1.12744 + as_fn_error $? "Bad parameter value --with-stdc++lib=$with_stdc__lib!" "$LINENO" 5
1.12745 + fi
1.12746
1.12747 else
1.12748 with_stdc__lib=default
1.12749 @@ -32209,7 +32206,7 @@
1.12750 fi
1.12751
1.12752
1.12753 -if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.12754 + if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.12755 # Test if -lstdc++ works.
1.12756 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dynamic link of stdc++ is possible" >&5
1.12757 $as_echo_n "checking if dynamic link of stdc++ is possible... " >&6; }
1.12758 @@ -32293,15 +32290,15 @@
1.12759 $as_echo "$has_static_libstdcxx" >&6; }
1.12760
1.12761 if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then
1.12762 - as_fn_error $? "Cannot link to stdc++, neither dynamically nor statically!" "$LINENO" 5
1.12763 + as_fn_error $? "Cannot link to stdc++, neither dynamically nor statically!" "$LINENO" 5
1.12764 fi
1.12765
1.12766 if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then
1.12767 - as_fn_error $? "Static linking of libstdc++ was not possible!" "$LINENO" 5
1.12768 + as_fn_error $? "Static linking of libstdc++ was not possible!" "$LINENO" 5
1.12769 fi
1.12770
1.12771 if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then
1.12772 - as_fn_error $? "Dynamic linking of libstdc++ was not possible!" "$LINENO" 5
1.12773 + as_fn_error $? "Dynamic linking of libstdc++ was not possible!" "$LINENO" 5
1.12774 fi
1.12775
1.12776 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libstdc++" >&5
1.12777 @@ -32309,22 +32306,22 @@
1.12778 # If dynamic was requested, it's available since it would fail above otherwise.
1.12779 # If dynamic wasn't requested, go with static unless it isn't available.
1.12780 if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
1.12781 - LIBCXX="$LIBCXX -lstdc++"
1.12782 - LDCXX="$CXX"
1.12783 - STATIC_CXX_SETTING="STATIC_CXX=false"
1.12784 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: dynamic" >&5
1.12785 + LIBCXX="$LIBCXX -lstdc++"
1.12786 + LDCXX="$CXX"
1.12787 + STATIC_CXX_SETTING="STATIC_CXX=false"
1.12788 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: dynamic" >&5
1.12789 $as_echo "dynamic" >&6; }
1.12790 else
1.12791 - LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
1.12792 - LDCXX="$CC"
1.12793 - STATIC_CXX_SETTING="STATIC_CXX=true"
1.12794 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
1.12795 + LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
1.12796 + LDCXX="$CC"
1.12797 + STATIC_CXX_SETTING="STATIC_CXX=true"
1.12798 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
1.12799 $as_echo "static" >&6; }
1.12800 fi
1.12801 -fi
1.12802 -
1.12803 -
1.12804 -if test "x$JVM_VARIANT_ZERO" = xtrue || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
1.12805 + fi
1.12806 +
1.12807 +
1.12808 + if test "x$JVM_VARIANT_ZERO" = xtrue || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
1.12809 # Figure out LIBFFI_CFLAGS and LIBFFI_LIBS
1.12810
1.12811 pkg_failed=no
1.12812 @@ -32413,9 +32410,9 @@
1.12813 :
1.12814 fi
1.12815
1.12816 -fi
1.12817 -
1.12818 -if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
1.12819 + fi
1.12820 +
1.12821 + if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
1.12822 # Extract the first word of "llvm-config", so it can be a program name with args.
1.12823 set dummy llvm-config; ac_word=$2
1.12824 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12825 @@ -32455,7 +32452,7 @@
1.12826
1.12827
1.12828 if test "x$LLVM_CONFIG" != xllvm-config; then
1.12829 - as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5
1.12830 + as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5
1.12831 fi
1.12832
1.12833 llvm_components="jit mcjit engine nativecodegen native"
1.12834 @@ -32496,30 +32493,29 @@
1.12835
1.12836
1.12837
1.12838 -fi
1.12839 -
1.12840 -# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
1.12841 -if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
1.12842 + fi
1.12843 +
1.12844 + # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
1.12845 + if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
1.12846 LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
1.12847 -fi
1.12848 -
1.12849 -# TODO better (platform agnostic) test
1.12850 -if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then
1.12851 + fi
1.12852 +
1.12853 + # TODO better (platform agnostic) test
1.12854 + if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then
1.12855 LIBCXX="-lstdc++"
1.12856 -fi
1.12857 -
1.12858 + fi
1.12859
1.12860
1.12861
1.12862
1.12863 # After we have toolchain and the paths to all libraries (needed by msys), we can compile the fixpath helper
1.12864
1.12865 -# When using cygwin or msys, we need a wrapper binary that renames
1.12866 -# /cygdrive/c/ arguments into c:/ arguments and peeks into
1.12867 -# @files and rewrites these too! This wrapper binary is
1.12868 -# called fixpath.
1.12869 -FIXPATH=
1.12870 -if test "x$OPENJDK_BUILD_OS" = xwindows; then
1.12871 + # When using cygwin or msys, we need a wrapper binary that renames
1.12872 + # /cygdrive/c/ arguments into c:/ arguments and peeks into
1.12873 + # @files and rewrites these too! This wrapper binary is
1.12874 + # called fixpath.
1.12875 + FIXPATH=
1.12876 + if test "x$OPENJDK_BUILD_OS" = xwindows; then
1.12877 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
1.12878 $as_echo_n "checking if fixpath can be created... " >&6; }
1.12879 FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
1.12880 @@ -32546,10 +32542,10 @@
1.12881 cd $CURDIR
1.12882
1.12883 if test ! -x $OUTPUT_ROOT/fixpath.exe; then
1.12884 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12885 -$as_echo "no" >&6; }
1.12886 - cat $OUTPUT_ROOT/fixpath1.log
1.12887 - as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
1.12888 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12889 +$as_echo "no" >&6; }
1.12890 + cat $OUTPUT_ROOT/fixpath1.log
1.12891 + as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
1.12892 fi
1.12893 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.12894 $as_echo "yes" >&6; }
1.12895 @@ -32559,15 +32555,15 @@
1.12896 $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
1.12897 cd $CURDIR
1.12898 if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
1.12899 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12900 -$as_echo "no" >&6; }
1.12901 - cat $OUTPUT_ROOT/fixpath2.log
1.12902 - as_fn_error $? "fixpath did not work!" "$LINENO" 5
1.12903 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12904 +$as_echo "no" >&6; }
1.12905 + cat $OUTPUT_ROOT/fixpath2.log
1.12906 + as_fn_error $? "fixpath did not work!" "$LINENO" 5
1.12907 fi
1.12908 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.12909 $as_echo "yes" >&6; }
1.12910 rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
1.12911 -fi
1.12912 + fi
1.12913
1.12914
1.12915
1.12916 @@ -32579,30 +32575,29 @@
1.12917 ###############################################################################
1.12918
1.12919
1.12920 -HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
1.12921 -
1.12922 -
1.12923 -# The name of the Service Agent jar.
1.12924 -SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
1.12925 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.12926 - SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.12927 -fi
1.12928 -
1.12929 -
1.12930 -
1.12931 -
1.12932 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
1.12933 + HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
1.12934 +
1.12935 +
1.12936 + # The name of the Service Agent jar.
1.12937 + SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
1.12938 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.12939 + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.12940 + fi
1.12941 +
1.12942 +
1.12943 +
1.12944 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
1.12945 $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
1.12946
1.12947 -if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
1.12948 - ENABLE_INTREE_EC=yes
1.12949 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.12950 + if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
1.12951 + ENABLE_INTREE_EC=yes
1.12952 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.12953 $as_echo "yes" >&6; }
1.12954 -else
1.12955 - ENABLE_INTREE_EC=no
1.12956 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12957 -$as_echo "no" >&6; }
1.12958 -fi
1.12959 + else
1.12960 + ENABLE_INTREE_EC=no
1.12961 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12962 +$as_echo "no" >&6; }
1.12963 + fi
1.12964
1.12965
1.12966
1.12967 @@ -32625,39 +32620,38 @@
1.12968 if test "x$with_num_cores" = x; then
1.12969 # The number of cores were not specified, try to probe them.
1.12970
1.12971 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of cores" >&5
1.12972 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of cores" >&5
1.12973 $as_echo_n "checking for number of cores... " >&6; }
1.12974 - NUM_CORES=1
1.12975 - FOUND_CORES=no
1.12976 -
1.12977 - if test -f /proc/cpuinfo; then
1.12978 - # Looks like a Linux (or cygwin) system
1.12979 - NUM_CORES=`cat /proc/cpuinfo | grep -c processor`
1.12980 - FOUND_CORES=yes
1.12981 - elif test -x /usr/sbin/psrinfo; then
1.12982 - # Looks like a Solaris system
1.12983 - NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line`
1.12984 - FOUND_CORES=yes
1.12985 - elif test -x /usr/sbin/system_profiler; then
1.12986 - # Looks like a MacOSX system
1.12987 - NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'`
1.12988 - FOUND_CORES=yes
1.12989 - elif test -n "$NUMBER_OF_PROCESSORS"; then
1.12990 - # On windows, look in the env
1.12991 - NUM_CORES=$NUMBER_OF_PROCESSORS
1.12992 - FOUND_CORES=yes
1.12993 - fi
1.12994 -
1.12995 - if test "x$FOUND_CORES" = xyes; then
1.12996 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NUM_CORES" >&5
1.12997 + NUM_CORES=1
1.12998 + FOUND_CORES=no
1.12999 +
1.13000 + if test -f /proc/cpuinfo; then
1.13001 + # Looks like a Linux (or cygwin) system
1.13002 + NUM_CORES=`cat /proc/cpuinfo | grep -c processor`
1.13003 + FOUND_CORES=yes
1.13004 + elif test -x /usr/sbin/psrinfo; then
1.13005 + # Looks like a Solaris system
1.13006 + NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line`
1.13007 + FOUND_CORES=yes
1.13008 + elif test -x /usr/sbin/system_profiler; then
1.13009 + # Looks like a MacOSX system
1.13010 + NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'`
1.13011 + FOUND_CORES=yes
1.13012 + elif test -n "$NUMBER_OF_PROCESSORS"; then
1.13013 + # On windows, look in the env
1.13014 + NUM_CORES=$NUMBER_OF_PROCESSORS
1.13015 + FOUND_CORES=yes
1.13016 + fi
1.13017 +
1.13018 + if test "x$FOUND_CORES" = xyes; then
1.13019 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NUM_CORES" >&5
1.13020 $as_echo "$NUM_CORES" >&6; }
1.13021 - else
1.13022 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect number of cores, defaulting to 1" >&5
1.13023 + else
1.13024 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect number of cores, defaulting to 1" >&5
1.13025 $as_echo "could not detect number of cores, defaulting to 1" >&6; }
1.13026 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This will disable all parallelism from build!" >&5
1.13027 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This will disable all parallelism from build!" >&5
1.13028 $as_echo "$as_me: WARNING: This will disable all parallelism from build!" >&2;}
1.13029 - fi
1.13030 -
1.13031 + fi
1.13032
1.13033 else
1.13034 NUM_CORES=$with_num_cores
1.13035 @@ -32675,42 +32669,42 @@
1.13036 if test "x$with_memory_size" = x; then
1.13037 # The memory size was not specified, try to probe it.
1.13038
1.13039 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for memory size" >&5
1.13040 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for memory size" >&5
1.13041 $as_echo_n "checking for memory size... " >&6; }
1.13042 - # Default to 1024 MB
1.13043 - MEMORY_SIZE=1024
1.13044 - FOUND_MEM=no
1.13045 -
1.13046 - if test -f /proc/meminfo; then
1.13047 - # Looks like a Linux (or cygwin) system
1.13048 - MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`
1.13049 - MEMORY_SIZE=`expr $MEMORY_SIZE / 1024`
1.13050 - FOUND_MEM=yes
1.13051 - elif test -x /usr/sbin/prtconf; then
1.13052 - # Looks like a Solaris system
1.13053 - MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print $3 }'`
1.13054 - FOUND_MEM=yes
1.13055 - elif test -x /usr/sbin/system_profiler; then
1.13056 - # Looks like a MacOSX system
1.13057 - MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'`
1.13058 - MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
1.13059 - FOUND_MEM=yes
1.13060 - elif test "x$OPENJDK_BUILD_OS" = xwindows; then
1.13061 - # Windows, but without cygwin
1.13062 - MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
1.13063 - MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
1.13064 - FOUND_MEM=yes
1.13065 - fi
1.13066 -
1.13067 - if test "x$FOUND_MEM" = xyes; then
1.13068 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMORY_SIZE MB" >&5
1.13069 + # Default to 1024 MB
1.13070 + MEMORY_SIZE=1024
1.13071 + FOUND_MEM=no
1.13072 +
1.13073 + if test -f /proc/meminfo; then
1.13074 + # Looks like a Linux (or cygwin) system
1.13075 + MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`
1.13076 + MEMORY_SIZE=`expr $MEMORY_SIZE / 1024`
1.13077 + FOUND_MEM=yes
1.13078 + elif test -x /usr/sbin/prtconf; then
1.13079 + # Looks like a Solaris system
1.13080 + MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print $3 }'`
1.13081 + FOUND_MEM=yes
1.13082 + elif test -x /usr/sbin/system_profiler; then
1.13083 + # Looks like a MacOSX system
1.13084 + MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'`
1.13085 + MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
1.13086 + FOUND_MEM=yes
1.13087 + elif test "x$OPENJDK_BUILD_OS" = xwindows; then
1.13088 + # Windows, but without cygwin
1.13089 + MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
1.13090 + MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
1.13091 + FOUND_MEM=yes
1.13092 + fi
1.13093 +
1.13094 + if test "x$FOUND_MEM" = xyes; then
1.13095 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMORY_SIZE MB" >&5
1.13096 $as_echo "$MEMORY_SIZE MB" >&6; }
1.13097 - else
1.13098 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect memory size, defaulting to 1024 MB" >&5
1.13099 + else
1.13100 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect memory size, defaulting to 1024 MB" >&5
1.13101 $as_echo "could not detect memory size, defaulting to 1024 MB" >&6; }
1.13102 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This might seriously impact build performance!" >&5
1.13103 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This might seriously impact build performance!" >&5
1.13104 $as_echo "$as_me: WARNING: This might seriously impact build performance!" >&2;}
1.13105 - fi
1.13106 + fi
1.13107
1.13108 else
1.13109 MEMORY_SIZE=$with_memory_size
1.13110 @@ -32766,224 +32760,223 @@
1.13111 fi
1.13112
1.13113
1.13114 -if test "x$with_sjavac_server_java" != x; then
1.13115 + if test "x$with_sjavac_server_java" != x; then
1.13116 SJAVAC_SERVER_JAVA="$with_sjavac_server_java"
1.13117 FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""`
1.13118 if test "x$FOUND_VERSION" = x; then
1.13119 - as_fn_error $? "Could not execute server java: $SJAVAC_SERVER_JAVA" "$LINENO" 5
1.13120 - fi
1.13121 -else
1.13122 + as_fn_error $? "Could not execute server java: $SJAVAC_SERVER_JAVA" "$LINENO" 5
1.13123 + fi
1.13124 + else
1.13125 SJAVAC_SERVER_JAVA=""
1.13126 # Hotspot specific options.
1.13127
1.13128 - $ECHO "Check if jvm arg is ok: -verbosegc" >&5
1.13129 - $ECHO "Command: $JAVA -verbosegc -version" >&5
1.13130 - OUTPUT=`$JAVA -verbosegc -version 2>&1`
1.13131 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13132 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13133 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13134 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -verbosegc"
1.13135 - JVM_ARG_OK=true
1.13136 - else
1.13137 - $ECHO "Arg failed:" >&5
1.13138 - $ECHO "$OUTPUT" >&5
1.13139 - JVM_ARG_OK=false
1.13140 - fi
1.13141 + $ECHO "Check if jvm arg is ok: -verbosegc" >&5
1.13142 + $ECHO "Command: $JAVA -verbosegc -version" >&5
1.13143 + OUTPUT=`$JAVA -verbosegc -version 2>&1`
1.13144 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13145 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13146 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13147 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -verbosegc"
1.13148 + JVM_ARG_OK=true
1.13149 + else
1.13150 + $ECHO "Arg failed:" >&5
1.13151 + $ECHO "$OUTPUT" >&5
1.13152 + JVM_ARG_OK=false
1.13153 + fi
1.13154
1.13155 # JRockit specific options.
1.13156
1.13157 - $ECHO "Check if jvm arg is ok: -Xverbose:gc" >&5
1.13158 - $ECHO "Command: $JAVA -Xverbose:gc -version" >&5
1.13159 - OUTPUT=`$JAVA -Xverbose:gc -version 2>&1`
1.13160 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13161 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13162 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13163 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xverbose:gc"
1.13164 - JVM_ARG_OK=true
1.13165 - else
1.13166 - $ECHO "Arg failed:" >&5
1.13167 - $ECHO "$OUTPUT" >&5
1.13168 - JVM_ARG_OK=false
1.13169 - fi
1.13170 + $ECHO "Check if jvm arg is ok: -Xverbose:gc" >&5
1.13171 + $ECHO "Command: $JAVA -Xverbose:gc -version" >&5
1.13172 + OUTPUT=`$JAVA -Xverbose:gc -version 2>&1`
1.13173 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13174 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13175 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13176 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xverbose:gc"
1.13177 + JVM_ARG_OK=true
1.13178 + else
1.13179 + $ECHO "Arg failed:" >&5
1.13180 + $ECHO "$OUTPUT" >&5
1.13181 + JVM_ARG_OK=false
1.13182 + fi
1.13183
1.13184 SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA"
1.13185 -fi
1.13186 -
1.13187 -
1.13188 -if test "$MEMORY_SIZE" -gt "2500"; then
1.13189 -
1.13190 - $ECHO "Check if jvm arg is ok: -d64" >&5
1.13191 - $ECHO "Command: $SJAVAC_SERVER_JAVA -d64 -version" >&5
1.13192 - OUTPUT=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1`
1.13193 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13194 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13195 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13196 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64"
1.13197 - JVM_ARG_OK=true
1.13198 - else
1.13199 - $ECHO "Arg failed:" >&5
1.13200 - $ECHO "$OUTPUT" >&5
1.13201 - JVM_ARG_OK=false
1.13202 - fi
1.13203 + fi
1.13204 +
1.13205 +
1.13206 + if test "$MEMORY_SIZE" -gt "2500"; then
1.13207 +
1.13208 + $ECHO "Check if jvm arg is ok: -d64" >&5
1.13209 + $ECHO "Command: $SJAVAC_SERVER_JAVA -d64 -version" >&5
1.13210 + OUTPUT=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1`
1.13211 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13212 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13213 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13214 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64"
1.13215 + JVM_ARG_OK=true
1.13216 + else
1.13217 + $ECHO "Arg failed:" >&5
1.13218 + $ECHO "$OUTPUT" >&5
1.13219 + JVM_ARG_OK=false
1.13220 + fi
1.13221
1.13222 if test "$JVM_ARG_OK" = true; then
1.13223 - JVM_64BIT=true
1.13224 - JVM_ARG_OK=false
1.13225 - fi
1.13226 - fi
1.13227 -
1.13228 -if test "$JVM_64BIT" = true; then
1.13229 + JVM_64BIT=true
1.13230 + JVM_ARG_OK=false
1.13231 + fi
1.13232 + fi
1.13233 +
1.13234 + if test "$JVM_64BIT" = true; then
1.13235 if test "$MEMORY_SIZE" -gt "17000"; then
1.13236
1.13237 - $ECHO "Check if jvm arg is ok: -Xms10G -Xmx10G" >&5
1.13238 - $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version" >&5
1.13239 - OUTPUT=`$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version 2>&1`
1.13240 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13241 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13242 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13243 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G"
1.13244 - JVM_ARG_OK=true
1.13245 - else
1.13246 - $ECHO "Arg failed:" >&5
1.13247 - $ECHO "$OUTPUT" >&5
1.13248 - JVM_ARG_OK=false
1.13249 - fi
1.13250 + $ECHO "Check if jvm arg is ok: -Xms10G -Xmx10G" >&5
1.13251 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version" >&5
1.13252 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version 2>&1`
1.13253 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13254 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13255 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13256 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G"
1.13257 + JVM_ARG_OK=true
1.13258 + else
1.13259 + $ECHO "Arg failed:" >&5
1.13260 + $ECHO "$OUTPUT" >&5
1.13261 + JVM_ARG_OK=false
1.13262 + fi
1.13263
1.13264 fi
1.13265 if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then
1.13266
1.13267 - $ECHO "Check if jvm arg is ok: -Xms6G -Xmx6G" >&5
1.13268 - $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version" >&5
1.13269 - OUTPUT=`$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version 2>&1`
1.13270 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13271 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13272 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13273 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G"
1.13274 - JVM_ARG_OK=true
1.13275 - else
1.13276 - $ECHO "Arg failed:" >&5
1.13277 - $ECHO "$OUTPUT" >&5
1.13278 - JVM_ARG_OK=false
1.13279 - fi
1.13280 + $ECHO "Check if jvm arg is ok: -Xms6G -Xmx6G" >&5
1.13281 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version" >&5
1.13282 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version 2>&1`
1.13283 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13284 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13285 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13286 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G"
1.13287 + JVM_ARG_OK=true
1.13288 + else
1.13289 + $ECHO "Arg failed:" >&5
1.13290 + $ECHO "$OUTPUT" >&5
1.13291 + JVM_ARG_OK=false
1.13292 + fi
1.13293
1.13294 fi
1.13295 if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then
1.13296
1.13297 - $ECHO "Check if jvm arg is ok: -Xms1G -Xmx3G" >&5
1.13298 - $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version" >&5
1.13299 - OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version 2>&1`
1.13300 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13301 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13302 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13303 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G"
1.13304 - JVM_ARG_OK=true
1.13305 - else
1.13306 - $ECHO "Arg failed:" >&5
1.13307 - $ECHO "$OUTPUT" >&5
1.13308 - JVM_ARG_OK=false
1.13309 - fi
1.13310 + $ECHO "Check if jvm arg is ok: -Xms1G -Xmx3G" >&5
1.13311 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version" >&5
1.13312 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version 2>&1`
1.13313 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13314 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13315 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13316 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G"
1.13317 + JVM_ARG_OK=true
1.13318 + else
1.13319 + $ECHO "Arg failed:" >&5
1.13320 + $ECHO "$OUTPUT" >&5
1.13321 + JVM_ARG_OK=false
1.13322 + fi
1.13323
1.13324 fi
1.13325 if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then
1.13326
1.13327 - $ECHO "Check if jvm arg is ok: -Xms1G -Xmx2500M" >&5
1.13328 - $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version" >&5
1.13329 - OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version 2>&1`
1.13330 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13331 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13332 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13333 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M"
1.13334 - JVM_ARG_OK=true
1.13335 - else
1.13336 - $ECHO "Arg failed:" >&5
1.13337 - $ECHO "$OUTPUT" >&5
1.13338 - JVM_ARG_OK=false
1.13339 - fi
1.13340 -
1.13341 - fi
1.13342 -fi
1.13343 -if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then
1.13344 -
1.13345 - $ECHO "Check if jvm arg is ok: -Xms1000M -Xmx1500M" >&5
1.13346 - $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version" >&5
1.13347 - OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version 2>&1`
1.13348 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13349 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13350 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13351 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M"
1.13352 - JVM_ARG_OK=true
1.13353 - else
1.13354 - $ECHO "Arg failed:" >&5
1.13355 - $ECHO "$OUTPUT" >&5
1.13356 - JVM_ARG_OK=false
1.13357 - fi
1.13358 -
1.13359 -fi
1.13360 -if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then
1.13361 -
1.13362 - $ECHO "Check if jvm arg is ok: -Xms400M -Xmx1100M" >&5
1.13363 - $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version" >&5
1.13364 - OUTPUT=`$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version 2>&1`
1.13365 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13366 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13367 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13368 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M"
1.13369 - JVM_ARG_OK=true
1.13370 - else
1.13371 - $ECHO "Arg failed:" >&5
1.13372 - $ECHO "$OUTPUT" >&5
1.13373 - JVM_ARG_OK=false
1.13374 - fi
1.13375 -
1.13376 -fi
1.13377 -if test "$JVM_ARG_OK" = false; then
1.13378 -
1.13379 - $ECHO "Check if jvm arg is ok: -Xms256M -Xmx512M" >&5
1.13380 - $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version" >&5
1.13381 - OUTPUT=`$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version 2>&1`
1.13382 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13383 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13384 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13385 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M"
1.13386 - JVM_ARG_OK=true
1.13387 - else
1.13388 - $ECHO "Arg failed:" >&5
1.13389 - $ECHO "$OUTPUT" >&5
1.13390 - JVM_ARG_OK=false
1.13391 - fi
1.13392 -
1.13393 -fi
1.13394 -
1.13395 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use sjavac" >&5
1.13396 + $ECHO "Check if jvm arg is ok: -Xms1G -Xmx2500M" >&5
1.13397 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version" >&5
1.13398 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version 2>&1`
1.13399 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13400 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13401 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13402 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M"
1.13403 + JVM_ARG_OK=true
1.13404 + else
1.13405 + $ECHO "Arg failed:" >&5
1.13406 + $ECHO "$OUTPUT" >&5
1.13407 + JVM_ARG_OK=false
1.13408 + fi
1.13409 +
1.13410 + fi
1.13411 + fi
1.13412 + if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then
1.13413 +
1.13414 + $ECHO "Check if jvm arg is ok: -Xms1000M -Xmx1500M" >&5
1.13415 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version" >&5
1.13416 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version 2>&1`
1.13417 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13418 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13419 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13420 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M"
1.13421 + JVM_ARG_OK=true
1.13422 + else
1.13423 + $ECHO "Arg failed:" >&5
1.13424 + $ECHO "$OUTPUT" >&5
1.13425 + JVM_ARG_OK=false
1.13426 + fi
1.13427 +
1.13428 + fi
1.13429 + if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then
1.13430 +
1.13431 + $ECHO "Check if jvm arg is ok: -Xms400M -Xmx1100M" >&5
1.13432 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version" >&5
1.13433 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version 2>&1`
1.13434 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13435 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13436 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13437 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M"
1.13438 + JVM_ARG_OK=true
1.13439 + else
1.13440 + $ECHO "Arg failed:" >&5
1.13441 + $ECHO "$OUTPUT" >&5
1.13442 + JVM_ARG_OK=false
1.13443 + fi
1.13444 +
1.13445 + fi
1.13446 + if test "$JVM_ARG_OK" = false; then
1.13447 +
1.13448 + $ECHO "Check if jvm arg is ok: -Xms256M -Xmx512M" >&5
1.13449 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version" >&5
1.13450 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version 2>&1`
1.13451 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.13452 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.13453 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.13454 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M"
1.13455 + JVM_ARG_OK=true
1.13456 + else
1.13457 + $ECHO "Arg failed:" >&5
1.13458 + $ECHO "$OUTPUT" >&5
1.13459 + JVM_ARG_OK=false
1.13460 + fi
1.13461 +
1.13462 + fi
1.13463 +
1.13464 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use sjavac" >&5
1.13465 $as_echo_n "checking whether to use sjavac... " >&6; }
1.13466 -# Check whether --enable-sjavac was given.
1.13467 + # Check whether --enable-sjavac was given.
1.13468 if test "${enable_sjavac+set}" = set; then :
1.13469 enableval=$enable_sjavac; ENABLE_SJAVAC="${enableval}"
1.13470 else
1.13471 ENABLE_SJAVAC='no'
1.13472 fi
1.13473
1.13474 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_SJAVAC" >&5
1.13475 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_SJAVAC" >&5
1.13476 $as_echo "$ENABLE_SJAVAC" >&6; }
1.13477
1.13478
1.13479 -if test "x$ENABLE_SJAVAC" = xyes; then
1.13480 + if test "x$ENABLE_SJAVAC" = xyes; then
1.13481 SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
1.13482 -else
1.13483 + else
1.13484 SJAVAC_SERVER_DIR=
1.13485 -fi
1.13486 -
1.13487 + fi
1.13488
1.13489
1.13490
1.13491 # Can the C/C++ compiler use precompiled headers?
1.13492
1.13493
1.13494 -###############################################################################
1.13495 -#
1.13496 -# Can the C/C++ compiler use precompiled headers?
1.13497 -#
1.13498 -# Check whether --enable-precompiled-headers was given.
1.13499 + ###############################################################################
1.13500 + #
1.13501 + # Can the C/C++ compiler use precompiled headers?
1.13502 + #
1.13503 + # Check whether --enable-precompiled-headers was given.
1.13504 if test "${enable_precompiled_headers+set}" = set; then :
1.13505 enableval=$enable_precompiled_headers; ENABLE_PRECOMPH=${enable_precompiled_headers}
1.13506 else
1.13507 @@ -32991,48 +32984,48 @@
1.13508 fi
1.13509
1.13510
1.13511 -USE_PRECOMPILED_HEADER=1
1.13512 -if test "x$ENABLE_PRECOMPH" = xno; then
1.13513 + USE_PRECOMPILED_HEADER=1
1.13514 + if test "x$ENABLE_PRECOMPH" = xno; then
1.13515 USE_PRECOMPILED_HEADER=0
1.13516 -fi
1.13517 -
1.13518 -if test "x$ENABLE_PRECOMPH" = xyes; then
1.13519 + fi
1.13520 +
1.13521 + if test "x$ENABLE_PRECOMPH" = xyes; then
1.13522 # Check that the compiler actually supports precomp headers.
1.13523 if test "x$GCC" = xyes; then
1.13524 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking that precompiled headers work" >&5
1.13525 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking that precompiled headers work" >&5
1.13526 $as_echo_n "checking that precompiled headers work... " >&6; }
1.13527 - echo "int alfa();" > conftest.h
1.13528 - $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&5 >&5
1.13529 - if test ! -f conftest.hpp.gch; then
1.13530 - USE_PRECOMPILED_HEADER=0
1.13531 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13532 -$as_echo "no" >&6; }
1.13533 - else
1.13534 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.13535 + echo "int alfa();" > conftest.h
1.13536 + $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&5 >&5
1.13537 + if test ! -f conftest.hpp.gch; then
1.13538 + USE_PRECOMPILED_HEADER=0
1.13539 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13540 +$as_echo "no" >&6; }
1.13541 + else
1.13542 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.13543 $as_echo "yes" >&6; }
1.13544 - fi
1.13545 - rm -f conftest.h conftest.hpp.gch
1.13546 - fi
1.13547 -fi
1.13548 + fi
1.13549 + rm -f conftest.h conftest.hpp.gch
1.13550 + fi
1.13551 + fi
1.13552
1.13553
1.13554
1.13555
1.13556 # Setup use of ccache, if available
1.13557
1.13558 - # Check whether --enable-ccache was given.
1.13559 + # Check whether --enable-ccache was given.
1.13560 if test "${enable_ccache+set}" = set; then :
1.13561 enableval=$enable_ccache; ENABLE_CCACHE=${enable_ccache}
1.13562 else
1.13563 ENABLE_CCACHE=yes
1.13564 fi
1.13565
1.13566 - if test "x$ENABLE_CCACHE" = xyes; then
1.13567 - OLD_PATH="$PATH"
1.13568 - if test "x$TOOLS_DIR" != x; then
1.13569 - PATH=$TOOLS_DIR:$PATH
1.13570 - fi
1.13571 - # Extract the first word of "ccache", so it can be a program name with args.
1.13572 + if test "x$ENABLE_CCACHE" = xyes; then
1.13573 + OLD_PATH="$PATH"
1.13574 + if test "x$TOOLS_DIR" != x; then
1.13575 + PATH=$TOOLS_DIR:$PATH
1.13576 + fi
1.13577 + # Extract the first word of "ccache", so it can be a program name with args.
1.13578 set dummy ccache; ac_word=$2
1.13579 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13580 $as_echo_n "checking for $ac_word... " >&6; }
1.13581 @@ -33072,14 +33065,14 @@
1.13582 fi
1.13583
1.13584
1.13585 - PATH="$OLD_PATH"
1.13586 - else
1.13587 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ccache" >&5
1.13588 + PATH="$OLD_PATH"
1.13589 + else
1.13590 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ccache" >&5
1.13591 $as_echo_n "checking for ccache... " >&6; }
1.13592 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5
1.13593 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5
1.13594 $as_echo "explicitly disabled" >&6; }
1.13595 - CCACHE=
1.13596 - fi
1.13597 + CCACHE=
1.13598 + fi
1.13599
1.13600
1.13601
1.13602 @@ -33089,33 +33082,33 @@
1.13603 fi
1.13604
1.13605
1.13606 - if test "x$with_ccache_dir" != x; then
1.13607 - # When using a non home ccache directory, assume the use is to share ccache files
1.13608 - # with other users. Thus change the umask.
1.13609 - SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
1.13610 - fi
1.13611 - CCACHE_FOUND=""
1.13612 - if test "x$CCACHE" != x; then
1.13613 -
1.13614 - if test "x$CCACHE" != x; then
1.13615 - CCACHE_FOUND="true"
1.13616 - # Only use ccache if it is 3.1.4 or later, which supports
1.13617 - # precompiled headers.
1.13618 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
1.13619 + if test "x$with_ccache_dir" != x; then
1.13620 + # When using a non home ccache directory, assume the use is to share ccache files
1.13621 + # with other users. Thus change the umask.
1.13622 + SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
1.13623 + fi
1.13624 + CCACHE_FOUND=""
1.13625 + if test "x$CCACHE" != x; then
1.13626 +
1.13627 + if test "x$CCACHE" != x; then
1.13628 + CCACHE_FOUND="true"
1.13629 + # Only use ccache if it is 3.1.4 or later, which supports
1.13630 + # precompiled headers.
1.13631 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
1.13632 $as_echo_n "checking if ccache supports precompiled headers... " >&6; }
1.13633 - HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
1.13634 - if test "x$HAS_GOOD_CCACHE" = x; then
1.13635 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
1.13636 + HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
1.13637 + if test "x$HAS_GOOD_CCACHE" = x; then
1.13638 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
1.13639 $as_echo "no, disabling ccache" >&6; }
1.13640 - CCACHE=
1.13641 - else
1.13642 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.13643 + CCACHE=
1.13644 + else
1.13645 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.13646 $as_echo "yes" >&6; }
1.13647 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C-compiler supports ccache precompiled headers" >&5
1.13648 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C-compiler supports ccache precompiled headers" >&5
1.13649 $as_echo_n "checking if C-compiler supports ccache precompiled headers... " >&6; }
1.13650 - PUSHED_FLAGS="$CXXFLAGS"
1.13651 - CXXFLAGS="-fpch-preprocess $CXXFLAGS"
1.13652 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.13653 + PUSHED_FLAGS="$CXXFLAGS"
1.13654 + CXXFLAGS="-fpch-preprocess $CXXFLAGS"
1.13655 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.13656 /* end confdefs.h. */
1.13657
1.13658 int
1.13659 @@ -33132,30 +33125,30 @@
1.13660 CC_KNOWS_CCACHE_TRICK=no
1.13661 fi
1.13662 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.13663 - CXXFLAGS="$PUSHED_FLAGS"
1.13664 - if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then
1.13665 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.13666 + CXXFLAGS="$PUSHED_FLAGS"
1.13667 + if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then
1.13668 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.13669 $as_echo "yes" >&6; }
1.13670 - else
1.13671 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccaching of precompiled headers" >&5
1.13672 + else
1.13673 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccaching of precompiled headers" >&5
1.13674 $as_echo "no, disabling ccaching of precompiled headers" >&6; }
1.13675 - CCACHE=
1.13676 - fi
1.13677 - fi
1.13678 - fi
1.13679 -
1.13680 - if test "x$CCACHE" != x; then
1.13681 - CCACHE_SLOPPINESS=time_macros
1.13682 - CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE"
1.13683 - CCACHE_FLAGS=-fpch-preprocess
1.13684 -
1.13685 - if test "x$SET_CCACHE_DIR" != x; then
1.13686 - mkdir -p $CCACHE_DIR > /dev/null 2>&1
1.13687 - chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1
1.13688 - fi
1.13689 - fi
1.13690 -
1.13691 - fi
1.13692 + CCACHE=
1.13693 + fi
1.13694 + fi
1.13695 + fi
1.13696 +
1.13697 + if test "x$CCACHE" != x; then
1.13698 + CCACHE_SLOPPINESS=time_macros
1.13699 + CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE"
1.13700 + CCACHE_FLAGS=-fpch-preprocess
1.13701 +
1.13702 + if test "x$SET_CCACHE_DIR" != x; then
1.13703 + mkdir -p $CCACHE_DIR > /dev/null 2>&1
1.13704 + chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1
1.13705 + fi
1.13706 + fi
1.13707 +
1.13708 + fi
1.13709
1.13710
1.13711 ###############################################################################
1.13712 @@ -33174,12 +33167,11 @@
1.13713 fi
1.13714
1.13715
1.13716 -
1.13717 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5
1.13718 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5
1.13719 $as_echo_n "checking if build directory is on local disk... " >&6; }
1.13720
1.13721 - # df -l lists only local disks; if the given directory is not found then
1.13722 - # a non-zero exit code is given
1.13723 + # df -l lists only local disks; if the given directory is not found then
1.13724 + # a non-zero exit code is given
1.13725 if test "x$DF" = x; then
1.13726 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.13727 # msys does not have df; use Windows "net use" instead.
1.13728 @@ -33201,30 +33193,29 @@
1.13729 fi
1.13730 fi
1.13731
1.13732 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_DIR_IS_LOCAL" >&5
1.13733 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_DIR_IS_LOCAL" >&5
1.13734 $as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; }
1.13735
1.13736
1.13737
1.13738 -# Check if the user has any old-style ALT_ variables set.
1.13739 -FOUND_ALT_VARIABLES=`env | grep ^ALT_`
1.13740 -
1.13741 -# Before generating output files, test if they exist. If they do, this is a reconfigure.
1.13742 -# Since we can't properly handle the dependencies for this, warn the user about the situation
1.13743 -if test -e $OUTPUT_ROOT/spec.gmk; then
1.13744 - IS_RECONFIGURE=yes
1.13745 -else
1.13746 - IS_RECONFIGURE=no
1.13747 -fi
1.13748 -
1.13749 -if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
1.13750 - HIDE_PERFORMANCE_HINTS=yes
1.13751 -else
1.13752 - HIDE_PERFORMANCE_HINTS=no
1.13753 - # Hide it the next time around...
1.13754 - $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
1.13755 -fi
1.13756 -
1.13757 + # Check if the user has any old-style ALT_ variables set.
1.13758 + FOUND_ALT_VARIABLES=`env | grep ^ALT_`
1.13759 +
1.13760 + # Before generating output files, test if they exist. If they do, this is a reconfigure.
1.13761 + # Since we can't properly handle the dependencies for this, warn the user about the situation
1.13762 + if test -e $OUTPUT_ROOT/spec.gmk; then
1.13763 + IS_RECONFIGURE=yes
1.13764 + else
1.13765 + IS_RECONFIGURE=no
1.13766 + fi
1.13767 +
1.13768 + if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
1.13769 + HIDE_PERFORMANCE_HINTS=yes
1.13770 + else
1.13771 + HIDE_PERFORMANCE_HINTS=no
1.13772 + # Hide it the next time around...
1.13773 + $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
1.13774 + fi
1.13775
1.13776
1.13777 # At the end, call the custom hook. (Dummy macro if no custom sources available)
1.13778 @@ -34525,115 +34516,115 @@
1.13779
1.13780 # Finally output some useful information to the user
1.13781
1.13782 -# Finally output some useful information to the user
1.13783 -
1.13784 -if test "x$CCACHE_FOUND" != x; then
1.13785 - if test "x$HAS_GOOD_CCACHE" = x; then
1.13786 - CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
1.13787 - CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
1.13788 - else
1.13789 - CCACHE_STATUS="installed and in use"
1.13790 - fi
1.13791 -else
1.13792 - if test "x$GCC" = xyes; then
1.13793 - CCACHE_STATUS="not installed (consider installing)"
1.13794 - CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
1.13795 - else
1.13796 - CCACHE_STATUS="not available for your system"
1.13797 - fi
1.13798 -fi
1.13799 -
1.13800 -printf "\n"
1.13801 -printf "====================================================\n"
1.13802 -printf "A new configuration has been successfully created in\n"
1.13803 -printf "$OUTPUT_ROOT\n"
1.13804 -if test "x$CONFIGURE_COMMAND_LINE" != x; then
1.13805 - printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
1.13806 -else
1.13807 - printf "using default settings.\n"
1.13808 -fi
1.13809 -
1.13810 -printf "\n"
1.13811 -printf "Configuration summary:\n"
1.13812 -printf "* Debug level: $DEBUG_LEVEL\n"
1.13813 -printf "* JDK variant: $JDK_VARIANT\n"
1.13814 -printf "* JVM variants: $with_jvm_variants\n"
1.13815 -printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
1.13816 -
1.13817 -printf "\n"
1.13818 -printf "Tools summary:\n"
1.13819 -if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
1.13820 - printf "* Environment: $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
1.13821 -fi
1.13822 -printf "* Boot JDK: $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
1.13823 -printf "* C Compiler: $CC_VENDOR version $CC_VERSION (at $CC)\n"
1.13824 -printf "* C++ Compiler: $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
1.13825 -
1.13826 -printf "\n"
1.13827 -printf "Build performance summary:\n"
1.13828 -printf "* Cores to use: $JOBS\n"
1.13829 -printf "* Memory limit: $MEMORY_SIZE MB\n"
1.13830 -printf "* ccache status: $CCACHE_STATUS\n"
1.13831 -printf "\n"
1.13832 -
1.13833 -if test "x$CCACHE_HELP_MSG" != x && test "x$HIDE_PERFORMANCE_HINTS" = "xno"; then
1.13834 - printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n"
1.13835 - printf "$CCACHE_HELP_MSG\n"
1.13836 -
1.13837 - # Print a helpful message on how to acquire the necessary build dependency.
1.13838 - # ccache is the help tag: freetyp2, cups, pulse, alsa etc
1.13839 - MISSING_DEPENDENCY=ccache
1.13840 - PKGHANDLER_COMMAND=
1.13841 -
1.13842 - case $PKGHANDLER in
1.13843 - apt-get)
1.13844 - apt_help $MISSING_DEPENDENCY ;;
1.13845 + # Finally output some useful information to the user
1.13846 +
1.13847 + if test "x$CCACHE_FOUND" != x; then
1.13848 + if test "x$HAS_GOOD_CCACHE" = x; then
1.13849 + CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
1.13850 + CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
1.13851 + else
1.13852 + CCACHE_STATUS="installed and in use"
1.13853 + fi
1.13854 + else
1.13855 + if test "x$GCC" = xyes; then
1.13856 + CCACHE_STATUS="not installed (consider installing)"
1.13857 + CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
1.13858 + else
1.13859 + CCACHE_STATUS="not available for your system"
1.13860 + fi
1.13861 + fi
1.13862 +
1.13863 + printf "\n"
1.13864 + printf "====================================================\n"
1.13865 + printf "A new configuration has been successfully created in\n"
1.13866 + printf "$OUTPUT_ROOT\n"
1.13867 + if test "x$CONFIGURE_COMMAND_LINE" != x; then
1.13868 + printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
1.13869 + else
1.13870 + printf "using default settings.\n"
1.13871 + fi
1.13872 +
1.13873 + printf "\n"
1.13874 + printf "Configuration summary:\n"
1.13875 + printf "* Debug level: $DEBUG_LEVEL\n"
1.13876 + printf "* JDK variant: $JDK_VARIANT\n"
1.13877 + printf "* JVM variants: $with_jvm_variants\n"
1.13878 + printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
1.13879 +
1.13880 + printf "\n"
1.13881 + printf "Tools summary:\n"
1.13882 + if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
1.13883 + printf "* Environment: $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
1.13884 + fi
1.13885 + printf "* Boot JDK: $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
1.13886 + printf "* C Compiler: $CC_VENDOR version $CC_VERSION (at $CC)\n"
1.13887 + printf "* C++ Compiler: $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
1.13888 +
1.13889 + printf "\n"
1.13890 + printf "Build performance summary:\n"
1.13891 + printf "* Cores to use: $JOBS\n"
1.13892 + printf "* Memory limit: $MEMORY_SIZE MB\n"
1.13893 + printf "* ccache status: $CCACHE_STATUS\n"
1.13894 + printf "\n"
1.13895 +
1.13896 + if test "x$CCACHE_HELP_MSG" != x && test "x$HIDE_PERFORMANCE_HINTS" = "xno"; then
1.13897 + printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n"
1.13898 + printf "$CCACHE_HELP_MSG\n"
1.13899 +
1.13900 + # Print a helpful message on how to acquire the necessary build dependency.
1.13901 + # ccache is the help tag: freetyp2, cups, pulse, alsa etc
1.13902 + MISSING_DEPENDENCY=ccache
1.13903 + PKGHANDLER_COMMAND=
1.13904 +
1.13905 + case $PKGHANDLER in
1.13906 + apt-get)
1.13907 + apt_help $MISSING_DEPENDENCY ;;
1.13908 yum)
1.13909 - yum_help $MISSING_DEPENDENCY ;;
1.13910 - port)
1.13911 - port_help $MISSING_DEPENDENCY ;;
1.13912 - pkgutil)
1.13913 - pkgutil_help $MISSING_DEPENDENCY ;;
1.13914 - pkgadd)
1.13915 - pkgadd_help $MISSING_DEPENDENCY ;;
1.13916 + yum_help $MISSING_DEPENDENCY ;;
1.13917 + port)
1.13918 + port_help $MISSING_DEPENDENCY ;;
1.13919 + pkgutil)
1.13920 + pkgutil_help $MISSING_DEPENDENCY ;;
1.13921 + pkgadd)
1.13922 + pkgadd_help $MISSING_DEPENDENCY ;;
1.13923 * )
1.13924 break ;;
1.13925 - esac
1.13926 -
1.13927 - if test "x$PKGHANDLER_COMMAND" != x; then
1.13928 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.13929 - fi
1.13930 -
1.13931 - printf "$HELP_MSG\n"
1.13932 - printf "\n"
1.13933 -fi
1.13934 -
1.13935 -if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xyes"; then
1.13936 - printf "NOTE: You have requested to build more than one version of the JVM, which\n"
1.13937 - printf "will result in longer build times.\n"
1.13938 - printf "\n"
1.13939 -fi
1.13940 -
1.13941 -if test "x$FOUND_ALT_VARIABLES" != "x"; then
1.13942 - printf "WARNING: You have old-style ALT_ environment variables set.\n"
1.13943 - printf "These are not respected, and will be ignored. It is recommended\n"
1.13944 - printf "that you clean your environment. The following variables are set:\n"
1.13945 - printf "$FOUND_ALT_VARIABLES\n"
1.13946 - printf "\n"
1.13947 -fi
1.13948 -
1.13949 -if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then
1.13950 - printf "WARNING: Your build output directory is not on a local disk.\n"
1.13951 - printf "This will severely degrade build performance!\n"
1.13952 - printf "It is recommended that you create an output directory on a local disk,\n"
1.13953 - printf "and run the configure script again from that directory.\n"
1.13954 - printf "\n"
1.13955 -fi
1.13956 -
1.13957 -if test "x$IS_RECONFIGURE" = "xyes"; then
1.13958 - printf "WARNING: The result of this configuration has overridden an older\n"
1.13959 - printf "configuration. You *should* run 'make clean' to make sure you get a\n"
1.13960 - printf "proper build. Failure to do so might result in strange build problems.\n"
1.13961 - printf "\n"
1.13962 -fi
1.13963 -
1.13964 + esac
1.13965 +
1.13966 + if test "x$PKGHANDLER_COMMAND" != x; then
1.13967 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.13968 + fi
1.13969 +
1.13970 + printf "$HELP_MSG\n"
1.13971 + printf "\n"
1.13972 + fi
1.13973 +
1.13974 + if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xyes"; then
1.13975 + printf "NOTE: You have requested to build more than one version of the JVM, which\n"
1.13976 + printf "will result in longer build times.\n"
1.13977 + printf "\n"
1.13978 + fi
1.13979 +
1.13980 + if test "x$FOUND_ALT_VARIABLES" != "x"; then
1.13981 + printf "WARNING: You have old-style ALT_ environment variables set.\n"
1.13982 + printf "These are not respected, and will be ignored. It is recommended\n"
1.13983 + printf "that you clean your environment. The following variables are set:\n"
1.13984 + printf "$FOUND_ALT_VARIABLES\n"
1.13985 + printf "\n"
1.13986 + fi
1.13987 +
1.13988 + if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then
1.13989 + printf "WARNING: Your build output directory is not on a local disk.\n"
1.13990 + printf "This will severely degrade build performance!\n"
1.13991 + printf "It is recommended that you create an output directory on a local disk,\n"
1.13992 + printf "and run the configure script again from that directory.\n"
1.13993 + printf "\n"
1.13994 + fi
1.13995 +
1.13996 + if test "x$IS_RECONFIGURE" = "xyes"; then
1.13997 + printf "WARNING: The result of this configuration has overridden an older\n"
1.13998 + printf "configuration. You *should* run 'make clean' to make sure you get a\n"
1.13999 + printf "proper build. Failure to do so might result in strange build problems.\n"
1.14000 + printf "\n"
1.14001 + fi
1.14002 +
