Thu, 17 Oct 2013 13:53:08 -0700
Merge
| common/makefiles/JavaCompilation.gmk | file | annotate | diff | comparison | revisions | |
| common/makefiles/RMICompilation.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Wed Oct 16 13:50:05 2013 +0200 1.2 +++ b/.hgtags Thu Oct 17 13:53:08 2013 -0700 1.3 @@ -233,3 +233,4 @@ 1.4 91f47e8da5c60de58ed195e9b57f3bf192a18f83 jdk8-b109 1.5 4faa09c7fe555de086dd9048d3c5cc92317d6f45 jdk8-b110 1.6 d086227bfc45d124f09b3bd72a07956b4073bf71 jdk8-b111 1.7 +547316ea137d83d9c63083a9b83db64198fe0c81 jdk8-b112
2.1 --- a/NewMakefile.gmk Wed Oct 16 13:50:05 2013 +0200 2.2 +++ b/NewMakefile.gmk Thu Oct 17 13:53:08 2013 -0700 2.3 @@ -37,16 +37,16 @@ 2.4 2.5 # Assume we have GNU make, but check version. 2.6 ifeq (,$(findstring 3.81,$(MAKE_VERSION))) 2.7 - ifeq (,$(findstring 3.82,$(MAKE_VERSION))) 2.8 - $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) 2.9 - endif 2.10 + ifeq (,$(findstring 3.82,$(MAKE_VERSION))) 2.11 + $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) 2.12 + endif 2.13 endif 2.14 2.15 # Locate this Makefile 2.16 ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 2.17 - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.18 + makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.19 else 2.20 - makefile_path:=$(lastword $(MAKEFILE_LIST)) 2.21 + makefile_path:=$(lastword $(MAKEFILE_LIST)) 2.22 endif 2.23 root_dir:=$(dir $(makefile_path)) 2.24 2.25 @@ -58,27 +58,27 @@ 2.26 2.27 # Now determine if we have zero, one or several configurations to build. 2.28 ifeq ($(SPEC),) 2.29 - # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. 2.30 + # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. 2.31 else 2.32 - ifeq ($(words $(SPEC)),1) 2.33 - # We are building a single configuration. This is the normal case. Execute the Main.gmk file. 2.34 - include $(root_dir)/common/makefiles/Main.gmk 2.35 - else 2.36 - # We are building multiple configurations. 2.37 - # First, find out the valid targets 2.38 - # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find 2.39 - # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. 2.40 - all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \ 2.41 - $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \ 2.42 - grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) 2.43 + ifeq ($(words $(SPEC)),1) 2.44 + # We are building a single configuration. This is the normal case. Execute the Main.gmk file. 2.45 + include $(root_dir)/common/makefiles/Main.gmk 2.46 + else 2.47 + # We are building multiple configurations. 2.48 + # First, find out the valid targets 2.49 + # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find 2.50 + # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. 2.51 + all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \ 2.52 + $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \ 2.53 + grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) 2.54 2.55 - $(all_phony_targets): 2.56 - @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \ 2.57 - $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true 2.58 + $(all_phony_targets): 2.59 + @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \ 2.60 + $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true 2.61 2.62 - .PHONY: $(all_phony_targets) 2.63 + .PHONY: $(all_phony_targets) 2.64 2.65 - endif 2.66 + endif 2.67 endif 2.68 2.69 # Include this after a potential spec file has been included so that the bundles target
3.1 --- a/common/autoconf/autogen.sh Wed Oct 16 13:50:05 2013 +0200 3.2 +++ b/common/autoconf/autogen.sh Thu Oct 17 13:53:08 2013 -0700 3.3 @@ -62,7 +62,7 @@ 3.4 # We have custom sources available; also generate configure script 3.5 # with custom hooks compiled in. 3.6 cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | \ 3.7 - sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh 3.8 + sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh 3.9 rm -rf autom4te.cache 3.10 else 3.11 echo No custom hook found: $custom_hook
4.1 --- a/common/autoconf/basics.m4 Wed Oct 16 13:50:05 2013 +0200 4.2 +++ b/common/autoconf/basics.m4 Thu Oct 17 13:53:08 2013 -0700 4.3 @@ -24,23 +24,23 @@ 4.4 # 4.5 4.6 # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3) 4.7 -# If so, then append $1 to $2\ 4.8 +# If so, then append $1 to $2 \ 4.9 # Also set JVM_ARG_OK to true/false depending on outcome. 4.10 AC_DEFUN([ADD_JVM_ARG_IF_OK], 4.11 [ 4.12 - $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD 4.13 - $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD 4.14 - OUTPUT=`$3 $1 -version 2>&1` 4.15 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 4.16 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 4.17 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 4.18 - $2="[$]$2 $1" 4.19 - JVM_ARG_OK=true 4.20 - else 4.21 - $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD 4.22 - $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD 4.23 - JVM_ARG_OK=false 4.24 - fi 4.25 + $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD 4.26 + $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD 4.27 + OUTPUT=`$3 $1 -version 2>&1` 4.28 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 4.29 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 4.30 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 4.31 + $2="[$]$2 $1" 4.32 + JVM_ARG_OK=true 4.33 + else 4.34 + $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD 4.35 + $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD 4.36 + JVM_ARG_OK=false 4.37 + fi 4.38 ]) 4.39 4.40 # Appends a string to a path variable, only adding the : when needed. 4.41 @@ -82,7 +82,7 @@ 4.42 AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.]) 4.43 fi 4.44 4.45 - $1="`cd "$path"; $THEPWDCMD -L`" 4.46 + $1="`cd "$path"; $THEPWDCMD -L`" 4.47 fi 4.48 ]) 4.49 4.50 @@ -129,78 +129,78 @@ 4.51 AC_MSG_NOTICE([Resolving $1 (as $path) failed, using $path directly.]) 4.52 new_path="$path" 4.53 fi 4.54 - 4.55 + 4.56 if test "x$new_path" = x; then 4.57 - AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) 4.58 - has_space=`$ECHO "$complete" | $GREP " "` 4.59 - if test "x$has_space" != x; then 4.60 - AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.]) 4.61 - fi 4.62 - AC_MSG_ERROR([Cannot locate the the path of $1]) 4.63 + AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) 4.64 + has_space=`$ECHO "$complete" | $GREP " "` 4.65 + if test "x$has_space" != x; then 4.66 + AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.]) 4.67 fi 4.68 + AC_MSG_ERROR([Cannot locate the the path of $1]) 4.69 + fi 4.70 fi 4.71 4.72 - # Now join together the path and the arguments once again 4.73 - if test "x$arguments" != xEOL; then 4.74 - new_complete="$new_path ${arguments% *}" 4.75 - else 4.76 - new_complete="$new_path" 4.77 - fi 4.78 + # Now join together the path and the arguments once again 4.79 + if test "x$arguments" != xEOL; then 4.80 + new_complete="$new_path ${arguments% *}" 4.81 + else 4.82 + new_complete="$new_path" 4.83 + fi 4.84 4.85 if test "x$complete" != "x$new_complete"; then 4.86 - $1="$new_complete" 4.87 - AC_MSG_NOTICE([Rewriting $1 to "$new_complete"]) 4.88 - fi 4.89 + $1="$new_complete" 4.90 + AC_MSG_NOTICE([Rewriting $1 to "$new_complete"]) 4.91 + fi 4.92 ]) 4.93 4.94 AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], 4.95 [ 4.96 - if test "x$OPENJDK_BUILD_OS" != xwindows; then 4.97 - # Follow a chain of symbolic links. Use readlink 4.98 - # where it exists, else fall back to horribly 4.99 - # complicated shell code. 4.100 - if test "x$READLINK_TESTED" != yes; then 4.101 - # On MacOSX there is a readlink tool with a different 4.102 - # purpose than the GNU readlink tool. Check the found readlink. 4.103 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 4.104 - if test "x$ISGNU" = x; then 4.105 - # A readlink that we do not know how to use. 4.106 - # Are there other non-GNU readlinks out there? 4.107 - READLINK_TESTED=yes 4.108 - READLINK= 4.109 - fi 4.110 + if test "x$OPENJDK_BUILD_OS" != xwindows; then 4.111 + # Follow a chain of symbolic links. Use readlink 4.112 + # where it exists, else fall back to horribly 4.113 + # complicated shell code. 4.114 + if test "x$READLINK_TESTED" != yes; then 4.115 + # On MacOSX there is a readlink tool with a different 4.116 + # purpose than the GNU readlink tool. Check the found readlink. 4.117 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 4.118 + if test "x$ISGNU" = x; then 4.119 + # A readlink that we do not know how to use. 4.120 + # Are there other non-GNU readlinks out there? 4.121 + READLINK_TESTED=yes 4.122 + READLINK= 4.123 + fi 4.124 + fi 4.125 + 4.126 + if test "x$READLINK" != x; then 4.127 + $1=`$READLINK -f [$]$1` 4.128 + else 4.129 + # Save the current directory for restoring afterwards 4.130 + STARTDIR=$PWD 4.131 + COUNTER=0 4.132 + sym_link_dir=`$DIRNAME [$]$1` 4.133 + sym_link_file=`$BASENAME [$]$1` 4.134 + cd $sym_link_dir 4.135 + # Use -P flag to resolve symlinks in directories. 4.136 + cd `$THEPWDCMD -P` 4.137 + sym_link_dir=`$THEPWDCMD -P` 4.138 + # Resolve file symlinks 4.139 + while test $COUNTER -lt 20; do 4.140 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 4.141 + if test "x$ISLINK" == x; then 4.142 + # This is not a symbolic link! We are done! 4.143 + break 4.144 fi 4.145 - 4.146 - if test "x$READLINK" != x; then 4.147 - $1=`$READLINK -f [$]$1` 4.148 - else 4.149 - # Save the current directory for restoring afterwards 4.150 - STARTDIR=$PWD 4.151 - COUNTER=0 4.152 - sym_link_dir=`$DIRNAME [$]$1` 4.153 - sym_link_file=`$BASENAME [$]$1` 4.154 - cd $sym_link_dir 4.155 - # Use -P flag to resolve symlinks in directories. 4.156 - cd `$THEPWDCMD -P` 4.157 - sym_link_dir=`$THEPWDCMD -P` 4.158 - # Resolve file symlinks 4.159 - while test $COUNTER -lt 20; do 4.160 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 4.161 - if test "x$ISLINK" == x; then 4.162 - # This is not a symbolic link! We are done! 4.163 - break 4.164 - fi 4.165 - # Again resolve directory symlinks since the target of the just found 4.166 - # link could be in a different directory 4.167 - cd `$DIRNAME $ISLINK` 4.168 - sym_link_dir=`$THEPWDCMD -P` 4.169 - sym_link_file=`$BASENAME $ISLINK` 4.170 - let COUNTER=COUNTER+1 4.171 - done 4.172 - cd $STARTDIR 4.173 - $1=$sym_link_dir/$sym_link_file 4.174 - fi 4.175 + # Again resolve directory symlinks since the target of the just found 4.176 + # link could be in a different directory 4.177 + cd `$DIRNAME $ISLINK` 4.178 + sym_link_dir=`$THEPWDCMD -P` 4.179 + sym_link_file=`$BASENAME $ISLINK` 4.180 + let COUNTER=COUNTER+1 4.181 + done 4.182 + cd $STARTDIR 4.183 + $1=$sym_link_dir/$sym_link_file 4.184 fi 4.185 + fi 4.186 ]) 4.187 4.188 # Register a --with argument but mark it as deprecated 4.189 @@ -214,12 +214,12 @@ 4.190 4.191 AC_DEFUN_ONCE([BASIC_INIT], 4.192 [ 4.193 -# Save the original command line. This is passed to us by the wrapper configure script. 4.194 -AC_SUBST(CONFIGURE_COMMAND_LINE) 4.195 -DATE_WHEN_CONFIGURED=`LANG=C date` 4.196 -AC_SUBST(DATE_WHEN_CONFIGURED) 4.197 -AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.]) 4.198 -AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.]) 4.199 + # Save the original command line. This is passed to us by the wrapper configure script. 4.200 + AC_SUBST(CONFIGURE_COMMAND_LINE) 4.201 + DATE_WHEN_CONFIGURED=`LANG=C date` 4.202 + AC_SUBST(DATE_WHEN_CONFIGURED) 4.203 + AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.]) 4.204 + AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.]) 4.205 ]) 4.206 4.207 # Test that variable $1 denoting a program is not empty. If empty, exit with an error. 4.208 @@ -227,15 +227,15 @@ 4.209 # $2: executable name to print in warning (optional) 4.210 AC_DEFUN([BASIC_CHECK_NONEMPTY], 4.211 [ 4.212 - if test "x[$]$1" = x; then 4.213 - if test "x$2" = x; then 4.214 - PROG_NAME=translit($1,A-Z,a-z) 4.215 - else 4.216 - PROG_NAME=$2 4.217 - fi 4.218 - AC_MSG_NOTICE([Could not find $PROG_NAME!]) 4.219 - AC_MSG_ERROR([Cannot continue]) 4.220 + if test "x[$]$1" = x; then 4.221 + if test "x$2" = x; then 4.222 + PROG_NAME=translit($1,A-Z,a-z) 4.223 + else 4.224 + PROG_NAME=$2 4.225 fi 4.226 + AC_MSG_NOTICE([Could not find $PROG_NAME!]) 4.227 + AC_MSG_ERROR([Cannot continue]) 4.228 + fi 4.229 ]) 4.230 4.231 # Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY. 4.232 @@ -244,8 +244,8 @@ 4.233 # $2: executable name to look for 4.234 AC_DEFUN([BASIC_REQUIRE_PROG], 4.235 [ 4.236 - AC_PATH_PROGS($1, $2) 4.237 - BASIC_CHECK_NONEMPTY($1, $2) 4.238 + AC_PATH_PROGS($1, $2) 4.239 + BASIC_CHECK_NONEMPTY($1, $2) 4.240 ]) 4.241 4.242 # Setup the most fundamental tools that relies on not much else to set up, 4.243 @@ -253,171 +253,171 @@ 4.244 AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS], 4.245 [ 4.246 4.247 -# Start with tools that do not need have cross compilation support 4.248 -# and can be expected to be found in the default PATH. These tools are 4.249 -# used by configure. Nor are these tools expected to be found in the 4.250 -# devkit from the builddeps server either, since they are 4.251 -# needed to download the devkit. 4.252 + # Start with tools that do not need have cross compilation support 4.253 + # and can be expected to be found in the default PATH. These tools are 4.254 + # used by configure. Nor are these tools expected to be found in the 4.255 + # devkit from the builddeps server either, since they are 4.256 + # needed to download the devkit. 4.257 4.258 -# First are all the simple required tools. 4.259 -BASIC_REQUIRE_PROG(BASENAME, basename) 4.260 -BASIC_REQUIRE_PROG(BASH, bash) 4.261 -BASIC_REQUIRE_PROG(CAT, cat) 4.262 -BASIC_REQUIRE_PROG(CHMOD, chmod) 4.263 -BASIC_REQUIRE_PROG(CMP, cmp) 4.264 -BASIC_REQUIRE_PROG(COMM, comm) 4.265 -BASIC_REQUIRE_PROG(CP, cp) 4.266 -BASIC_REQUIRE_PROG(CPIO, cpio) 4.267 -BASIC_REQUIRE_PROG(CUT, cut) 4.268 -BASIC_REQUIRE_PROG(DATE, date) 4.269 -BASIC_REQUIRE_PROG(DIFF, [gdiff diff]) 4.270 -BASIC_REQUIRE_PROG(DIRNAME, dirname) 4.271 -BASIC_REQUIRE_PROG(ECHO, echo) 4.272 -BASIC_REQUIRE_PROG(EXPR, expr) 4.273 -BASIC_REQUIRE_PROG(FILE, file) 4.274 -BASIC_REQUIRE_PROG(FIND, find) 4.275 -BASIC_REQUIRE_PROG(HEAD, head) 4.276 -BASIC_REQUIRE_PROG(LN, ln) 4.277 -BASIC_REQUIRE_PROG(LS, ls) 4.278 -BASIC_REQUIRE_PROG(MKDIR, mkdir) 4.279 -BASIC_REQUIRE_PROG(MKTEMP, mktemp) 4.280 -BASIC_REQUIRE_PROG(MV, mv) 4.281 -BASIC_REQUIRE_PROG(PRINTF, printf) 4.282 -BASIC_REQUIRE_PROG(RM, rm) 4.283 -BASIC_REQUIRE_PROG(SH, sh) 4.284 -BASIC_REQUIRE_PROG(SORT, sort) 4.285 -BASIC_REQUIRE_PROG(TAIL, tail) 4.286 -BASIC_REQUIRE_PROG(TAR, tar) 4.287 -BASIC_REQUIRE_PROG(TEE, tee) 4.288 -BASIC_REQUIRE_PROG(TOUCH, touch) 4.289 -BASIC_REQUIRE_PROG(TR, tr) 4.290 -BASIC_REQUIRE_PROG(UNAME, uname) 4.291 -BASIC_REQUIRE_PROG(UNIQ, uniq) 4.292 -BASIC_REQUIRE_PROG(WC, wc) 4.293 -BASIC_REQUIRE_PROG(WHICH, which) 4.294 -BASIC_REQUIRE_PROG(XARGS, xargs) 4.295 + # First are all the simple required tools. 4.296 + BASIC_REQUIRE_PROG(BASENAME, basename) 4.297 + BASIC_REQUIRE_PROG(BASH, bash) 4.298 + BASIC_REQUIRE_PROG(CAT, cat) 4.299 + BASIC_REQUIRE_PROG(CHMOD, chmod) 4.300 + BASIC_REQUIRE_PROG(CMP, cmp) 4.301 + BASIC_REQUIRE_PROG(COMM, comm) 4.302 + BASIC_REQUIRE_PROG(CP, cp) 4.303 + BASIC_REQUIRE_PROG(CPIO, cpio) 4.304 + BASIC_REQUIRE_PROG(CUT, cut) 4.305 + BASIC_REQUIRE_PROG(DATE, date) 4.306 + BASIC_REQUIRE_PROG(DIFF, [gdiff diff]) 4.307 + BASIC_REQUIRE_PROG(DIRNAME, dirname) 4.308 + BASIC_REQUIRE_PROG(ECHO, echo) 4.309 + BASIC_REQUIRE_PROG(EXPR, expr) 4.310 + BASIC_REQUIRE_PROG(FILE, file) 4.311 + BASIC_REQUIRE_PROG(FIND, find) 4.312 + BASIC_REQUIRE_PROG(HEAD, head) 4.313 + BASIC_REQUIRE_PROG(LN, ln) 4.314 + BASIC_REQUIRE_PROG(LS, ls) 4.315 + BASIC_REQUIRE_PROG(MKDIR, mkdir) 4.316 + BASIC_REQUIRE_PROG(MKTEMP, mktemp) 4.317 + BASIC_REQUIRE_PROG(MV, mv) 4.318 + BASIC_REQUIRE_PROG(PRINTF, printf) 4.319 + BASIC_REQUIRE_PROG(RM, rm) 4.320 + BASIC_REQUIRE_PROG(SH, sh) 4.321 + BASIC_REQUIRE_PROG(SORT, sort) 4.322 + BASIC_REQUIRE_PROG(TAIL, tail) 4.323 + BASIC_REQUIRE_PROG(TAR, tar) 4.324 + BASIC_REQUIRE_PROG(TEE, tee) 4.325 + BASIC_REQUIRE_PROG(TOUCH, touch) 4.326 + BASIC_REQUIRE_PROG(TR, tr) 4.327 + BASIC_REQUIRE_PROG(UNAME, uname) 4.328 + BASIC_REQUIRE_PROG(UNIQ, uniq) 4.329 + BASIC_REQUIRE_PROG(WC, wc) 4.330 + BASIC_REQUIRE_PROG(WHICH, which) 4.331 + BASIC_REQUIRE_PROG(XARGS, xargs) 4.332 4.333 -# Then required tools that require some special treatment. 4.334 -AC_PROG_AWK 4.335 -BASIC_CHECK_NONEMPTY(AWK) 4.336 -AC_PROG_GREP 4.337 -BASIC_CHECK_NONEMPTY(GREP) 4.338 -AC_PROG_EGREP 4.339 -BASIC_CHECK_NONEMPTY(EGREP) 4.340 -AC_PROG_FGREP 4.341 -BASIC_CHECK_NONEMPTY(FGREP) 4.342 -AC_PROG_SED 4.343 -BASIC_CHECK_NONEMPTY(SED) 4.344 + # Then required tools that require some special treatment. 4.345 + AC_PROG_AWK 4.346 + BASIC_CHECK_NONEMPTY(AWK) 4.347 + AC_PROG_GREP 4.348 + BASIC_CHECK_NONEMPTY(GREP) 4.349 + AC_PROG_EGREP 4.350 + BASIC_CHECK_NONEMPTY(EGREP) 4.351 + AC_PROG_FGREP 4.352 + BASIC_CHECK_NONEMPTY(FGREP) 4.353 + AC_PROG_SED 4.354 + BASIC_CHECK_NONEMPTY(SED) 4.355 4.356 -AC_PATH_PROGS(NAWK, [nawk gawk awk]) 4.357 -BASIC_CHECK_NONEMPTY(NAWK) 4.358 + AC_PATH_PROGS(NAWK, [nawk gawk awk]) 4.359 + BASIC_CHECK_NONEMPTY(NAWK) 4.360 4.361 -# Always force rm. 4.362 -RM="$RM -f" 4.363 + # Always force rm. 4.364 + RM="$RM -f" 4.365 4.366 -# pwd behaves differently on various platforms and some don't support the -L flag. 4.367 -# Always use the bash builtin pwd to get uniform behavior. 4.368 -THEPWDCMD=pwd 4.369 + # pwd behaves differently on various platforms and some don't support the -L flag. 4.370 + # Always use the bash builtin pwd to get uniform behavior. 4.371 + THEPWDCMD=pwd 4.372 4.373 -# These are not required on all platforms 4.374 -AC_PATH_PROG(CYGPATH, cygpath) 4.375 -AC_PATH_PROG(READLINK, readlink) 4.376 -AC_PATH_PROG(DF, df) 4.377 -AC_PATH_PROG(SETFILE, SetFile) 4.378 + # These are not required on all platforms 4.379 + AC_PATH_PROG(CYGPATH, cygpath) 4.380 + AC_PATH_PROG(READLINK, readlink) 4.381 + AC_PATH_PROG(DF, df) 4.382 + AC_PATH_PROG(SETFILE, SetFile) 4.383 ]) 4.384 4.385 # Setup basic configuration paths, and platform-specific stuff related to PATHs. 4.386 AC_DEFUN_ONCE([BASIC_SETUP_PATHS], 4.387 [ 4.388 -# Locate the directory of this script. 4.389 -SCRIPT="[$]0" 4.390 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L` 4.391 + # Locate the directory of this script. 4.392 + SCRIPT="[$]0" 4.393 + AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L` 4.394 4.395 -# Where is the source? It is located two levels above the configure script. 4.396 -CURDIR="$PWD" 4.397 -cd "$AUTOCONF_DIR/../.." 4.398 -SRC_ROOT="`$THEPWDCMD -L`" 4.399 + # Where is the source? It is located two levels above the configure script. 4.400 + CURDIR="$PWD" 4.401 + cd "$AUTOCONF_DIR/../.." 4.402 + SRC_ROOT="`$THEPWDCMD -L`" 4.403 4.404 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 4.405 - PATH_SEP=";" 4.406 - BASIC_CHECK_PATHS_WINDOWS 4.407 -else 4.408 - PATH_SEP=":" 4.409 -fi 4.410 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 4.411 + PATH_SEP=";" 4.412 + BASIC_CHECK_PATHS_WINDOWS 4.413 + else 4.414 + PATH_SEP=":" 4.415 + fi 4.416 4.417 -AC_SUBST(SRC_ROOT) 4.418 -AC_SUBST(PATH_SEP) 4.419 -cd "$CURDIR" 4.420 + AC_SUBST(SRC_ROOT) 4.421 + AC_SUBST(PATH_SEP) 4.422 + cd "$CURDIR" 4.423 4.424 -BASIC_FIXUP_PATH(SRC_ROOT) 4.425 -BASIC_FIXUP_PATH(CURDIR) 4.426 + BASIC_FIXUP_PATH(SRC_ROOT) 4.427 + BASIC_FIXUP_PATH(CURDIR) 4.428 4.429 -if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then 4.430 + if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then 4.431 # Add extra search paths on solaris for utilities like ar and as etc... 4.432 PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin" 4.433 -fi 4.434 + fi 4.435 4.436 -# You can force the sys-root if the sys-root encoded into the cross compiler tools 4.437 -# is not correct. 4.438 -AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root], 4.439 - [pass this sys-root to the compilers and tools (for cross-compiling)])]) 4.440 + # You can force the sys-root if the sys-root encoded into the cross compiler tools 4.441 + # is not correct. 4.442 + AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root], 4.443 + [pass this sys-root to the compilers and tools (for cross-compiling)])]) 4.444 4.445 -if test "x$with_sys_root" != x; then 4.446 - SYS_ROOT=$with_sys_root 4.447 -else 4.448 - SYS_ROOT=/ 4.449 -fi 4.450 -AC_SUBST(SYS_ROOT) 4.451 + if test "x$with_sys_root" != x; then 4.452 + SYS_ROOT=$with_sys_root 4.453 + else 4.454 + SYS_ROOT=/ 4.455 + fi 4.456 + AC_SUBST(SYS_ROOT) 4.457 4.458 -AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir], 4.459 - [search this directory for compilers and tools (for cross-compiling)])], 4.460 - [TOOLS_DIR=$with_tools_dir] 4.461 -) 4.462 + AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir], 4.463 + [search this directory for compilers and tools (for cross-compiling)])], 4.464 + [TOOLS_DIR=$with_tools_dir] 4.465 + ) 4.466 4.467 -AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit], 4.468 - [use this directory as base for tools-dir and sys-root (for cross-compiling)])], 4.469 - [ 4.470 - if test "x$with_sys_root" != x; then 4.471 - AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time]) 4.472 - fi 4.473 - BASIC_FIXUP_PATH([with_devkit]) 4.474 - BASIC_APPEND_TO_PATH([TOOLS_DIR],$with_devkit/bin) 4.475 - if test -d "$with_devkit/$host_alias/libc"; then 4.476 - SYS_ROOT=$with_devkit/$host_alias/libc 4.477 - elif test -d "$with_devkit/$host/sys-root"; then 4.478 - SYS_ROOT=$with_devkit/$host/sys-root 4.479 - fi 4.480 - ]) 4.481 + AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit], 4.482 + [use this directory as base for tools-dir and sys-root (for cross-compiling)])], 4.483 + [ 4.484 + if test "x$with_sys_root" != x; then 4.485 + AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time]) 4.486 + fi 4.487 + BASIC_FIXUP_PATH([with_devkit]) 4.488 + BASIC_APPEND_TO_PATH([TOOLS_DIR],$with_devkit/bin) 4.489 + if test -d "$with_devkit/$host_alias/libc"; then 4.490 + SYS_ROOT=$with_devkit/$host_alias/libc 4.491 + elif test -d "$with_devkit/$host/sys-root"; then 4.492 + SYS_ROOT=$with_devkit/$host/sys-root 4.493 + fi 4.494 + ]) 4.495 ]) 4.496 4.497 AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], 4.498 [ 4.499 4.500 -AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name], 4.501 - [use this as the name of the configuration @<:@generated from important configuration options@:>@])], 4.502 - [ CONF_NAME=${with_conf_name} ]) 4.503 + AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name], 4.504 + [use this as the name of the configuration @<:@generated from important configuration options@:>@])], 4.505 + [ CONF_NAME=${with_conf_name} ]) 4.506 4.507 -# Test from where we are running configure, in or outside of src root. 4.508 -if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ 4.509 - || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ 4.510 - || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 4.511 + # Test from where we are running configure, in or outside of src root. 4.512 + if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ 4.513 + || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ 4.514 + || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 4.515 # We are running configure from the src root. 4.516 # Create a default ./build/target-variant-debuglevel output root. 4.517 if test "x${CONF_NAME}" = x; then 4.518 - CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" 4.519 + CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" 4.520 fi 4.521 OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" 4.522 $MKDIR -p "$OUTPUT_ROOT" 4.523 if test ! -d "$OUTPUT_ROOT"; then 4.524 - AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT]) 4.525 + AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT]) 4.526 fi 4.527 -else 4.528 + else 4.529 # We are running configure from outside of the src dir. 4.530 # Then use the current directory as output dir! 4.531 # If configuration is situated in normal build directory, just use the build 4.532 # directory name as configuration name, otherwise use the complete path. 4.533 if test "x${CONF_NAME}" = x; then 4.534 - CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"` 4.535 + CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"` 4.536 fi 4.537 OUTPUT_ROOT="$CURDIR" 4.538 4.539 @@ -428,10 +428,10 @@ 4.540 # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for 4.541 # other files 4.542 files_present=`$LS $OUTPUT_ROOT` 4.543 - # Configure has already touched config.log and confdefs.h in the current dir when this check 4.544 + # Configure has already touched config.log and confdefs.h in the current dir when this check 4.545 # is performed. 4.546 filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \ 4.547 - | $TR -d '\n'` 4.548 + | $TR -d '\n'` 4.549 if test "x$filtered_files" != x; then 4.550 AC_MSG_NOTICE([Current directory is $CURDIR.]) 4.551 AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here]) 4.552 @@ -443,46 +443,46 @@ 4.553 AC_MSG_ERROR([Will not continue creating configuration in $CURDIR]) 4.554 fi 4.555 fi 4.556 -fi 4.557 -AC_MSG_CHECKING([what configuration name to use]) 4.558 -AC_MSG_RESULT([$CONF_NAME]) 4.559 + fi 4.560 + AC_MSG_CHECKING([what configuration name to use]) 4.561 + AC_MSG_RESULT([$CONF_NAME]) 4.562 4.563 -BASIC_FIXUP_PATH(OUTPUT_ROOT) 4.564 + BASIC_FIXUP_PATH(OUTPUT_ROOT) 4.565 4.566 -AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk) 4.567 -AC_SUBST(CONF_NAME, $CONF_NAME) 4.568 -AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) 4.569 + AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk) 4.570 + AC_SUBST(CONF_NAME, $CONF_NAME) 4.571 + AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) 4.572 4.573 -# Most of the probed defines are put into config.h 4.574 -AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in]) 4.575 -# The spec.gmk file contains all variables for the make system. 4.576 -AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) 4.577 -# The hotspot-spec.gmk file contains legacy variables for the hotspot make system. 4.578 -AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in]) 4.579 -# The bootcycle-spec.gmk file contains support for boot cycle builds. 4.580 -AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in]) 4.581 -# The compare.sh is used to compare the build output to other builds. 4.582 -AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in]) 4.583 -# Spec.sh is currently used by compare-objects.sh 4.584 -AC_CONFIG_FILES([$OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in]) 4.585 -# The generated Makefile knows where the spec.gmk is and where the source is. 4.586 -# You can run make from the OUTPUT_ROOT, or from the top-level Makefile 4.587 -# which will look for generated configurations 4.588 -AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) 4.589 + # Most of the probed defines are put into config.h 4.590 + AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in]) 4.591 + # The spec.gmk file contains all variables for the make system. 4.592 + AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) 4.593 + # The hotspot-spec.gmk file contains legacy variables for the hotspot make system. 4.594 + AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in]) 4.595 + # The bootcycle-spec.gmk file contains support for boot cycle builds. 4.596 + AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in]) 4.597 + # The compare.sh is used to compare the build output to other builds. 4.598 + AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in]) 4.599 + # Spec.sh is currently used by compare-objects.sh 4.600 + AC_CONFIG_FILES([$OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in]) 4.601 + # The generated Makefile knows where the spec.gmk is and where the source is. 4.602 + # You can run make from the OUTPUT_ROOT, or from the top-level Makefile 4.603 + # which will look for generated configurations 4.604 + AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) 4.605 4.606 -# Save the arguments given to us 4.607 -echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments 4.608 + # Save the arguments given to us 4.609 + echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments 4.610 ]) 4.611 4.612 AC_DEFUN_ONCE([BASIC_SETUP_LOGGING], 4.613 [ 4.614 -# Setup default logging of stdout and stderr to build.log in the output root. 4.615 -BUILD_LOG='$(OUTPUT_ROOT)/build.log' 4.616 -BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old' 4.617 -BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' 4.618 -AC_SUBST(BUILD_LOG) 4.619 -AC_SUBST(BUILD_LOG_PREVIOUS) 4.620 -AC_SUBST(BUILD_LOG_WRAPPER) 4.621 + # Setup default logging of stdout and stderr to build.log in the output root. 4.622 + BUILD_LOG='$(OUTPUT_ROOT)/build.log' 4.623 + BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old' 4.624 + BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' 4.625 + AC_SUBST(BUILD_LOG) 4.626 + AC_SUBST(BUILD_LOG_PREVIOUS) 4.627 + AC_SUBST(BUILD_LOG_WRAPPER) 4.628 ]) 4.629 4.630 4.631 @@ -581,85 +581,85 @@ 4.632 4.633 AC_DEFUN([BASIC_CHECK_FIND_DELETE], 4.634 [ 4.635 - # Test if find supports -delete 4.636 - AC_MSG_CHECKING([if find supports -delete]) 4.637 - FIND_DELETE="-delete" 4.638 + # Test if find supports -delete 4.639 + AC_MSG_CHECKING([if find supports -delete]) 4.640 + FIND_DELETE="-delete" 4.641 4.642 - DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?) 4.643 + DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?) 4.644 4.645 - echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete 4.646 + echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete 4.647 4.648 - TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1` 4.649 - if test -f $DELETEDIR/TestIfFindSupportsDelete; then 4.650 - # No, it does not. 4.651 - rm $DELETEDIR/TestIfFindSupportsDelete 4.652 - FIND_DELETE="-exec rm \{\} \+" 4.653 - AC_MSG_RESULT([no]) 4.654 - else 4.655 - AC_MSG_RESULT([yes]) 4.656 - fi 4.657 - rmdir $DELETEDIR 4.658 - AC_SUBST(FIND_DELETE) 4.659 + TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1` 4.660 + if test -f $DELETEDIR/TestIfFindSupportsDelete; then 4.661 + # No, it does not. 4.662 + rm $DELETEDIR/TestIfFindSupportsDelete 4.663 + FIND_DELETE="-exec rm \{\} \+" 4.664 + AC_MSG_RESULT([no]) 4.665 + else 4.666 + AC_MSG_RESULT([yes]) 4.667 + fi 4.668 + rmdir $DELETEDIR 4.669 + AC_SUBST(FIND_DELETE) 4.670 ]) 4.671 4.672 AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS], 4.673 [ 4.674 -BASIC_CHECK_GNU_MAKE 4.675 + BASIC_CHECK_GNU_MAKE 4.676 4.677 -BASIC_CHECK_FIND_DELETE 4.678 + BASIC_CHECK_FIND_DELETE 4.679 4.680 -# These tools might not be installed by default, 4.681 -# need hint on how to install them. 4.682 -BASIC_REQUIRE_PROG(UNZIP, unzip) 4.683 -BASIC_REQUIRE_PROG(ZIP, zip) 4.684 + # These tools might not be installed by default, 4.685 + # need hint on how to install them. 4.686 + BASIC_REQUIRE_PROG(UNZIP, unzip) 4.687 + BASIC_REQUIRE_PROG(ZIP, zip) 4.688 4.689 -# Non-required basic tools 4.690 + # Non-required basic tools 4.691 4.692 -AC_PATH_PROG(LDD, ldd) 4.693 -if test "x$LDD" = "x"; then 4.694 + AC_PATH_PROG(LDD, ldd) 4.695 + if test "x$LDD" = "x"; then 4.696 # List shared lib dependencies is used for 4.697 # debug output and checking for forbidden dependencies. 4.698 # We can build without it. 4.699 LDD="true" 4.700 -fi 4.701 -AC_PATH_PROG(OTOOL, otool) 4.702 -if test "x$OTOOL" = "x"; then 4.703 - OTOOL="true" 4.704 -fi 4.705 -AC_PATH_PROGS(READELF, [readelf greadelf]) 4.706 -AC_PATH_PROG(HG, hg) 4.707 -AC_PATH_PROG(STAT, stat) 4.708 -AC_PATH_PROG(TIME, time) 4.709 -# Check if it's GNU time 4.710 -IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'` 4.711 -if test "x$IS_GNU_TIME" != x; then 4.712 - IS_GNU_TIME=yes 4.713 -else 4.714 - IS_GNU_TIME=no 4.715 -fi 4.716 -AC_SUBST(IS_GNU_TIME) 4.717 + fi 4.718 + AC_PATH_PROG(OTOOL, otool) 4.719 + if test "x$OTOOL" = "x"; then 4.720 + OTOOL="true" 4.721 + fi 4.722 + AC_PATH_PROGS(READELF, [readelf greadelf]) 4.723 + AC_PATH_PROG(HG, hg) 4.724 + AC_PATH_PROG(STAT, stat) 4.725 + AC_PATH_PROG(TIME, time) 4.726 + # Check if it's GNU time 4.727 + IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'` 4.728 + if test "x$IS_GNU_TIME" != x; then 4.729 + IS_GNU_TIME=yes 4.730 + else 4.731 + IS_GNU_TIME=no 4.732 + fi 4.733 + AC_SUBST(IS_GNU_TIME) 4.734 4.735 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 4.736 - BASIC_REQUIRE_PROG(COMM, comm) 4.737 -fi 4.738 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 4.739 + BASIC_REQUIRE_PROG(COMM, comm) 4.740 + fi 4.741 4.742 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 4.743 - BASIC_REQUIRE_PROG(XATTR, xattr) 4.744 - AC_PATH_PROG(CODESIGN, codesign) 4.745 - if test "x$CODESIGN" != "x"; then 4.746 - # Verify that the openjdk_codesign certificate is present 4.747 - AC_MSG_CHECKING([if openjdk_codesign certificate is present]) 4.748 - rm -f codesign-testfile 4.749 - touch codesign-testfile 4.750 - codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN= 4.751 - rm -f codesign-testfile 4.752 - if test "x$CODESIGN" = x; then 4.753 - AC_MSG_RESULT([no]) 4.754 - else 4.755 - AC_MSG_RESULT([yes]) 4.756 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 4.757 + BASIC_REQUIRE_PROG(XATTR, xattr) 4.758 + AC_PATH_PROG(CODESIGN, codesign) 4.759 + if test "x$CODESIGN" != "x"; then 4.760 + # Verify that the openjdk_codesign certificate is present 4.761 + AC_MSG_CHECKING([if openjdk_codesign certificate is present]) 4.762 + rm -f codesign-testfile 4.763 + touch codesign-testfile 4.764 + codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN= 4.765 + rm -f codesign-testfile 4.766 + if test "x$CODESIGN" = x; then 4.767 + AC_MSG_RESULT([no]) 4.768 + else 4.769 + AC_MSG_RESULT([yes]) 4.770 + fi 4.771 fi 4.772 fi 4.773 -fi 4.774 ]) 4.775 4.776 # Check if build directory is on local disk. If not possible to determine, 4.777 @@ -669,8 +669,8 @@ 4.778 # Argument 3: what to do otherwise (remote disk or failure) 4.779 AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK], 4.780 [ 4.781 - # df -l lists only local disks; if the given directory is not found then 4.782 - # a non-zero exit code is given 4.783 + # df -l lists only local disks; if the given directory is not found then 4.784 + # a non-zero exit code is given 4.785 if test "x$DF" = x; then 4.786 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 4.787 # msys does not have df; use Windows "net use" instead. 4.788 @@ -707,32 +707,30 @@ 4.789 4.790 AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES], 4.791 [ 4.792 + AC_MSG_CHECKING([if build directory is on local disk]) 4.793 + BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT, 4.794 + [OUTPUT_DIR_IS_LOCAL="yes"], 4.795 + [OUTPUT_DIR_IS_LOCAL="no"]) 4.796 + AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL) 4.797 4.798 -AC_MSG_CHECKING([if build directory is on local disk]) 4.799 -BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT, 4.800 - [OUTPUT_DIR_IS_LOCAL="yes"], 4.801 - [OUTPUT_DIR_IS_LOCAL="no"]) 4.802 -AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL) 4.803 + BASIC_CHECK_SRC_PERMS 4.804 4.805 -BASIC_CHECK_SRC_PERMS 4.806 + # Check if the user has any old-style ALT_ variables set. 4.807 + FOUND_ALT_VARIABLES=`env | grep ^ALT_` 4.808 4.809 -# Check if the user has any old-style ALT_ variables set. 4.810 -FOUND_ALT_VARIABLES=`env | grep ^ALT_` 4.811 + # Before generating output files, test if they exist. If they do, this is a reconfigure. 4.812 + # Since we can't properly handle the dependencies for this, warn the user about the situation 4.813 + if test -e $OUTPUT_ROOT/spec.gmk; then 4.814 + IS_RECONFIGURE=yes 4.815 + else 4.816 + IS_RECONFIGURE=no 4.817 + fi 4.818 4.819 -# Before generating output files, test if they exist. If they do, this is a reconfigure. 4.820 -# Since we can't properly handle the dependencies for this, warn the user about the situation 4.821 -if test -e $OUTPUT_ROOT/spec.gmk; then 4.822 - IS_RECONFIGURE=yes 4.823 -else 4.824 - IS_RECONFIGURE=no 4.825 -fi 4.826 - 4.827 -if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then 4.828 - HIDE_PERFORMANCE_HINTS=yes 4.829 -else 4.830 - HIDE_PERFORMANCE_HINTS=no 4.831 - # Hide it the next time around... 4.832 - $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1 4.833 -fi 4.834 - 4.835 + if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then 4.836 + HIDE_PERFORMANCE_HINTS=yes 4.837 + else 4.838 + HIDE_PERFORMANCE_HINTS=no 4.839 + # Hide it the next time around... 4.840 + $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1 4.841 + fi 4.842 ])
5.1 --- a/common/autoconf/basics_windows.m4 Wed Oct 16 13:50:05 2013 +0200 5.2 +++ b/common/autoconf/basics_windows.m4 Thu Oct 17 13:53:08 2013 -0700 5.3 @@ -145,7 +145,7 @@ 5.4 # Not in mixed or Windows style, start by that. 5.5 new_path=`cmd //c echo $path` 5.6 fi 5.7 - 5.8 + 5.9 BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path]) 5.10 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) 5.11 if test "x$path" != "x$new_path"; then 5.12 @@ -175,8 +175,8 @@ 5.13 # bat and cmd files are not always considered executable in cygwin causing which 5.14 # to not find them 5.15 if test "x$new_path" = x \ 5.16 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 5.17 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 5.18 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 5.19 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 5.20 new_path=`$CYGPATH -u "$path"` 5.21 fi 5.22 if test "x$new_path" = x; then 5.23 @@ -191,8 +191,8 @@ 5.24 # bat and cmd files are not always considered executable in cygwin causing which 5.25 # to not find them 5.26 if test "x$new_path" = x \ 5.27 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 5.28 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 5.29 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 5.30 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 5.31 new_path=`$CYGPATH -u "$path"` 5.32 fi 5.33 if test "x$new_path" = x; then 5.34 @@ -218,9 +218,9 @@ 5.35 # Short path failed, file does not exist as specified. 5.36 # Try adding .exe or .cmd 5.37 if test -f "${new_path}.exe"; then 5.38 - input_to_shortpath="${new_path}.exe" 5.39 + input_to_shortpath="${new_path}.exe" 5.40 elif test -f "${new_path}.cmd"; then 5.41 - input_to_shortpath="${new_path}.cmd" 5.42 + input_to_shortpath="${new_path}.cmd" 5.43 else 5.44 AC_MSG_NOTICE([The path of $1, which resolves as "$new_path", is invalid.]) 5.45 AC_MSG_NOTICE([Neither "$new_path" nor "$new_path.exe/cmd" can be found]) 5.46 @@ -254,7 +254,7 @@ 5.47 5.48 # Now try to locate executable using which 5.49 new_path=`$WHICH "$new_path" 2> /dev/null` 5.50 - 5.51 + 5.52 if test "x$new_path" = x; then 5.53 # Oops. Which didn't find the executable. 5.54 # The splitting of arguments from the executable at a space might have been incorrect, 5.55 @@ -264,9 +264,9 @@ 5.56 arguments="EOL" 5.57 new_path="$path" 5.58 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) 5.59 - 5.60 + 5.61 new_path=`$WHICH "$new_path" 2> /dev/null` 5.62 - 5.63 + 5.64 if test "x$new_path" = x; then 5.65 # It's still not found. Now this is an unrecoverable error. 5.66 AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) 5.67 @@ -302,7 +302,7 @@ 5.68 [ 5.69 SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m` 5.70 if test $SRC_ROOT_LENGTH -gt 100; then 5.71 - AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported]) 5.72 + AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported]) 5.73 fi 5.74 5.75 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 5.76 @@ -311,14 +311,14 @@ 5.77 AC_MSG_RESULT([$CYGWIN_VERSION]) 5.78 WINDOWS_ENV_VENDOR='cygwin' 5.79 WINDOWS_ENV_VERSION="$CYGWIN_VERSION" 5.80 - 5.81 + 5.82 CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` 5.83 if test "x$CYGWIN_VERSION_OK" = x; then 5.84 AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.]) 5.85 AC_MSG_ERROR([Cannot continue]) 5.86 fi 5.87 if test "x$CYGPATH" = x; then 5.88 - AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path]) 5.89 + AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path]) 5.90 fi 5.91 AC_MSG_CHECKING([cygwin root directory as unix-style path]) 5.92 # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away 5.93 @@ -329,13 +329,13 @@ 5.94 WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH" 5.95 test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/` 5.96 if test "x$test_cygdrive_prefix" = x; then 5.97 - AC_MSG_ERROR([Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c.]) 5.98 + AC_MSG_ERROR([Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c.]) 5.99 fi 5.100 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 5.101 AC_MSG_CHECKING([msys release]) 5.102 MSYS_VERSION=`$UNAME -r` 5.103 AC_MSG_RESULT([$MSYS_VERSION]) 5.104 - 5.105 + 5.106 WINDOWS_ENV_VENDOR='msys' 5.107 WINDOWS_ENV_VERSION="$MSYS_VERSION" 5.108 5.109 @@ -367,12 +367,12 @@ 5.110 5.111 AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH], 5.112 [ 5.113 -# When using cygwin or msys, we need a wrapper binary that renames 5.114 -# /cygdrive/c/ arguments into c:/ arguments and peeks into 5.115 -# @files and rewrites these too! This wrapper binary is 5.116 -# called fixpath. 5.117 -FIXPATH= 5.118 -if test "x$OPENJDK_BUILD_OS" = xwindows; then 5.119 + # When using cygwin or msys, we need a wrapper binary that renames 5.120 + # /cygdrive/c/ arguments into c:/ arguments and peeks into 5.121 + # @files and rewrites these too! This wrapper binary is 5.122 + # called fixpath. 5.123 + FIXPATH= 5.124 + if test "x$OPENJDK_BUILD_OS" = xwindows; then 5.125 AC_MSG_CHECKING([if fixpath can be created]) 5.126 FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c" 5.127 FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe" 5.128 @@ -389,7 +389,7 @@ 5.129 # @ was chosen as separator to minimize risk of other tools messing around with it 5.130 all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" | tr ' ' '\n' | grep '^/./' | sort | uniq` 5.131 fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'` 5.132 - 5.133 + 5.134 FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list" 5.135 fi 5.136 rm -f $OUTPUT_ROOT/fixpath* 5.137 @@ -397,24 +397,24 @@ 5.138 $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1 5.139 cd $CURDIR 5.140 5.141 - if test ! -x $OUTPUT_ROOT/fixpath.exe; then 5.142 - AC_MSG_RESULT([no]) 5.143 - cat $OUTPUT_ROOT/fixpath1.log 5.144 - AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe]) 5.145 + if test ! -x $OUTPUT_ROOT/fixpath.exe; then 5.146 + AC_MSG_RESULT([no]) 5.147 + cat $OUTPUT_ROOT/fixpath1.log 5.148 + AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe]) 5.149 fi 5.150 AC_MSG_RESULT([yes]) 5.151 AC_MSG_CHECKING([if fixpath.exe works]) 5.152 cd $OUTPUT_ROOT 5.153 - $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1 5.154 + $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1 5.155 cd $CURDIR 5.156 - if test ! -x $OUTPUT_ROOT/fixpath2.exe; then 5.157 - AC_MSG_RESULT([no]) 5.158 - cat $OUTPUT_ROOT/fixpath2.log 5.159 - AC_MSG_ERROR([fixpath did not work!]) 5.160 + if test ! -x $OUTPUT_ROOT/fixpath2.exe; then 5.161 + AC_MSG_RESULT([no]) 5.162 + cat $OUTPUT_ROOT/fixpath2.log 5.163 + AC_MSG_ERROR([fixpath did not work!]) 5.164 fi 5.165 AC_MSG_RESULT([yes]) 5.166 rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj 5.167 -fi 5.168 + fi 5.169 5.170 -AC_SUBST(FIXPATH) 5.171 + AC_SUBST(FIXPATH) 5.172 ])
6.1 --- a/common/autoconf/boot-jdk.m4 Wed Oct 16 13:50:05 2013 +0200 6.2 +++ b/common/autoconf/boot-jdk.m4 Thu Oct 17 13:53:08 2013 -0700 6.3 @@ -44,7 +44,7 @@ 6.4 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring]) 6.5 AC_MSG_NOTICE([(This might be an JRE instead of an JDK)]) 6.6 BOOT_JDK_FOUND=no 6.7 - else 6.8 + else 6.9 # Do we have an rt.jar? (On MacOSX it is called classes.jar) 6.10 if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then 6.11 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring]) 6.12 @@ -79,70 +79,70 @@ 6.13 # Test: Is bootjdk explicitely set by command line arguments? 6.14 AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS], 6.15 [ 6.16 -if test "x$with_boot_jdk" != x; then 6.17 + if test "x$with_boot_jdk" != x; then 6.18 BOOT_JDK=$with_boot_jdk 6.19 BOOT_JDK_FOUND=maybe 6.20 AC_MSG_NOTICE([Found potential Boot JDK using configure arguments]) 6.21 -fi 6.22 + fi 6.23 ]) 6.24 6.25 # Test: Is bootjdk available from builddeps? 6.26 AC_DEFUN([BOOTJDK_CHECK_BUILDDEPS], 6.27 [ 6.28 - BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=maybe], [BOOT_JDK_FOUND=no]) 6.29 + BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=maybe], [BOOT_JDK_FOUND=no]) 6.30 ]) 6.31 6.32 # Test: Is $JAVA_HOME set? 6.33 AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME], 6.34 [ 6.35 - if test "x$JAVA_HOME" != x; then 6.36 - JAVA_HOME_PROCESSED="$JAVA_HOME" 6.37 - BASIC_FIXUP_PATH(JAVA_HOME_PROCESSED) 6.38 - if test ! -d "$JAVA_HOME_PROCESSED"; then 6.39 - AC_MSG_NOTICE([Your JAVA_HOME points to a non-existing directory!]) 6.40 - else 6.41 - # Aha, the user has set a JAVA_HOME 6.42 - # let us use that as the Boot JDK. 6.43 - BOOT_JDK="$JAVA_HOME_PROCESSED" 6.44 - BOOT_JDK_FOUND=maybe 6.45 - AC_MSG_NOTICE([Found potential Boot JDK using JAVA_HOME]) 6.46 - fi 6.47 + if test "x$JAVA_HOME" != x; then 6.48 + JAVA_HOME_PROCESSED="$JAVA_HOME" 6.49 + BASIC_FIXUP_PATH(JAVA_HOME_PROCESSED) 6.50 + if test ! -d "$JAVA_HOME_PROCESSED"; then 6.51 + AC_MSG_NOTICE([Your JAVA_HOME points to a non-existing directory!]) 6.52 + else 6.53 + # Aha, the user has set a JAVA_HOME 6.54 + # let us use that as the Boot JDK. 6.55 + BOOT_JDK="$JAVA_HOME_PROCESSED" 6.56 + BOOT_JDK_FOUND=maybe 6.57 + AC_MSG_NOTICE([Found potential Boot JDK using JAVA_HOME]) 6.58 fi 6.59 + fi 6.60 ]) 6.61 6.62 # Test: Is there a java or javac in the PATH, which is a symlink to the JDK? 6.63 AC_DEFUN([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK], 6.64 [ 6.65 - AC_PATH_PROG(JAVAC_CHECK, javac) 6.66 - AC_PATH_PROG(JAVA_CHECK, java) 6.67 - BINARY="$JAVAC_CHECK" 6.68 - if test "x$JAVAC_CHECK" = x; then 6.69 - BINARY="$JAVA_CHECK" 6.70 + AC_PATH_PROG(JAVAC_CHECK, javac) 6.71 + AC_PATH_PROG(JAVA_CHECK, java) 6.72 + BINARY="$JAVAC_CHECK" 6.73 + if test "x$JAVAC_CHECK" = x; then 6.74 + BINARY="$JAVA_CHECK" 6.75 + fi 6.76 + if test "x$BINARY" != x; then 6.77 + # So there is a java(c) binary, it might be part of a JDK. 6.78 + # Lets find the JDK/JRE directory by following symbolic links. 6.79 + # Linux/GNU systems often have links from /usr/bin/java to 6.80 + # /etc/alternatives/java to the real JDK binary. 6.81 + BASIC_REMOVE_SYMBOLIC_LINKS(BINARY) 6.82 + BOOT_JDK=`dirname "$BINARY"` 6.83 + BOOT_JDK=`cd "$BOOT_JDK/.."; pwd` 6.84 + if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then 6.85 + # Looks like we found ourselves an JDK 6.86 + BOOT_JDK_FOUND=maybe 6.87 + AC_MSG_NOTICE([Found potential Boot JDK using java(c) in PATH]) 6.88 fi 6.89 - if test "x$BINARY" != x; then 6.90 - # So there is a java(c) binary, it might be part of a JDK. 6.91 - # Lets find the JDK/JRE directory by following symbolic links. 6.92 - # Linux/GNU systems often have links from /usr/bin/java to 6.93 - # /etc/alternatives/java to the real JDK binary. 6.94 - BASIC_REMOVE_SYMBOLIC_LINKS(BINARY) 6.95 - BOOT_JDK=`dirname "$BINARY"` 6.96 - BOOT_JDK=`cd "$BOOT_JDK/.."; pwd` 6.97 - if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then 6.98 - # Looks like we found ourselves an JDK 6.99 - BOOT_JDK_FOUND=maybe 6.100 - AC_MSG_NOTICE([Found potential Boot JDK using java(c) in PATH]) 6.101 - fi 6.102 - fi 6.103 + fi 6.104 ]) 6.105 6.106 # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX) 6.107 AC_DEFUN([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME], 6.108 [ 6.109 - if test -x /usr/libexec/java_home; then 6.110 - BOOT_JDK=`/usr/libexec/java_home` 6.111 - BOOT_JDK_FOUND=maybe 6.112 - AC_MSG_NOTICE([Found potential Boot JDK using /usr/libexec/java_home]) 6.113 - fi 6.114 + if test -x /usr/libexec/java_home; then 6.115 + BOOT_JDK=`/usr/libexec/java_home` 6.116 + BOOT_JDK_FOUND=maybe 6.117 + AC_MSG_NOTICE([Found potential Boot JDK using /usr/libexec/java_home]) 6.118 + fi 6.119 ]) 6.120 6.121 # Look for a jdk in the given path. If there are multiple, try to select the newest. 6.122 @@ -204,123 +204,123 @@ 6.123 AC_MSG_CHECKING([for $2 in Boot JDK]) 6.124 $1=$BOOT_JDK/bin/$2 6.125 if test ! -x [$]$1; then 6.126 - AC_MSG_RESULT(not found) 6.127 - AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk]) 6.128 - AC_MSG_ERROR([Could not find $2 in the Boot JDK]) 6.129 + AC_MSG_RESULT(not found) 6.130 + AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk]) 6.131 + AC_MSG_ERROR([Could not find $2 in the Boot JDK]) 6.132 fi 6.133 AC_MSG_RESULT(ok) 6.134 ]) 6.135 6.136 ############################################################################### 6.137 # 6.138 -# We need a Boot JDK to bootstrap the build. 6.139 +# We need a Boot JDK to bootstrap the build. 6.140 # 6.141 6.142 AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK], 6.143 [ 6.144 -BOOT_JDK_FOUND=no 6.145 -AC_ARG_WITH(boot-jdk, [AS_HELP_STRING([--with-boot-jdk], 6.146 - [path to Boot JDK (used to bootstrap build) @<:@probed@:>@])]) 6.147 + BOOT_JDK_FOUND=no 6.148 + AC_ARG_WITH(boot-jdk, [AS_HELP_STRING([--with-boot-jdk], 6.149 + [path to Boot JDK (used to bootstrap build) @<:@probed@:>@])]) 6.150 6.151 -# We look for the Boot JDK through various means, going from more certain to 6.152 -# more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if 6.153 -# we detected something (if so, the path to the jdk is in BOOT_JDK). But we 6.154 -# must check if this is indeed valid; otherwise we'll continue looking. 6.155 + # We look for the Boot JDK through various means, going from more certain to 6.156 + # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if 6.157 + # we detected something (if so, the path to the jdk is in BOOT_JDK). But we 6.158 + # must check if this is indeed valid; otherwise we'll continue looking. 6.159 6.160 -# Test: Is bootjdk explicitely set by command line arguments? 6.161 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS]) 6.162 -if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then 6.163 - # Having specified an argument which is incorrect will produce an instant failure; 6.164 - # we should not go on looking 6.165 - AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK]) 6.166 -fi 6.167 + # Test: Is bootjdk explicitely set by command line arguments? 6.168 + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS]) 6.169 + if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then 6.170 + # Having specified an argument which is incorrect will produce an instant failure; 6.171 + # we should not go on looking 6.172 + AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK]) 6.173 + fi 6.174 6.175 -# Test: Is bootjdk available from builddeps? 6.176 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_BUILDDEPS]) 6.177 + # Test: Is bootjdk available from builddeps? 6.178 + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_BUILDDEPS]) 6.179 6.180 -# Test: Is $JAVA_HOME set? 6.181 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME]) 6.182 + # Test: Is $JAVA_HOME set? 6.183 + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME]) 6.184 6.185 -# Test: Is there a /usr/libexec/java_home? (Typically on MacOSX) 6.186 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME]) 6.187 + # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX) 6.188 + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME]) 6.189 6.190 -# Test: Is there a java or javac in the PATH, which is a symlink to the JDK? 6.191 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK]) 6.192 + # Test: Is there a java or javac in the PATH, which is a symlink to the JDK? 6.193 + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK]) 6.194 6.195 -# Test: Is there a JDK installed in default, well-known locations? 6.196 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS]) 6.197 + # Test: Is there a JDK installed in default, well-known locations? 6.198 + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS]) 6.199 6.200 -# If we haven't found anything yet, we've truly lost. Give up. 6.201 -if test "x$BOOT_JDK_FOUND" = xno; then 6.202 - HELP_MSG_MISSING_DEPENDENCY([openjdk]) 6.203 - AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG]) 6.204 - AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk]) 6.205 - AC_MSG_ERROR([Cannot continue]) 6.206 -fi 6.207 + # If we haven't found anything yet, we've truly lost. Give up. 6.208 + if test "x$BOOT_JDK_FOUND" = xno; then 6.209 + HELP_MSG_MISSING_DEPENDENCY([openjdk]) 6.210 + AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG]) 6.211 + AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk]) 6.212 + AC_MSG_ERROR([Cannot continue]) 6.213 + fi 6.214 6.215 -# Setup proper paths for what we found 6.216 -BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar" 6.217 -if test ! -f "$BOOT_RTJAR"; then 6.218 + # Setup proper paths for what we found 6.219 + BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar" 6.220 + if test ! -f "$BOOT_RTJAR"; then 6.221 # On MacOSX it is called classes.jar 6.222 BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar" 6.223 if test -f "$BOOT_RTJAR"; then 6.224 - # Remove the .. 6.225 + # Remove the .. 6.226 BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}" 6.227 fi 6.228 -fi 6.229 -BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar" 6.230 -BOOT_JDK="$BOOT_JDK" 6.231 -AC_SUBST(BOOT_RTJAR) 6.232 -AC_SUBST(BOOT_TOOLSJAR) 6.233 -AC_SUBST(BOOT_JDK) 6.234 + fi 6.235 + BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar" 6.236 + BOOT_JDK="$BOOT_JDK" 6.237 + AC_SUBST(BOOT_RTJAR) 6.238 + AC_SUBST(BOOT_TOOLSJAR) 6.239 + AC_SUBST(BOOT_JDK) 6.240 6.241 -# Setup tools from the Boot JDK. 6.242 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA,java) 6.243 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC,javac) 6.244 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH,javah) 6.245 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAP,javap) 6.246 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR,jar) 6.247 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(RMIC,rmic) 6.248 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII,native2ascii) 6.249 + # Setup tools from the Boot JDK. 6.250 + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA,java) 6.251 + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC,javac) 6.252 + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH,javah) 6.253 + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAP,javap) 6.254 + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR,jar) 6.255 + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(RMIC,rmic) 6.256 + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII,native2ascii) 6.257 6.258 -# Finally, set some other options... 6.259 + # Finally, set some other options... 6.260 6.261 -# When compiling code to be executed by the Boot JDK, force jdk7 compatibility. 6.262 -BOOT_JDK_SOURCETARGET="-source 7 -target 7" 6.263 -AC_SUBST(BOOT_JDK_SOURCETARGET) 6.264 -AC_SUBST(JAVAC_FLAGS) 6.265 + # When compiling code to be executed by the Boot JDK, force jdk7 compatibility. 6.266 + BOOT_JDK_SOURCETARGET="-source 7 -target 7" 6.267 + AC_SUBST(BOOT_JDK_SOURCETARGET) 6.268 + AC_SUBST(JAVAC_FLAGS) 6.269 ]) 6.270 6.271 AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], 6.272 [ 6.273 -############################################################################## 6.274 -# 6.275 -# Specify options for anything that is run with the Boot JDK. 6.276 -# 6.277 -AC_ARG_WITH(boot-jdk-jvmargs, [AS_HELP_STRING([--with-boot-jdk-jvmargs], 6.278 - [specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values, 6.279 - e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])]) 6.280 + ############################################################################## 6.281 + # 6.282 + # Specify options for anything that is run with the Boot JDK. 6.283 + # 6.284 + AC_ARG_WITH(boot-jdk-jvmargs, [AS_HELP_STRING([--with-boot-jdk-jvmargs], 6.285 + [specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values, 6.286 + e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])]) 6.287 6.288 -if test "x$with_boot_jdk_jvmargs" = x; then 6.289 + if test "x$with_boot_jdk_jvmargs" = x; then 6.290 # Not all JVM:s accept the same arguments on the command line. 6.291 # OpenJDK specific increase in thread stack for JDK build, 6.292 # well more specifically, when running javac. 6.293 if test "x$BUILD_NUM_BITS" = x32; then 6.294 - STACK_SIZE=768 6.295 + STACK_SIZE=768 6.296 else 6.297 - # Running Javac on a JVM on a 64-bit machine, the stack takes more space 6.298 - # since 64-bit pointers are pushed on the stach. Apparently, we need 6.299 - # to increase the stack space when javacing the JDK.... 6.300 - STACK_SIZE=1536 6.301 + # Running Javac on a JVM on a 64-bit machine, the stack takes more space 6.302 + # since 64-bit pointers are pushed on the stach. Apparently, we need 6.303 + # to increase the stack space when javacing the JDK.... 6.304 + STACK_SIZE=1536 6.305 fi 6.306 6.307 # Minimum amount of heap memory. 6.308 ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA]) 6.309 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 6.310 - # Why does macosx need more heap? Its the huge JDK batch. 6.311 - ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA]) 6.312 + # Why does macosx need more heap? Its the huge JDK batch. 6.313 + ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA]) 6.314 else 6.315 - ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA]) 6.316 + ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA]) 6.317 fi 6.318 # When is adding -client something that speeds up the JVM? 6.319 # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA]) 6.320 @@ -329,7 +329,7 @@ 6.321 ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs,[$JAVA]) 6.322 # Disable special log output when a debug build is used as Boot JDK... 6.323 ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA]) 6.324 -fi 6.325 + fi 6.326 6.327 -AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs) 6.328 + AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs) 6.329 ])
7.1 --- a/common/autoconf/bootcycle-spec.gmk.in Wed Oct 16 13:50:05 2013 +0200 7.2 +++ b/common/autoconf/bootcycle-spec.gmk.in Thu Oct 17 13:53:08 2013 -0700 7.3 @@ -36,7 +36,7 @@ 7.4 JAVA_EXEC_POS=1 7.5 endif 7.6 ifneq ($(word $(JAVA_EXEC_POS),$(SJAVAC_SERVER_JAVA)),$(word $(JAVA_EXEC_POS),$(JAVA))) 7.7 - $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified) 7.8 + $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified) 7.9 endif 7.10 7.11
8.1 --- a/common/autoconf/build-aux/config.guess Wed Oct 16 13:50:05 2013 +0200 8.2 +++ b/common/autoconf/build-aux/config.guess Thu Oct 17 13:53:08 2013 -0700 8.3 @@ -58,6 +58,6 @@ 8.4 OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'` 8.5 ;; 8.6 esac 8.7 -fi 8.8 +fi 8.9 8.10 echo $OUT
9.1 --- a/common/autoconf/build-performance.m4 Wed Oct 16 13:50:05 2013 +0200 9.2 +++ b/common/autoconf/build-performance.m4 Thu Oct 17 13:53:08 2013 -0700 9.3 @@ -25,78 +25,77 @@ 9.4 9.5 AC_DEFUN([BPERF_CHECK_CORES], 9.6 [ 9.7 - AC_MSG_CHECKING([for number of cores]) 9.8 - NUM_CORES=1 9.9 - FOUND_CORES=no 9.10 - 9.11 - if test -f /proc/cpuinfo; then 9.12 - # Looks like a Linux (or cygwin) system 9.13 - NUM_CORES=`cat /proc/cpuinfo | grep -c processor` 9.14 - FOUND_CORES=yes 9.15 - elif test -x /usr/sbin/psrinfo; then 9.16 - # Looks like a Solaris system 9.17 - NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line` 9.18 - FOUND_CORES=yes 9.19 - elif test -x /usr/sbin/system_profiler; then 9.20 - # Looks like a MacOSX system 9.21 - NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` 9.22 - FOUND_CORES=yes 9.23 - elif test -n "$NUMBER_OF_PROCESSORS"; then 9.24 - # On windows, look in the env 9.25 - NUM_CORES=$NUMBER_OF_PROCESSORS 9.26 - FOUND_CORES=yes 9.27 - fi 9.28 + AC_MSG_CHECKING([for number of cores]) 9.29 + NUM_CORES=1 9.30 + FOUND_CORES=no 9.31 9.32 - if test "x$FOUND_CORES" = xyes; then 9.33 - AC_MSG_RESULT([$NUM_CORES]) 9.34 - else 9.35 - AC_MSG_RESULT([could not detect number of cores, defaulting to 1]) 9.36 - AC_MSG_WARN([This will disable all parallelism from build!]) 9.37 - fi 9.38 + if test -f /proc/cpuinfo; then 9.39 + # Looks like a Linux (or cygwin) system 9.40 + NUM_CORES=`cat /proc/cpuinfo | grep -c processor` 9.41 + FOUND_CORES=yes 9.42 + elif test -x /usr/sbin/psrinfo; then 9.43 + # Looks like a Solaris system 9.44 + NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line` 9.45 + FOUND_CORES=yes 9.46 + elif test -x /usr/sbin/system_profiler; then 9.47 + # Looks like a MacOSX system 9.48 + NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` 9.49 + FOUND_CORES=yes 9.50 + elif test -n "$NUMBER_OF_PROCESSORS"; then 9.51 + # On windows, look in the env 9.52 + NUM_CORES=$NUMBER_OF_PROCESSORS 9.53 + FOUND_CORES=yes 9.54 + fi 9.55 9.56 + if test "x$FOUND_CORES" = xyes; then 9.57 + AC_MSG_RESULT([$NUM_CORES]) 9.58 + else 9.59 + AC_MSG_RESULT([could not detect number of cores, defaulting to 1]) 9.60 + AC_MSG_WARN([This will disable all parallelism from build!]) 9.61 + fi 9.62 ]) 9.63 9.64 AC_DEFUN([BPERF_CHECK_MEMORY_SIZE], 9.65 [ 9.66 - AC_MSG_CHECKING([for memory size]) 9.67 - # Default to 1024 MB 9.68 - MEMORY_SIZE=1024 9.69 - FOUND_MEM=no 9.70 - 9.71 - if test -f /proc/meminfo; then 9.72 - # Looks like a Linux (or cygwin) system 9.73 - MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'` 9.74 - MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` 9.75 - FOUND_MEM=yes 9.76 - elif test -x /usr/sbin/prtconf; then 9.77 - # Looks like a Solaris system 9.78 - MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print [$]3 }'` 9.79 - FOUND_MEM=yes 9.80 - elif test -x /usr/sbin/system_profiler; then 9.81 - # Looks like a MacOSX system 9.82 - MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print [$]2}'` 9.83 - MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` 9.84 - FOUND_MEM=yes 9.85 - elif test "x$OPENJDK_BUILD_OS" = xwindows; then 9.86 - # Windows, but without cygwin 9.87 - MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` 9.88 - MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024` 9.89 - FOUND_MEM=yes 9.90 - fi 9.91 + AC_MSG_CHECKING([for memory size]) 9.92 + # Default to 1024 MB 9.93 + MEMORY_SIZE=1024 9.94 + FOUND_MEM=no 9.95 9.96 - if test "x$FOUND_MEM" = xyes; then 9.97 - AC_MSG_RESULT([$MEMORY_SIZE MB]) 9.98 - else 9.99 - AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB]) 9.100 - AC_MSG_WARN([This might seriously impact build performance!]) 9.101 - fi 9.102 + if test -f /proc/meminfo; then 9.103 + # Looks like a Linux (or cygwin) system 9.104 + MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'` 9.105 + MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` 9.106 + FOUND_MEM=yes 9.107 + elif test -x /usr/sbin/prtconf; then 9.108 + # Looks like a Solaris system 9.109 + MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print [$]3 }'` 9.110 + FOUND_MEM=yes 9.111 + elif test -x /usr/sbin/system_profiler; then 9.112 + # Looks like a MacOSX system 9.113 + MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print [$]2}'` 9.114 + MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` 9.115 + FOUND_MEM=yes 9.116 + elif test "x$OPENJDK_BUILD_OS" = xwindows; then 9.117 + # Windows, but without cygwin 9.118 + MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` 9.119 + MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024` 9.120 + FOUND_MEM=yes 9.121 + fi 9.122 + 9.123 + if test "x$FOUND_MEM" = xyes; then 9.124 + AC_MSG_RESULT([$MEMORY_SIZE MB]) 9.125 + else 9.126 + AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB]) 9.127 + AC_MSG_WARN([This might seriously impact build performance!]) 9.128 + fi 9.129 ]) 9.130 9.131 AC_DEFUN_ONCE([BPERF_SETUP_BUILD_CORES], 9.132 [ 9.133 # How many cores do we have on this build system? 9.134 AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores], 9.135 - [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])]) 9.136 + [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])]) 9.137 if test "x$with_num_cores" = x; then 9.138 # The number of cores were not specified, try to probe them. 9.139 BPERF_CHECK_CORES 9.140 @@ -110,7 +109,7 @@ 9.141 [ 9.142 # How much memory do we have on this build system? 9.143 AC_ARG_WITH(memory-size, [AS_HELP_STRING([--with-memory-size], 9.144 - [memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])]) 9.145 + [memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])]) 9.146 if test "x$with_memory_size" = x; then 9.147 # The memory size was not specified, try to probe it. 9.148 BPERF_CHECK_MEMORY_SIZE 9.149 @@ -122,10 +121,10 @@ 9.150 9.151 AC_DEFUN_ONCE([BPERF_SETUP_BUILD_JOBS], 9.152 [ 9.153 - # Provide a decent default number of parallel jobs for make depending on 9.154 + # Provide a decent default number of parallel jobs for make depending on 9.155 # number of cores, amount of memory and machine architecture. 9.156 AC_ARG_WITH(jobs, [AS_HELP_STRING([--with-jobs], 9.157 - [number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])]) 9.158 + [number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])]) 9.159 if test "x$with_jobs" = x; then 9.160 # Number of jobs was not specified, calculate. 9.161 AC_MSG_CHECKING([for appropriate number of jobs to run in parallel]) 9.162 @@ -157,179 +156,178 @@ 9.163 9.164 AC_DEFUN([BPERF_SETUP_CCACHE], 9.165 [ 9.166 - AC_ARG_ENABLE([ccache], 9.167 - [AS_HELP_STRING([--disable-ccache], 9.168 - [disable using ccache to speed up recompilations @<:@enabled@:>@])], 9.169 - [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes]) 9.170 - if test "x$ENABLE_CCACHE" = xyes; then 9.171 - OLD_PATH="$PATH" 9.172 - if test "x$TOOLS_DIR" != x; then 9.173 - PATH=$TOOLS_DIR:$PATH 9.174 - fi 9.175 - AC_PATH_PROG(CCACHE, ccache) 9.176 - PATH="$OLD_PATH" 9.177 - else 9.178 - AC_MSG_CHECKING([for ccache]) 9.179 - AC_MSG_RESULT([explicitly disabled]) 9.180 - CCACHE= 9.181 - fi 9.182 - AC_SUBST(CCACHE) 9.183 + AC_ARG_ENABLE([ccache], 9.184 + [AS_HELP_STRING([--disable-ccache], 9.185 + [disable using ccache to speed up recompilations @<:@enabled@:>@])], 9.186 + [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes]) 9.187 + if test "x$ENABLE_CCACHE" = xyes; then 9.188 + OLD_PATH="$PATH" 9.189 + if test "x$TOOLS_DIR" != x; then 9.190 + PATH=$TOOLS_DIR:$PATH 9.191 + fi 9.192 + AC_PATH_PROG(CCACHE, ccache) 9.193 + PATH="$OLD_PATH" 9.194 + else 9.195 + AC_MSG_CHECKING([for ccache]) 9.196 + AC_MSG_RESULT([explicitly disabled]) 9.197 + CCACHE= 9.198 + fi 9.199 + AC_SUBST(CCACHE) 9.200 9.201 - AC_ARG_WITH([ccache-dir], 9.202 - [AS_HELP_STRING([--with-ccache-dir], 9.203 - [where to store ccache files @<:@~/.ccache@:>@])]) 9.204 + AC_ARG_WITH([ccache-dir], 9.205 + [AS_HELP_STRING([--with-ccache-dir], 9.206 + [where to store ccache files @<:@~/.ccache@:>@])]) 9.207 9.208 - if test "x$with_ccache_dir" != x; then 9.209 - # When using a non home ccache directory, assume the use is to share ccache files 9.210 - # with other users. Thus change the umask. 9.211 - SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002" 9.212 - fi 9.213 - CCACHE_FOUND="" 9.214 - if test "x$CCACHE" != x; then 9.215 - BPERF_SETUP_CCACHE_USAGE 9.216 - fi 9.217 + if test "x$with_ccache_dir" != x; then 9.218 + # When using a non home ccache directory, assume the use is to share ccache files 9.219 + # with other users. Thus change the umask. 9.220 + SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002" 9.221 + fi 9.222 + CCACHE_FOUND="" 9.223 + if test "x$CCACHE" != x; then 9.224 + BPERF_SETUP_CCACHE_USAGE 9.225 + fi 9.226 ]) 9.227 9.228 AC_DEFUN([BPERF_SETUP_CCACHE_USAGE], 9.229 [ 9.230 - if test "x$CCACHE" != x; then 9.231 - CCACHE_FOUND="true" 9.232 - # Only use ccache if it is 3.1.4 or later, which supports 9.233 - # precompiled headers. 9.234 - AC_MSG_CHECKING([if ccache supports precompiled headers]) 9.235 - HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null` 9.236 - if test "x$HAS_GOOD_CCACHE" = x; then 9.237 - AC_MSG_RESULT([no, disabling ccache]) 9.238 - CCACHE= 9.239 - else 9.240 - AC_MSG_RESULT([yes]) 9.241 - AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers]) 9.242 - PUSHED_FLAGS="$CXXFLAGS" 9.243 - CXXFLAGS="-fpch-preprocess $CXXFLAGS" 9.244 - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no]) 9.245 - CXXFLAGS="$PUSHED_FLAGS" 9.246 - if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then 9.247 - AC_MSG_RESULT([yes]) 9.248 - else 9.249 - AC_MSG_RESULT([no, disabling ccaching of precompiled headers]) 9.250 - CCACHE= 9.251 - fi 9.252 - fi 9.253 + if test "x$CCACHE" != x; then 9.254 + CCACHE_FOUND="true" 9.255 + # Only use ccache if it is 3.1.4 or later, which supports 9.256 + # precompiled headers. 9.257 + AC_MSG_CHECKING([if ccache supports precompiled headers]) 9.258 + HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null` 9.259 + if test "x$HAS_GOOD_CCACHE" = x; then 9.260 + AC_MSG_RESULT([no, disabling ccache]) 9.261 + CCACHE= 9.262 + else 9.263 + AC_MSG_RESULT([yes]) 9.264 + AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers]) 9.265 + PUSHED_FLAGS="$CXXFLAGS" 9.266 + CXXFLAGS="-fpch-preprocess $CXXFLAGS" 9.267 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no]) 9.268 + CXXFLAGS="$PUSHED_FLAGS" 9.269 + if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then 9.270 + AC_MSG_RESULT([yes]) 9.271 + else 9.272 + AC_MSG_RESULT([no, disabling ccaching of precompiled headers]) 9.273 + CCACHE= 9.274 + fi 9.275 fi 9.276 + fi 9.277 9.278 - if test "x$CCACHE" != x; then 9.279 - CCACHE_SLOPPINESS=time_macros 9.280 - CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE" 9.281 - CCACHE_FLAGS=-fpch-preprocess 9.282 + if test "x$CCACHE" != x; then 9.283 + CCACHE_SLOPPINESS=time_macros 9.284 + CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE" 9.285 + CCACHE_FLAGS=-fpch-preprocess 9.286 9.287 - if test "x$SET_CCACHE_DIR" != x; then 9.288 - mkdir -p $CCACHE_DIR > /dev/null 2>&1 9.289 - chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1 9.290 - fi 9.291 + if test "x$SET_CCACHE_DIR" != x; then 9.292 + mkdir -p $CCACHE_DIR > /dev/null 2>&1 9.293 + chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1 9.294 fi 9.295 + fi 9.296 ]) 9.297 9.298 AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS], 9.299 [ 9.300 - 9.301 -############################################################################### 9.302 -# 9.303 -# Can the C/C++ compiler use precompiled headers? 9.304 -# 9.305 -AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers], 9.306 - [disable using precompiled headers when compiling C++ @<:@enabled@:>@])], 9.307 - [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes]) 9.308 9.309 -USE_PRECOMPILED_HEADER=1 9.310 -if test "x$ENABLE_PRECOMPH" = xno; then 9.311 + ############################################################################### 9.312 + # 9.313 + # Can the C/C++ compiler use precompiled headers? 9.314 + # 9.315 + AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers], 9.316 + [disable using precompiled headers when compiling C++ @<:@enabled@:>@])], 9.317 + [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes]) 9.318 + 9.319 + USE_PRECOMPILED_HEADER=1 9.320 + if test "x$ENABLE_PRECOMPH" = xno; then 9.321 USE_PRECOMPILED_HEADER=0 9.322 -fi 9.323 + fi 9.324 9.325 -if test "x$ENABLE_PRECOMPH" = xyes; then 9.326 + if test "x$ENABLE_PRECOMPH" = xyes; then 9.327 # Check that the compiler actually supports precomp headers. 9.328 if test "x$GCC" = xyes; then 9.329 - AC_MSG_CHECKING([that precompiled headers work]) 9.330 - echo "int alfa();" > conftest.h 9.331 - $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD 9.332 - if test ! -f conftest.hpp.gch; then 9.333 - USE_PRECOMPILED_HEADER=0 9.334 - AC_MSG_RESULT([no]) 9.335 - else 9.336 - AC_MSG_RESULT([yes]) 9.337 - fi 9.338 - rm -f conftest.h conftest.hpp.gch 9.339 + AC_MSG_CHECKING([that precompiled headers work]) 9.340 + echo "int alfa();" > conftest.h 9.341 + $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD 9.342 + if test ! -f conftest.hpp.gch; then 9.343 + USE_PRECOMPILED_HEADER=0 9.344 + AC_MSG_RESULT([no]) 9.345 + else 9.346 + AC_MSG_RESULT([yes]) 9.347 + fi 9.348 + rm -f conftest.h conftest.hpp.gch 9.349 fi 9.350 -fi 9.351 + fi 9.352 9.353 -AC_SUBST(USE_PRECOMPILED_HEADER) 9.354 + AC_SUBST(USE_PRECOMPILED_HEADER) 9.355 ]) 9.356 9.357 9.358 AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC], 9.359 [ 9.360 -AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java], 9.361 - [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])]) 9.362 + AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java], 9.363 + [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])]) 9.364 9.365 -if test "x$with_sjavac_server_java" != x; then 9.366 + if test "x$with_sjavac_server_java" != x; then 9.367 SJAVAC_SERVER_JAVA="$with_sjavac_server_java" 9.368 FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""` 9.369 if test "x$FOUND_VERSION" = x; then 9.370 - AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA]) 9.371 + AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA]) 9.372 fi 9.373 -else 9.374 + else 9.375 SJAVAC_SERVER_JAVA="" 9.376 # Hotspot specific options. 9.377 ADD_JVM_ARG_IF_OK([-verbosegc],SJAVAC_SERVER_JAVA,[$JAVA]) 9.378 # JRockit specific options. 9.379 ADD_JVM_ARG_IF_OK([-Xverbose:gc],SJAVAC_SERVER_JAVA,[$JAVA]) 9.380 SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA" 9.381 -fi 9.382 -AC_SUBST(SJAVAC_SERVER_JAVA) 9.383 + fi 9.384 + AC_SUBST(SJAVAC_SERVER_JAVA) 9.385 9.386 -if test "$MEMORY_SIZE" -gt "2500"; then 9.387 + if test "$MEMORY_SIZE" -gt "2500"; then 9.388 ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.389 if test "$JVM_ARG_OK" = true; then 9.390 - JVM_64BIT=true 9.391 - JVM_ARG_OK=false 9.392 + JVM_64BIT=true 9.393 + JVM_ARG_OK=false 9.394 fi 9.395 - fi 9.396 + fi 9.397 9.398 -if test "$JVM_64BIT" = true; then 9.399 + if test "$JVM_64BIT" = true; then 9.400 if test "$MEMORY_SIZE" -gt "17000"; then 9.401 - ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.402 + ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.403 fi 9.404 if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then 9.405 - ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.406 + ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.407 fi 9.408 if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then 9.409 - ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.410 + ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.411 fi 9.412 if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then 9.413 - ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.414 + ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.415 fi 9.416 -fi 9.417 -if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then 9.418 + fi 9.419 + if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then 9.420 ADD_JVM_ARG_IF_OK([-Xms1000M -Xmx1500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.421 -fi 9.422 -if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then 9.423 + fi 9.424 + if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then 9.425 ADD_JVM_ARG_IF_OK([-Xms400M -Xmx1100M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.426 -fi 9.427 -if test "$JVM_ARG_OK" = false; then 9.428 + fi 9.429 + if test "$JVM_ARG_OK" = false; then 9.430 ADD_JVM_ARG_IF_OK([-Xms256M -Xmx512M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 9.431 -fi 9.432 + fi 9.433 9.434 -AC_MSG_CHECKING([whether to use sjavac]) 9.435 -AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac], 9.436 - [use sjavac to do fast incremental compiles @<:@disabled@:>@])], 9.437 - [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no']) 9.438 -AC_MSG_RESULT([$ENABLE_SJAVAC]) 9.439 -AC_SUBST(ENABLE_SJAVAC) 9.440 + AC_MSG_CHECKING([whether to use sjavac]) 9.441 + AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac], 9.442 + [use sjavac to do fast incremental compiles @<:@disabled@:>@])], 9.443 + [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no']) 9.444 + AC_MSG_RESULT([$ENABLE_SJAVAC]) 9.445 + AC_SUBST(ENABLE_SJAVAC) 9.446 9.447 -if test "x$ENABLE_SJAVAC" = xyes; then 9.448 + if test "x$ENABLE_SJAVAC" = xyes; then 9.449 SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers" 9.450 -else 9.451 + else 9.452 SJAVAC_SERVER_DIR= 9.453 -fi 9.454 -AC_SUBST(SJAVAC_SERVER_DIR) 9.455 - 9.456 + fi 9.457 + AC_SUBST(SJAVAC_SERVER_DIR) 9.458 ])
10.1 --- a/common/autoconf/builddeps.conf.example Wed Oct 16 13:50:05 2013 +0200 10.2 +++ b/common/autoconf/builddeps.conf.example Thu Oct 17 13:53:08 2013 -0700 10.3 @@ -34,7 +34,7 @@ 10.4 # If no rewrite was found, then rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME} 10.5 REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu 10.6 REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10 10.7 - 10.8 + 10.9 # The needed cups builddeps are platform independent header files. 10.10 # I.e. they need not be part of the devkit. 10.11 builddep_cups=lib/cups_1_3_9.zip
11.1 --- a/common/autoconf/builddeps.conf.nfs.example Wed Oct 16 13:50:05 2013 +0200 11.2 +++ b/common/autoconf/builddeps.conf.nfs.example Thu Oct 17 13:53:08 2013 -0700 11.3 @@ -29,7 +29,7 @@ 11.4 11.5 REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu 11.6 REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10 11.7 - 11.8 + 11.9 DEVTOOLS=/java/devtools 11.10 11.11 builddep_cups=${DEVTOOLS}/linux/cups/include
12.1 --- a/common/autoconf/builddeps.m4 Wed Oct 16 13:50:05 2013 +0200 12.2 +++ b/common/autoconf/builddeps.m4 Thu Oct 17 13:53:08 2013 -0700 12.3 @@ -25,223 +25,223 @@ 12.4 12.5 AC_DEFUN_ONCE([BDEPS_SCAN_FOR_BUILDDEPS], 12.6 [ 12.7 - define(LIST_OF_BUILD_DEPENDENCIES,) 12.8 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then 12.9 - if test "x$with_builddeps_conf" != x; then 12.10 - AC_MSG_CHECKING([for supplied builddeps configuration file]) 12.11 - builddepsfile=$with_builddeps_conf 12.12 - if test -s $builddepsfile; then 12.13 - . $builddepsfile 12.14 - AC_MSG_RESULT([loaded!]) 12.15 - else 12.16 - AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!]) 12.17 - fi 12.18 - else 12.19 - AC_MSG_CHECKING([for builddeps.conf files in sources...]) 12.20 - builddepsfile=`mktemp` 12.21 - touch $builddepsfile 12.22 - # Put all found confs into a single file. 12.23 - find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile 12.24 - # Source the file to acquire the variables 12.25 - if test -s $builddepsfile; then 12.26 - . $builddepsfile 12.27 - AC_MSG_RESULT([found at least one!]) 12.28 - else 12.29 - AC_MSG_ERROR([Could not find any builddeps.conf at all!]) 12.30 - fi 12.31 - fi 12.32 - # Create build and target names that use _ instead of "-" and ".". 12.33 - # This is necessary to use them in variable names. 12.34 - build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` 12.35 - target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` 12.36 - # Extract rewrite information for build and target 12.37 - eval rewritten_build=\${REWRITE_${build_var}} 12.38 - if test "x$rewritten_build" = x; then 12.39 - rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME} 12.40 - echo Build stays the same $rewritten_build 12.41 - else 12.42 - echo Rewriting build for builddeps into $rewritten_build 12.43 - fi 12.44 - eval rewritten_target=\${REWRITE_${target_var}} 12.45 - if test "x$rewritten_target" = x; then 12.46 - rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME} 12.47 - echo Target stays the same $rewritten_target 12.48 - else 12.49 - echo Rewriting target for builddeps into $rewritten_target 12.50 - fi 12.51 - rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'` 12.52 - rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'` 12.53 + define(LIST_OF_BUILD_DEPENDENCIES,) 12.54 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then 12.55 + if test "x$with_builddeps_conf" != x; then 12.56 + AC_MSG_CHECKING([for supplied builddeps configuration file]) 12.57 + builddepsfile=$with_builddeps_conf 12.58 + if test -s $builddepsfile; then 12.59 + . $builddepsfile 12.60 + AC_MSG_RESULT([loaded!]) 12.61 + else 12.62 + AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!]) 12.63 + fi 12.64 + else 12.65 + AC_MSG_CHECKING([for builddeps.conf files in sources...]) 12.66 + builddepsfile=`mktemp` 12.67 + touch $builddepsfile 12.68 + # Put all found confs into a single file. 12.69 + find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile 12.70 + # Source the file to acquire the variables 12.71 + if test -s $builddepsfile; then 12.72 + . $builddepsfile 12.73 + AC_MSG_RESULT([found at least one!]) 12.74 + else 12.75 + AC_MSG_ERROR([Could not find any builddeps.conf at all!]) 12.76 + fi 12.77 fi 12.78 - AC_CHECK_PROGS(BDEPS_UNZIP, [7z unzip]) 12.79 - if test "x$BDEPS_UNZIP" = x7z; then 12.80 - BDEPS_UNZIP="7z x" 12.81 + # Create build and target names that use _ instead of "-" and ".". 12.82 + # This is necessary to use them in variable names. 12.83 + build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` 12.84 + target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` 12.85 + # Extract rewrite information for build and target 12.86 + eval rewritten_build=\${REWRITE_${build_var}} 12.87 + if test "x$rewritten_build" = x; then 12.88 + rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME} 12.89 + echo Build stays the same $rewritten_build 12.90 + else 12.91 + echo Rewriting build for builddeps into $rewritten_build 12.92 fi 12.93 + eval rewritten_target=\${REWRITE_${target_var}} 12.94 + if test "x$rewritten_target" = x; then 12.95 + rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME} 12.96 + echo Target stays the same $rewritten_target 12.97 + else 12.98 + echo Rewriting target for builddeps into $rewritten_target 12.99 + fi 12.100 + rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'` 12.101 + rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'` 12.102 + fi 12.103 + AC_CHECK_PROGS(BDEPS_UNZIP, [7z unzip]) 12.104 + if test "x$BDEPS_UNZIP" = x7z; then 12.105 + BDEPS_UNZIP="7z x" 12.106 + fi 12.107 12.108 - AC_CHECK_PROGS(BDEPS_FTP, [wget lftp ftp]) 12.109 + AC_CHECK_PROGS(BDEPS_FTP, [wget lftp ftp]) 12.110 ]) 12.111 12.112 AC_DEFUN([BDEPS_FTPGET], 12.113 [ 12.114 - # $1 is the ftp://abuilddeps.server.com/libs/cups.zip 12.115 - # $2 is the local file name for the downloaded file. 12.116 - VALID_TOOL=no 12.117 - if test "x$BDEPS_FTP" = xwget; then 12.118 - VALID_TOOL=yes 12.119 - wget -O $2 $1 12.120 + # $1 is the ftp://abuilddeps.server.com/libs/cups.zip 12.121 + # $2 is the local file name for the downloaded file. 12.122 + VALID_TOOL=no 12.123 + if test "x$BDEPS_FTP" = xwget; then 12.124 + VALID_TOOL=yes 12.125 + wget -O $2 $1 12.126 + fi 12.127 + if test "x$BDEPS_FTP" = xlftp; then 12.128 + VALID_TOOL=yes 12.129 + lftp -c "get $1 -o $2" 12.130 + fi 12.131 + if test "x$BDEPS_FTP" = xftp; then 12.132 + VALID_TOOL=yes 12.133 + FTPSERVER=`echo $1 | cut -f 3 -d '/'` 12.134 + FTPPATH=`echo $1 | cut -f 4- -d '/'` 12.135 + FTPUSERPWD=${FTPSERVER%%@*} 12.136 + if test "x$FTPSERVER" != "x$FTPUSERPWD"; then 12.137 + FTPUSER=${userpwd%%:*} 12.138 + FTPPWD=${userpwd#*@} 12.139 + FTPSERVER=${FTPSERVER#*@} 12.140 + else 12.141 + FTPUSER=ftp 12.142 + FTPPWD=ftp 12.143 fi 12.144 - if test "x$BDEPS_FTP" = xlftp; then 12.145 - VALID_TOOL=yes 12.146 - lftp -c "get $1 -o $2" 12.147 - fi 12.148 - if test "x$BDEPS_FTP" = xftp; then 12.149 - VALID_TOOL=yes 12.150 - FTPSERVER=`echo $1 | cut -f 3 -d '/'` 12.151 - FTPPATH=`echo $1 | cut -f 4- -d '/'` 12.152 - FTPUSERPWD=${FTPSERVER%%@*} 12.153 - if test "x$FTPSERVER" != "x$FTPUSERPWD"; then 12.154 - FTPUSER=${userpwd%%:*} 12.155 - FTPPWD=${userpwd#*@} 12.156 - FTPSERVER=${FTPSERVER#*@} 12.157 - else 12.158 - FTPUSER=ftp 12.159 - FTPPWD=ftp 12.160 - fi 12.161 - # the "pass" command does not work on some 12.162 - # ftp clients (read ftp.exe) but if it works, 12.163 - # passive mode is better! 12.164 - (\ 12.165 - echo "user $FTPUSER $FTPPWD" ;\ 12.166 - echo "pass" ;\ 12.167 - echo "bin" ;\ 12.168 - echo "get $FTPPATH $2" ;\ 12.169 - ) | ftp -in $FTPSERVER 12.170 - fi 12.171 - if test "x$VALID_TOOL" != xyes; then 12.172 - AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP]) 12.173 - fi 12.174 + # the "pass" command does not work on some 12.175 + # ftp clients (read ftp.exe) but if it works, 12.176 + # passive mode is better! 12.177 + ( \ 12.178 + echo "user $FTPUSER $FTPPWD" ; \ 12.179 + echo "pass" ; \ 12.180 + echo "bin" ; \ 12.181 + echo "get $FTPPATH $2" ; \ 12.182 + ) | ftp -in $FTPSERVER 12.183 + fi 12.184 + if test "x$VALID_TOOL" != xyes; then 12.185 + AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP]) 12.186 + fi 12.187 ]) 12.188 12.189 AC_DEFUN([BDEPS_CHECK_MODULE], 12.190 [ 12.191 - define([LIST_OF_BUILD_DEPENDENCIES],LIST_OF_BUILD_DEPENDENCIES[$2=$3'\n']) 12.192 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then 12.193 - # Source the builddeps file again, to make sure it uses the latest variables! 12.194 - . $builddepsfile 12.195 - # Look for a target and build machine specific resource! 12.196 - eval resource=\${builddep_$2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}} 12.197 - if test "x$resource" = x; then 12.198 - # Ok, lets instead look for a target specific resource 12.199 - eval resource=\${builddep_$2_TARGET_${rewritten_target_var}} 12.200 - fi 12.201 - if test "x$resource" = x; then 12.202 - # Ok, lets instead look for a build specific resource 12.203 - eval resource=\${builddep_$2_BUILD_${rewritten_build_var}} 12.204 - fi 12.205 - if test "x$resource" = x; then 12.206 - # Ok, lets instead look for a generic resource 12.207 - # (The $2 comes from M4 and not the shell, thus no need for eval here.) 12.208 - resource=${builddep_$2} 12.209 - fi 12.210 - if test "x$resource" != x; then 12.211 - AC_MSG_NOTICE([Using builddeps $resource for $2]) 12.212 - # If the resource in the builddeps.conf file is an existing directory, 12.213 - # for example /java/linux/cups 12.214 - if test -d ${resource}; then 12.215 - depdir=${resource} 12.216 - else 12.217 - BDEPS_FETCH($2, $resource, $with_builddeps_server, $with_builddeps_dir, depdir) 12.218 - fi 12.219 - # Source the builddeps file again, because in the previous command, the depdir 12.220 - # was updated to point at the current build dependency install directory. 12.221 - . $builddepsfile 12.222 - # Now extract variables from the builddeps.conf files. 12.223 - theroot=${builddep_$2_ROOT} 12.224 - thecflags=${builddep_$2_CFLAGS} 12.225 - thelibs=${builddep_$2_LIBS} 12.226 - if test "x$depdir" = x; then 12.227 - AC_MSG_ERROR([Could not download build dependency $2]) 12.228 - fi 12.229 - $1=$depdir 12.230 - if test "x$theroot" != x; then 12.231 - $1="$theroot" 12.232 - fi 12.233 - if test "x$thecflags" != x; then 12.234 - $1_CFLAGS="$thecflags" 12.235 - fi 12.236 - if test "x$thelibs" != x; then 12.237 - $1_LIBS="$thelibs" 12.238 - fi 12.239 - m4_default([$4], [:]) 12.240 - m4_ifvaln([$5], [else $5]) 12.241 - fi 12.242 - m4_ifvaln([$5], [else $5]) 12.243 + define([LIST_OF_BUILD_DEPENDENCIES],LIST_OF_BUILD_DEPENDENCIES[$2=$3'\n']) 12.244 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then 12.245 + # Source the builddeps file again, to make sure it uses the latest variables! 12.246 + . $builddepsfile 12.247 + # Look for a target and build machine specific resource! 12.248 + eval resource=\${builddep_$2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}} 12.249 + if test "x$resource" = x; then 12.250 + # Ok, lets instead look for a target specific resource 12.251 + eval resource=\${builddep_$2_TARGET_${rewritten_target_var}} 12.252 fi 12.253 + if test "x$resource" = x; then 12.254 + # Ok, lets instead look for a build specific resource 12.255 + eval resource=\${builddep_$2_BUILD_${rewritten_build_var}} 12.256 + fi 12.257 + if test "x$resource" = x; then 12.258 + # Ok, lets instead look for a generic resource 12.259 + # (The $2 comes from M4 and not the shell, thus no need for eval here.) 12.260 + resource=${builddep_$2} 12.261 + fi 12.262 + if test "x$resource" != x; then 12.263 + AC_MSG_NOTICE([Using builddeps $resource for $2]) 12.264 + # If the resource in the builddeps.conf file is an existing directory, 12.265 + # for example /java/linux/cups 12.266 + if test -d ${resource}; then 12.267 + depdir=${resource} 12.268 + else 12.269 + BDEPS_FETCH($2, $resource, $with_builddeps_server, $with_builddeps_dir, depdir) 12.270 + fi 12.271 + # Source the builddeps file again, because in the previous command, the depdir 12.272 + # was updated to point at the current build dependency install directory. 12.273 + . $builddepsfile 12.274 + # Now extract variables from the builddeps.conf files. 12.275 + theroot=${builddep_$2_ROOT} 12.276 + thecflags=${builddep_$2_CFLAGS} 12.277 + thelibs=${builddep_$2_LIBS} 12.278 + if test "x$depdir" = x; then 12.279 + AC_MSG_ERROR([Could not download build dependency $2]) 12.280 + fi 12.281 + $1=$depdir 12.282 + if test "x$theroot" != x; then 12.283 + $1="$theroot" 12.284 + fi 12.285 + if test "x$thecflags" != x; then 12.286 + $1_CFLAGS="$thecflags" 12.287 + fi 12.288 + if test "x$thelibs" != x; then 12.289 + $1_LIBS="$thelibs" 12.290 + fi 12.291 + m4_default([$4], [:]) 12.292 + m4_ifvaln([$5], [else $5]) 12.293 + fi 12.294 + m4_ifvaln([$5], [else $5]) 12.295 + fi 12.296 ]) 12.297 12.298 AC_DEFUN([BDEPS_FETCH], 12.299 [ 12.300 -# $1 is for example mymodule 12.301 -# $2 is for example libs/general/libmymod_1_2_3.zip 12.302 -# $3 is for example ftp://mybuilddeps.myserver.com/builddeps 12.303 -# $4 is for example /localhome/builddeps 12.304 -# $5 is the name of the variable into which we store the depdir, eg MYMOD 12.305 -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and 12.306 -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3 12.307 - filename=`basename $2` 12.308 - filebase=`echo $filename | sed 's/\.[[^\.]]*$//'` 12.309 - filebase=${filename%%.*} 12.310 - extension=${filename#*.} 12.311 - installdir=$4/$filebase 12.312 - if test ! -f $installdir/$filename.unpacked; then 12.313 - AC_MSG_NOTICE([Downloading build dependency $1 from $3/$2 and installing into $installdir]) 12.314 - if test ! -d $installdir; then 12.315 - mkdir -p $installdir 12.316 - fi 12.317 - if test ! -d $installdir; then 12.318 - AC_MSG_ERROR([Could not create directory $installdir]) 12.319 - fi 12.320 - tmpfile=`mktemp $installdir/$1.XXXXXXXXX` 12.321 - touch $tmpfile 12.322 - if test ! -f $tmpfile; then 12.323 - AC_MSG_ERROR([Could not create files in directory $installdir]) 12.324 - fi 12.325 - BDEPS_FTPGET([$3/$2] , [$tmpfile]) 12.326 - mv $tmpfile $installdir/$filename 12.327 - if test ! -s $installdir/$filename; then 12.328 - AC_MSG_ERROR([Could not download $3/$2]) 12.329 - fi 12.330 - case "$extension" in 12.331 - zip) echo "Unzipping $installdir/$filename..." 12.332 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked) 12.333 - ;; 12.334 - tar.gz) echo "Untaring $installdir/$filename..." 12.335 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) 12.336 - ;; 12.337 - tgz) echo "Untaring $installdir/$filename..." 12.338 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) 12.339 - ;; 12.340 - *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension]) 12.341 - ;; 12.342 - esac 12.343 + # $1 is for example mymodule 12.344 + # $2 is for example libs/general/libmymod_1_2_3.zip 12.345 + # $3 is for example ftp://mybuilddeps.myserver.com/builddeps 12.346 + # $4 is for example /localhome/builddeps 12.347 + # $5 is the name of the variable into which we store the depdir, eg MYMOD 12.348 + # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and 12.349 + # unzip into the directory: /localhome/builddeps/libmymod_1_2_3 12.350 + filename=`basename $2` 12.351 + filebase=`echo $filename | sed 's/\.[[^\.]]*$//'` 12.352 + filebase=${filename%%.*} 12.353 + extension=${filename#*.} 12.354 + installdir=$4/$filebase 12.355 + if test ! -f $installdir/$filename.unpacked; then 12.356 + AC_MSG_NOTICE([Downloading build dependency $1 from $3/$2 and installing into $installdir]) 12.357 + if test ! -d $installdir; then 12.358 + mkdir -p $installdir 12.359 fi 12.360 - if test -f $installdir/$filename.unpacked; then 12.361 - $5=$installdir 12.362 + if test ! -d $installdir; then 12.363 + AC_MSG_ERROR([Could not create directory $installdir]) 12.364 fi 12.365 + tmpfile=`mktemp $installdir/$1.XXXXXXXXX` 12.366 + touch $tmpfile 12.367 + if test ! -f $tmpfile; then 12.368 + AC_MSG_ERROR([Could not create files in directory $installdir]) 12.369 + fi 12.370 + BDEPS_FTPGET([$3/$2] , [$tmpfile]) 12.371 + mv $tmpfile $installdir/$filename 12.372 + if test ! -s $installdir/$filename; then 12.373 + AC_MSG_ERROR([Could not download $3/$2]) 12.374 + fi 12.375 + case "$extension" in 12.376 + zip) echo "Unzipping $installdir/$filename..." 12.377 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked) 12.378 + ;; 12.379 + tar.gz) echo "Untaring $installdir/$filename..." 12.380 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) 12.381 + ;; 12.382 + tgz) echo "Untaring $installdir/$filename..." 12.383 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) 12.384 + ;; 12.385 + *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension]) 12.386 + ;; 12.387 + esac 12.388 + fi 12.389 + if test -f $installdir/$filename.unpacked; then 12.390 + $5=$installdir 12.391 + fi 12.392 ]) 12.393 12.394 AC_DEFUN_ONCE([BDEPS_CONFIGURE_BUILDDEPS], 12.395 [ 12.396 -AC_ARG_WITH(builddeps-conf, [AS_HELP_STRING([--with-builddeps-conf], 12.397 - [use this configuration file for the builddeps])]) 12.398 + AC_ARG_WITH(builddeps-conf, [AS_HELP_STRING([--with-builddeps-conf], 12.399 + [use this configuration file for the builddeps])]) 12.400 12.401 -AC_ARG_WITH(builddeps-server, [AS_HELP_STRING([--with-builddeps-server], 12.402 - [download and use build dependencies from this server url])]) 12.403 + AC_ARG_WITH(builddeps-server, [AS_HELP_STRING([--with-builddeps-server], 12.404 + [download and use build dependencies from this server url])]) 12.405 12.406 -AC_ARG_WITH(builddeps-dir, [AS_HELP_STRING([--with-builddeps-dir], 12.407 - [store downloaded build dependencies here @<:@/localhome/builddeps@:>@])], 12.408 - [], 12.409 - [with_builddeps_dir=/localhome/builddeps]) 12.410 + AC_ARG_WITH(builddeps-dir, [AS_HELP_STRING([--with-builddeps-dir], 12.411 + [store downloaded build dependencies here @<:@/localhome/builddeps@:>@])], 12.412 + [], 12.413 + [with_builddeps_dir=/localhome/builddeps]) 12.414 12.415 -AC_ARG_WITH(builddeps-group, [AS_HELP_STRING([--with-builddeps-group], 12.416 - [chgrp the downloaded build dependencies to this group])]) 12.417 + AC_ARG_WITH(builddeps-group, [AS_HELP_STRING([--with-builddeps-group], 12.418 + [chgrp the downloaded build dependencies to this group])]) 12.419 ])
13.1 --- a/common/autoconf/compare.sh.in Wed Oct 16 13:50:05 2013 +0200 13.2 +++ b/common/autoconf/compare.sh.in Thu Oct 17 13:53:08 2013 -0700 13.3 @@ -22,7 +22,7 @@ 13.4 # questions. 13.5 # 13.6 13.7 -# This script is processed by configure before it's usable. It is run from 13.8 +# This script is processed by configure before it's usable. It is run from 13.9 # the root of the build directory. 13.10 13.11 13.12 @@ -67,14 +67,14 @@ 13.13 SRC_ROOT="@SRC_ROOT@" 13.14 13.15 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 13.16 - PATH="@VS_PATH@" 13.17 + PATH="@VS_PATH@" 13.18 fi 13.19 13.20 # Now locate the main script and run it. 13.21 REAL_COMPARE_SCRIPT="$SRC_ROOT/common/bin/compare.sh" 13.22 if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then 13.23 - echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT" 13.24 - exit 1 13.25 + echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT" 13.26 + exit 1 13.27 fi 13.28 13.29 . "$REAL_COMPARE_SCRIPT" "$@"
14.1 --- a/common/autoconf/config.h.in Wed Oct 16 13:50:05 2013 +0200 14.2 +++ b/common/autoconf/config.h.in Thu Oct 17 13:53:08 2013 -0700 14.3 @@ -46,4 +46,4 @@ 14.4 #define HAVE_LIBGIF 14.5 #define HAVE_LIBZ 14.6 #define HAVE_LIBM 14.7 -#define HAVE_ALTZONE 14.8 +#define HAVE_ALTZONE
15.1 --- a/common/autoconf/configure Wed Oct 16 13:50:05 2013 +0200 15.2 +++ b/common/autoconf/configure Thu Oct 17 13:53:08 2013 -0700 15.3 @@ -88,7 +88,6 @@ 15.4 check_autoconf_timestamps 15.5 fi 15.6 fi 15.7 - 15.8 fi 15.9 } 15.10 15.11 @@ -106,7 +105,7 @@ 15.12 fi 15.13 fi 15.14 15.15 -# Autoconf calls the configure script recursively sometimes. 15.16 +# Autoconf calls the configure script recursively sometimes. 15.17 # Don't start logging twice in that case 15.18 if test "x$conf_debug_configure" = xtrue; then 15.19 conf_debug_configure=recursive 15.20 @@ -120,28 +119,28 @@ 15.21 for conf_option 15.22 do 15.23 case $conf_option in 15.24 - --openjdk-target=*) 15.25 - conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'` 15.26 - continue ;; 15.27 - --debug-configure) 15.28 - if test "x$conf_debug_configure" != xrecursive; then 15.29 - conf_debug_configure=true 15.30 - export conf_debug_configure 15.31 - fi 15.32 - continue ;; 15.33 - *) 15.34 - conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;; 15.35 + --openjdk-target=*) 15.36 + conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'` 15.37 + continue ;; 15.38 + --debug-configure) 15.39 + if test "x$conf_debug_configure" != xrecursive; then 15.40 + conf_debug_configure=true 15.41 + export conf_debug_configure 15.42 + fi 15.43 + continue ;; 15.44 + *) 15.45 + conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;; 15.46 esac 15.47 15.48 case $conf_option in 15.49 - -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*) 15.50 - conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; 15.51 - -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) 15.52 - conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; 15.53 - -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*) 15.54 - conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; 15.55 - -help | --help | --hel | --he | -h) 15.56 - conf_print_help=true ;; 15.57 + -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*) 15.58 + conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; 15.59 + -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) 15.60 + conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; 15.61 + -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*) 15.62 + conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; 15.63 + -help | --help | --hel | --he | -h) 15.64 + conf_print_help=true ;; 15.65 esac 15.66 done 15.67 15.68 @@ -179,7 +178,7 @@ 15.69 else 15.70 echo Running generated-configure.sh 15.71 conf_script_to_run=$conf_script_dir/generated-configure.sh 15.72 -fi 15.73 +fi 15.74 15.75 if test "x$conf_debug_configure" != x; then 15.76 # Turn on shell debug output if requested (initial or recursive)
16.1 --- a/common/autoconf/configure.ac Wed Oct 16 13:50:05 2013 +0200 16.2 +++ b/common/autoconf/configure.ac Thu Oct 17 13:53:08 2013 -0700 16.3 @@ -236,7 +236,7 @@ 16.4 # Create the actual output files. Now the main work of configure is done. 16.5 AC_OUTPUT 16.6 16.7 -# Try to move the config.log file to the output directory. 16.8 +# Try to move the config.log file to the output directory. 16.9 if test -e ./config.log; then 16.10 $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null 16.11 fi
17.1 --- a/common/autoconf/generated-configure.sh Wed Oct 16 13:50:05 2013 +0200 17.2 +++ b/common/autoconf/generated-configure.sh Thu Oct 17 13:53:08 2013 -0700 17.3 @@ -3112,7 +3112,7 @@ 17.4 # 17.5 17.6 # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3) 17.7 -# If so, then append $1 to $2\ 17.8 +# If so, then append $1 to $2 \ 17.9 # Also set JVM_ARG_OK to true/false depending on outcome. 17.10 17.11 17.12 @@ -3441,74 +3441,74 @@ 17.13 17.14 17.15 cygwin_help() { 17.16 - case $1 in 17.17 + case $1 in 17.18 unzip) 17.19 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;; 17.20 + PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;; 17.21 zip) 17.22 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;; 17.23 + PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;; 17.24 make) 17.25 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;; 17.26 + PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;; 17.27 * ) 17.28 - break ;; 17.29 - esac 17.30 + break ;; 17.31 + esac 17.32 } 17.33 17.34 apt_help() { 17.35 - case $1 in 17.36 + case $1 in 17.37 devkit) 17.38 - PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;; 17.39 + PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;; 17.40 openjdk) 17.41 - PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;; 17.42 + PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;; 17.43 alsa) 17.44 - PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;; 17.45 + PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;; 17.46 cups) 17.47 - PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;; 17.48 + PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;; 17.49 freetype2) 17.50 - PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;; 17.51 + PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;; 17.52 pulse) 17.53 - PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;; 17.54 + PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;; 17.55 x11) 17.56 - PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;; 17.57 + PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;; 17.58 ccache) 17.59 - PKGHANDLER_COMMAND="sudo apt-get install ccache" ;; 17.60 + PKGHANDLER_COMMAND="sudo apt-get install ccache" ;; 17.61 * ) 17.62 - break ;; 17.63 - esac 17.64 + break ;; 17.65 + esac 17.66 } 17.67 17.68 yum_help() { 17.69 - case $1 in 17.70 + case $1 in 17.71 devkit) 17.72 - PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;; 17.73 + PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;; 17.74 openjdk) 17.75 - PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;; 17.76 + PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;; 17.77 alsa) 17.78 - PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;; 17.79 + PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;; 17.80 cups) 17.81 - PKGHANDLER_COMMAND="sudo yum install cups-devel" ;; 17.82 + PKGHANDLER_COMMAND="sudo yum install cups-devel" ;; 17.83 freetype2) 17.84 - PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;; 17.85 + PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;; 17.86 pulse) 17.87 - PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;; 17.88 + PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;; 17.89 x11) 17.90 - PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;; 17.91 + PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;; 17.92 ccache) 17.93 - PKGHANDLER_COMMAND="sudo yum install ccache" ;; 17.94 + PKGHANDLER_COMMAND="sudo yum install ccache" ;; 17.95 * ) 17.96 - break ;; 17.97 - esac 17.98 + break ;; 17.99 + esac 17.100 } 17.101 17.102 port_help() { 17.103 - PKGHANDLER_COMMAND="" 17.104 + PKGHANDLER_COMMAND="" 17.105 } 17.106 17.107 pkgutil_help() { 17.108 - PKGHANDLER_COMMAND="" 17.109 + PKGHANDLER_COMMAND="" 17.110 } 17.111 17.112 pkgadd_help() { 17.113 - PKGHANDLER_COMMAND="" 17.114 + PKGHANDLER_COMMAND="" 17.115 } 17.116 17.117 17.118 @@ -3662,8 +3662,8 @@ 17.119 # doing anything else with these values. 17.120 17.121 17.122 - # Setup the legacy variables, for controlling the old makefiles. 17.123 - # 17.124 +# Setup the legacy variables, for controlling the old makefiles. 17.125 +# 17.126 17.127 17.128 17.129 @@ -3818,7 +3818,7 @@ 17.130 #CUSTOM_AUTOCONF_INCLUDE 17.131 17.132 # Do not change or remove the following line, it is needed for consistency checks: 17.133 -DATE_WHEN_GENERATED=1381162713 17.134 +DATE_WHEN_GENERATED=1381407169 17.135 17.136 ############################################################################### 17.137 # 17.138 @@ -3831,26 +3831,26 @@ 17.139 17.140 # Basic initialization that must happen first of all 17.141 17.142 -# Save the original command line. This is passed to us by the wrapper configure script. 17.143 - 17.144 -DATE_WHEN_CONFIGURED=`LANG=C date` 17.145 - 17.146 -{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuration created at $DATE_WHEN_CONFIGURED." >&5 17.147 + # Save the original command line. This is passed to us by the wrapper configure script. 17.148 + 17.149 + DATE_WHEN_CONFIGURED=`LANG=C date` 17.150 + 17.151 + { $as_echo "$as_me:${as_lineno-$LINENO}: Configuration created at $DATE_WHEN_CONFIGURED." >&5 17.152 $as_echo "$as_me: Configuration created at $DATE_WHEN_CONFIGURED." >&6;} 17.153 -{ $as_echo "$as_me:${as_lineno-$LINENO}: configure script generated at timestamp $DATE_WHEN_GENERATED." >&5 17.154 + { $as_echo "$as_me:${as_lineno-$LINENO}: configure script generated at timestamp $DATE_WHEN_GENERATED." >&5 17.155 $as_echo "$as_me: configure script generated at timestamp $DATE_WHEN_GENERATED." >&6;} 17.156 17.157 17.158 17.159 -# Start with tools that do not need have cross compilation support 17.160 -# and can be expected to be found in the default PATH. These tools are 17.161 -# used by configure. Nor are these tools expected to be found in the 17.162 -# devkit from the builddeps server either, since they are 17.163 -# needed to download the devkit. 17.164 - 17.165 -# First are all the simple required tools. 17.166 - 17.167 - for ac_prog in basename 17.168 + # Start with tools that do not need have cross compilation support 17.169 + # and can be expected to be found in the default PATH. These tools are 17.170 + # used by configure. Nor are these tools expected to be found in the 17.171 + # devkit from the builddeps server either, since they are 17.172 + # needed to download the devkit. 17.173 + 17.174 + # First are all the simple required tools. 17.175 + 17.176 + for ac_prog in basename 17.177 do 17.178 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.179 set dummy $ac_prog; ac_word=$2 17.180 @@ -3896,20 +3896,20 @@ 17.181 done 17.182 17.183 17.184 - if test "x$BASENAME" = x; then 17.185 - if test "xbasename" = x; then 17.186 - PROG_NAME=basename 17.187 - else 17.188 - PROG_NAME=basename 17.189 - fi 17.190 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.191 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.192 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.193 - fi 17.194 - 17.195 - 17.196 - 17.197 - for ac_prog in bash 17.198 + if test "x$BASENAME" = x; then 17.199 + if test "xbasename" = x; then 17.200 + PROG_NAME=basename 17.201 + else 17.202 + PROG_NAME=basename 17.203 + fi 17.204 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.205 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.206 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.207 + fi 17.208 + 17.209 + 17.210 + 17.211 + for ac_prog in bash 17.212 do 17.213 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.214 set dummy $ac_prog; ac_word=$2 17.215 @@ -3955,20 +3955,20 @@ 17.216 done 17.217 17.218 17.219 - if test "x$BASH" = x; then 17.220 - if test "xbash" = x; then 17.221 - PROG_NAME=bash 17.222 - else 17.223 - PROG_NAME=bash 17.224 - fi 17.225 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.226 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.227 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.228 - fi 17.229 - 17.230 - 17.231 - 17.232 - for ac_prog in cat 17.233 + if test "x$BASH" = x; then 17.234 + if test "xbash" = x; then 17.235 + PROG_NAME=bash 17.236 + else 17.237 + PROG_NAME=bash 17.238 + fi 17.239 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.240 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.241 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.242 + fi 17.243 + 17.244 + 17.245 + 17.246 + for ac_prog in cat 17.247 do 17.248 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.249 set dummy $ac_prog; ac_word=$2 17.250 @@ -4014,20 +4014,20 @@ 17.251 done 17.252 17.253 17.254 - if test "x$CAT" = x; then 17.255 - if test "xcat" = x; then 17.256 - PROG_NAME=cat 17.257 - else 17.258 - PROG_NAME=cat 17.259 - fi 17.260 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.261 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.262 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.263 - fi 17.264 - 17.265 - 17.266 - 17.267 - for ac_prog in chmod 17.268 + if test "x$CAT" = x; then 17.269 + if test "xcat" = x; then 17.270 + PROG_NAME=cat 17.271 + else 17.272 + PROG_NAME=cat 17.273 + fi 17.274 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.275 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.276 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.277 + fi 17.278 + 17.279 + 17.280 + 17.281 + for ac_prog in chmod 17.282 do 17.283 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.284 set dummy $ac_prog; ac_word=$2 17.285 @@ -4073,20 +4073,20 @@ 17.286 done 17.287 17.288 17.289 - if test "x$CHMOD" = x; then 17.290 - if test "xchmod" = x; then 17.291 - PROG_NAME=chmod 17.292 - else 17.293 - PROG_NAME=chmod 17.294 - fi 17.295 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.296 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.297 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.298 - fi 17.299 - 17.300 - 17.301 - 17.302 - for ac_prog in cmp 17.303 + if test "x$CHMOD" = x; then 17.304 + if test "xchmod" = x; then 17.305 + PROG_NAME=chmod 17.306 + else 17.307 + PROG_NAME=chmod 17.308 + fi 17.309 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.310 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.311 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.312 + fi 17.313 + 17.314 + 17.315 + 17.316 + for ac_prog in cmp 17.317 do 17.318 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.319 set dummy $ac_prog; ac_word=$2 17.320 @@ -4132,20 +4132,20 @@ 17.321 done 17.322 17.323 17.324 - if test "x$CMP" = x; then 17.325 - if test "xcmp" = x; then 17.326 - PROG_NAME=cmp 17.327 - else 17.328 - PROG_NAME=cmp 17.329 - fi 17.330 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.331 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.332 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.333 - fi 17.334 - 17.335 - 17.336 - 17.337 - for ac_prog in comm 17.338 + if test "x$CMP" = x; then 17.339 + if test "xcmp" = x; then 17.340 + PROG_NAME=cmp 17.341 + else 17.342 + PROG_NAME=cmp 17.343 + fi 17.344 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.345 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.346 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.347 + fi 17.348 + 17.349 + 17.350 + 17.351 + for ac_prog in comm 17.352 do 17.353 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.354 set dummy $ac_prog; ac_word=$2 17.355 @@ -4191,20 +4191,20 @@ 17.356 done 17.357 17.358 17.359 - if test "x$COMM" = x; then 17.360 - if test "xcomm" = x; then 17.361 - PROG_NAME=comm 17.362 - else 17.363 - PROG_NAME=comm 17.364 - fi 17.365 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.366 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.367 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.368 - fi 17.369 - 17.370 - 17.371 - 17.372 - for ac_prog in cp 17.373 + if test "x$COMM" = x; then 17.374 + if test "xcomm" = x; then 17.375 + PROG_NAME=comm 17.376 + else 17.377 + PROG_NAME=comm 17.378 + fi 17.379 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.380 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.381 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.382 + fi 17.383 + 17.384 + 17.385 + 17.386 + for ac_prog in cp 17.387 do 17.388 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.389 set dummy $ac_prog; ac_word=$2 17.390 @@ -4250,20 +4250,20 @@ 17.391 done 17.392 17.393 17.394 - if test "x$CP" = x; then 17.395 - if test "xcp" = x; then 17.396 - PROG_NAME=cp 17.397 - else 17.398 - PROG_NAME=cp 17.399 - fi 17.400 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.401 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.402 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.403 - fi 17.404 - 17.405 - 17.406 - 17.407 - for ac_prog in cpio 17.408 + if test "x$CP" = x; then 17.409 + if test "xcp" = x; then 17.410 + PROG_NAME=cp 17.411 + else 17.412 + PROG_NAME=cp 17.413 + fi 17.414 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.415 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.416 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.417 + fi 17.418 + 17.419 + 17.420 + 17.421 + for ac_prog in cpio 17.422 do 17.423 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.424 set dummy $ac_prog; ac_word=$2 17.425 @@ -4309,20 +4309,20 @@ 17.426 done 17.427 17.428 17.429 - if test "x$CPIO" = x; then 17.430 - if test "xcpio" = x; then 17.431 - PROG_NAME=cpio 17.432 - else 17.433 - PROG_NAME=cpio 17.434 - fi 17.435 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.436 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.437 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.438 - fi 17.439 - 17.440 - 17.441 - 17.442 - for ac_prog in cut 17.443 + if test "x$CPIO" = x; then 17.444 + if test "xcpio" = x; then 17.445 + PROG_NAME=cpio 17.446 + else 17.447 + PROG_NAME=cpio 17.448 + fi 17.449 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.450 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.451 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.452 + fi 17.453 + 17.454 + 17.455 + 17.456 + for ac_prog in cut 17.457 do 17.458 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.459 set dummy $ac_prog; ac_word=$2 17.460 @@ -4368,20 +4368,20 @@ 17.461 done 17.462 17.463 17.464 - if test "x$CUT" = x; then 17.465 - if test "xcut" = x; then 17.466 - PROG_NAME=cut 17.467 - else 17.468 - PROG_NAME=cut 17.469 - fi 17.470 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.471 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.472 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.473 - fi 17.474 - 17.475 - 17.476 - 17.477 - for ac_prog in date 17.478 + if test "x$CUT" = x; then 17.479 + if test "xcut" = x; then 17.480 + PROG_NAME=cut 17.481 + else 17.482 + PROG_NAME=cut 17.483 + fi 17.484 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.485 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.486 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.487 + fi 17.488 + 17.489 + 17.490 + 17.491 + for ac_prog in date 17.492 do 17.493 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.494 set dummy $ac_prog; ac_word=$2 17.495 @@ -4427,20 +4427,20 @@ 17.496 done 17.497 17.498 17.499 - if test "x$DATE" = x; then 17.500 - if test "xdate" = x; then 17.501 - PROG_NAME=date 17.502 - else 17.503 - PROG_NAME=date 17.504 - fi 17.505 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.506 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.507 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.508 - fi 17.509 - 17.510 - 17.511 - 17.512 - for ac_prog in gdiff diff 17.513 + if test "x$DATE" = x; then 17.514 + if test "xdate" = x; then 17.515 + PROG_NAME=date 17.516 + else 17.517 + PROG_NAME=date 17.518 + fi 17.519 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.520 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.521 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.522 + fi 17.523 + 17.524 + 17.525 + 17.526 + for ac_prog in gdiff diff 17.527 do 17.528 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.529 set dummy $ac_prog; ac_word=$2 17.530 @@ -4486,20 +4486,20 @@ 17.531 done 17.532 17.533 17.534 - if test "x$DIFF" = x; then 17.535 - if test "xgdiff diff" = x; then 17.536 - PROG_NAME=diff 17.537 - else 17.538 - PROG_NAME=gdiff diff 17.539 - fi 17.540 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.541 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.542 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.543 - fi 17.544 - 17.545 - 17.546 - 17.547 - for ac_prog in dirname 17.548 + if test "x$DIFF" = x; then 17.549 + if test "xgdiff diff" = x; then 17.550 + PROG_NAME=diff 17.551 + else 17.552 + PROG_NAME=gdiff diff 17.553 + fi 17.554 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.555 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.556 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.557 + fi 17.558 + 17.559 + 17.560 + 17.561 + for ac_prog in dirname 17.562 do 17.563 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.564 set dummy $ac_prog; ac_word=$2 17.565 @@ -4545,20 +4545,20 @@ 17.566 done 17.567 17.568 17.569 - if test "x$DIRNAME" = x; then 17.570 - if test "xdirname" = x; then 17.571 - PROG_NAME=dirname 17.572 - else 17.573 - PROG_NAME=dirname 17.574 - fi 17.575 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.576 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.577 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.578 - fi 17.579 - 17.580 - 17.581 - 17.582 - for ac_prog in echo 17.583 + if test "x$DIRNAME" = x; then 17.584 + if test "xdirname" = x; then 17.585 + PROG_NAME=dirname 17.586 + else 17.587 + PROG_NAME=dirname 17.588 + fi 17.589 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.590 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.591 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.592 + fi 17.593 + 17.594 + 17.595 + 17.596 + for ac_prog in echo 17.597 do 17.598 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.599 set dummy $ac_prog; ac_word=$2 17.600 @@ -4604,20 +4604,20 @@ 17.601 done 17.602 17.603 17.604 - if test "x$ECHO" = x; then 17.605 - if test "xecho" = x; then 17.606 - PROG_NAME=echo 17.607 - else 17.608 - PROG_NAME=echo 17.609 - fi 17.610 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.611 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.612 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.613 - fi 17.614 - 17.615 - 17.616 - 17.617 - for ac_prog in expr 17.618 + if test "x$ECHO" = x; then 17.619 + if test "xecho" = x; then 17.620 + PROG_NAME=echo 17.621 + else 17.622 + PROG_NAME=echo 17.623 + fi 17.624 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.625 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.626 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.627 + fi 17.628 + 17.629 + 17.630 + 17.631 + for ac_prog in expr 17.632 do 17.633 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.634 set dummy $ac_prog; ac_word=$2 17.635 @@ -4663,20 +4663,20 @@ 17.636 done 17.637 17.638 17.639 - if test "x$EXPR" = x; then 17.640 - if test "xexpr" = x; then 17.641 - PROG_NAME=expr 17.642 - else 17.643 - PROG_NAME=expr 17.644 - fi 17.645 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.646 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.647 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.648 - fi 17.649 - 17.650 - 17.651 - 17.652 - for ac_prog in file 17.653 + if test "x$EXPR" = x; then 17.654 + if test "xexpr" = x; then 17.655 + PROG_NAME=expr 17.656 + else 17.657 + PROG_NAME=expr 17.658 + fi 17.659 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.660 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.661 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.662 + fi 17.663 + 17.664 + 17.665 + 17.666 + for ac_prog in file 17.667 do 17.668 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.669 set dummy $ac_prog; ac_word=$2 17.670 @@ -4722,20 +4722,20 @@ 17.671 done 17.672 17.673 17.674 - if test "x$FILE" = x; then 17.675 - if test "xfile" = x; then 17.676 - PROG_NAME=file 17.677 - else 17.678 - PROG_NAME=file 17.679 - fi 17.680 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.681 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.682 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.683 - fi 17.684 - 17.685 - 17.686 - 17.687 - for ac_prog in find 17.688 + if test "x$FILE" = x; then 17.689 + if test "xfile" = x; then 17.690 + PROG_NAME=file 17.691 + else 17.692 + PROG_NAME=file 17.693 + fi 17.694 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.695 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.696 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.697 + fi 17.698 + 17.699 + 17.700 + 17.701 + for ac_prog in find 17.702 do 17.703 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.704 set dummy $ac_prog; ac_word=$2 17.705 @@ -4781,20 +4781,20 @@ 17.706 done 17.707 17.708 17.709 - if test "x$FIND" = x; then 17.710 - if test "xfind" = x; then 17.711 - PROG_NAME=find 17.712 - else 17.713 - PROG_NAME=find 17.714 - fi 17.715 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.716 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.717 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.718 - fi 17.719 - 17.720 - 17.721 - 17.722 - for ac_prog in head 17.723 + if test "x$FIND" = x; then 17.724 + if test "xfind" = x; then 17.725 + PROG_NAME=find 17.726 + else 17.727 + PROG_NAME=find 17.728 + fi 17.729 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.730 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.731 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.732 + fi 17.733 + 17.734 + 17.735 + 17.736 + for ac_prog in head 17.737 do 17.738 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.739 set dummy $ac_prog; ac_word=$2 17.740 @@ -4840,20 +4840,20 @@ 17.741 done 17.742 17.743 17.744 - if test "x$HEAD" = x; then 17.745 - if test "xhead" = x; then 17.746 - PROG_NAME=head 17.747 - else 17.748 - PROG_NAME=head 17.749 - fi 17.750 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.751 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.752 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.753 - fi 17.754 - 17.755 - 17.756 - 17.757 - for ac_prog in ln 17.758 + if test "x$HEAD" = x; then 17.759 + if test "xhead" = x; then 17.760 + PROG_NAME=head 17.761 + else 17.762 + PROG_NAME=head 17.763 + fi 17.764 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.765 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.766 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.767 + fi 17.768 + 17.769 + 17.770 + 17.771 + for ac_prog in ln 17.772 do 17.773 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.774 set dummy $ac_prog; ac_word=$2 17.775 @@ -4899,20 +4899,20 @@ 17.776 done 17.777 17.778 17.779 - if test "x$LN" = x; then 17.780 - if test "xln" = x; then 17.781 - PROG_NAME=ln 17.782 - else 17.783 - PROG_NAME=ln 17.784 - fi 17.785 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.786 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.787 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.788 - fi 17.789 - 17.790 - 17.791 - 17.792 - for ac_prog in ls 17.793 + if test "x$LN" = x; then 17.794 + if test "xln" = x; then 17.795 + PROG_NAME=ln 17.796 + else 17.797 + PROG_NAME=ln 17.798 + fi 17.799 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.800 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.801 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.802 + fi 17.803 + 17.804 + 17.805 + 17.806 + for ac_prog in ls 17.807 do 17.808 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.809 set dummy $ac_prog; ac_word=$2 17.810 @@ -4958,20 +4958,20 @@ 17.811 done 17.812 17.813 17.814 - if test "x$LS" = x; then 17.815 - if test "xls" = x; then 17.816 - PROG_NAME=ls 17.817 - else 17.818 - PROG_NAME=ls 17.819 - fi 17.820 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.821 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.822 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.823 - fi 17.824 - 17.825 - 17.826 - 17.827 - for ac_prog in mkdir 17.828 + if test "x$LS" = x; then 17.829 + if test "xls" = x; then 17.830 + PROG_NAME=ls 17.831 + else 17.832 + PROG_NAME=ls 17.833 + fi 17.834 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.835 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.836 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.837 + fi 17.838 + 17.839 + 17.840 + 17.841 + for ac_prog in mkdir 17.842 do 17.843 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.844 set dummy $ac_prog; ac_word=$2 17.845 @@ -5017,20 +5017,20 @@ 17.846 done 17.847 17.848 17.849 - if test "x$MKDIR" = x; then 17.850 - if test "xmkdir" = x; then 17.851 - PROG_NAME=mkdir 17.852 - else 17.853 - PROG_NAME=mkdir 17.854 - fi 17.855 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.856 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.857 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.858 - fi 17.859 - 17.860 - 17.861 - 17.862 - for ac_prog in mktemp 17.863 + if test "x$MKDIR" = x; then 17.864 + if test "xmkdir" = x; then 17.865 + PROG_NAME=mkdir 17.866 + else 17.867 + PROG_NAME=mkdir 17.868 + fi 17.869 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.870 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.871 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.872 + fi 17.873 + 17.874 + 17.875 + 17.876 + for ac_prog in mktemp 17.877 do 17.878 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.879 set dummy $ac_prog; ac_word=$2 17.880 @@ -5076,20 +5076,20 @@ 17.881 done 17.882 17.883 17.884 - if test "x$MKTEMP" = x; then 17.885 - if test "xmktemp" = x; then 17.886 - PROG_NAME=mktemp 17.887 - else 17.888 - PROG_NAME=mktemp 17.889 - fi 17.890 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.891 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.892 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.893 - fi 17.894 - 17.895 - 17.896 - 17.897 - for ac_prog in mv 17.898 + if test "x$MKTEMP" = x; then 17.899 + if test "xmktemp" = x; then 17.900 + PROG_NAME=mktemp 17.901 + else 17.902 + PROG_NAME=mktemp 17.903 + fi 17.904 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.905 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.906 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.907 + fi 17.908 + 17.909 + 17.910 + 17.911 + for ac_prog in mv 17.912 do 17.913 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.914 set dummy $ac_prog; ac_word=$2 17.915 @@ -5135,20 +5135,20 @@ 17.916 done 17.917 17.918 17.919 - if test "x$MV" = x; then 17.920 - if test "xmv" = x; then 17.921 - PROG_NAME=mv 17.922 - else 17.923 - PROG_NAME=mv 17.924 - fi 17.925 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.926 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.927 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.928 - fi 17.929 - 17.930 - 17.931 - 17.932 - for ac_prog in printf 17.933 + if test "x$MV" = x; then 17.934 + if test "xmv" = x; then 17.935 + PROG_NAME=mv 17.936 + else 17.937 + PROG_NAME=mv 17.938 + fi 17.939 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.940 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.941 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.942 + fi 17.943 + 17.944 + 17.945 + 17.946 + for ac_prog in printf 17.947 do 17.948 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.949 set dummy $ac_prog; ac_word=$2 17.950 @@ -5194,20 +5194,20 @@ 17.951 done 17.952 17.953 17.954 - if test "x$PRINTF" = x; then 17.955 - if test "xprintf" = x; then 17.956 - PROG_NAME=printf 17.957 - else 17.958 - PROG_NAME=printf 17.959 - fi 17.960 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.961 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.962 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.963 - fi 17.964 - 17.965 - 17.966 - 17.967 - for ac_prog in rm 17.968 + if test "x$PRINTF" = x; then 17.969 + if test "xprintf" = x; then 17.970 + PROG_NAME=printf 17.971 + else 17.972 + PROG_NAME=printf 17.973 + fi 17.974 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.975 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.976 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.977 + fi 17.978 + 17.979 + 17.980 + 17.981 + for ac_prog in rm 17.982 do 17.983 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.984 set dummy $ac_prog; ac_word=$2 17.985 @@ -5253,20 +5253,20 @@ 17.986 done 17.987 17.988 17.989 - if test "x$RM" = x; then 17.990 - if test "xrm" = x; then 17.991 - PROG_NAME=rm 17.992 - else 17.993 - PROG_NAME=rm 17.994 - fi 17.995 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.996 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.997 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.998 - fi 17.999 - 17.1000 - 17.1001 - 17.1002 - for ac_prog in sh 17.1003 + if test "x$RM" = x; then 17.1004 + if test "xrm" = x; then 17.1005 + PROG_NAME=rm 17.1006 + else 17.1007 + PROG_NAME=rm 17.1008 + fi 17.1009 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1010 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1011 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1012 + fi 17.1013 + 17.1014 + 17.1015 + 17.1016 + for ac_prog in sh 17.1017 do 17.1018 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1019 set dummy $ac_prog; ac_word=$2 17.1020 @@ -5312,20 +5312,20 @@ 17.1021 done 17.1022 17.1023 17.1024 - if test "x$SH" = x; then 17.1025 - if test "xsh" = x; then 17.1026 - PROG_NAME=sh 17.1027 - else 17.1028 - PROG_NAME=sh 17.1029 - fi 17.1030 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1031 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1032 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1033 - fi 17.1034 - 17.1035 - 17.1036 - 17.1037 - for ac_prog in sort 17.1038 + if test "x$SH" = x; then 17.1039 + if test "xsh" = x; then 17.1040 + PROG_NAME=sh 17.1041 + else 17.1042 + PROG_NAME=sh 17.1043 + fi 17.1044 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1045 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1046 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1047 + fi 17.1048 + 17.1049 + 17.1050 + 17.1051 + for ac_prog in sort 17.1052 do 17.1053 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1054 set dummy $ac_prog; ac_word=$2 17.1055 @@ -5371,20 +5371,20 @@ 17.1056 done 17.1057 17.1058 17.1059 - if test "x$SORT" = x; then 17.1060 - if test "xsort" = x; then 17.1061 - PROG_NAME=sort 17.1062 - else 17.1063 - PROG_NAME=sort 17.1064 - fi 17.1065 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1066 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1067 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1068 - fi 17.1069 - 17.1070 - 17.1071 - 17.1072 - for ac_prog in tail 17.1073 + if test "x$SORT" = x; then 17.1074 + if test "xsort" = x; then 17.1075 + PROG_NAME=sort 17.1076 + else 17.1077 + PROG_NAME=sort 17.1078 + fi 17.1079 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1080 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1081 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1082 + fi 17.1083 + 17.1084 + 17.1085 + 17.1086 + for ac_prog in tail 17.1087 do 17.1088 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1089 set dummy $ac_prog; ac_word=$2 17.1090 @@ -5430,20 +5430,20 @@ 17.1091 done 17.1092 17.1093 17.1094 - if test "x$TAIL" = x; then 17.1095 - if test "xtail" = x; then 17.1096 - PROG_NAME=tail 17.1097 - else 17.1098 - PROG_NAME=tail 17.1099 - fi 17.1100 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1101 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1102 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1103 - fi 17.1104 - 17.1105 - 17.1106 - 17.1107 - for ac_prog in tar 17.1108 + if test "x$TAIL" = x; then 17.1109 + if test "xtail" = x; then 17.1110 + PROG_NAME=tail 17.1111 + else 17.1112 + PROG_NAME=tail 17.1113 + fi 17.1114 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1115 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1116 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1117 + fi 17.1118 + 17.1119 + 17.1120 + 17.1121 + for ac_prog in tar 17.1122 do 17.1123 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1124 set dummy $ac_prog; ac_word=$2 17.1125 @@ -5489,20 +5489,20 @@ 17.1126 done 17.1127 17.1128 17.1129 - if test "x$TAR" = x; then 17.1130 - if test "xtar" = x; then 17.1131 - PROG_NAME=tar 17.1132 - else 17.1133 - PROG_NAME=tar 17.1134 - fi 17.1135 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1136 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1137 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1138 - fi 17.1139 - 17.1140 - 17.1141 - 17.1142 - for ac_prog in tee 17.1143 + if test "x$TAR" = x; then 17.1144 + if test "xtar" = x; then 17.1145 + PROG_NAME=tar 17.1146 + else 17.1147 + PROG_NAME=tar 17.1148 + fi 17.1149 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1150 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1151 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1152 + fi 17.1153 + 17.1154 + 17.1155 + 17.1156 + for ac_prog in tee 17.1157 do 17.1158 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1159 set dummy $ac_prog; ac_word=$2 17.1160 @@ -5548,20 +5548,20 @@ 17.1161 done 17.1162 17.1163 17.1164 - if test "x$TEE" = x; then 17.1165 - if test "xtee" = x; then 17.1166 - PROG_NAME=tee 17.1167 - else 17.1168 - PROG_NAME=tee 17.1169 - fi 17.1170 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1171 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1172 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1173 - fi 17.1174 - 17.1175 - 17.1176 - 17.1177 - for ac_prog in touch 17.1178 + if test "x$TEE" = x; then 17.1179 + if test "xtee" = x; then 17.1180 + PROG_NAME=tee 17.1181 + else 17.1182 + PROG_NAME=tee 17.1183 + fi 17.1184 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1185 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1186 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1187 + fi 17.1188 + 17.1189 + 17.1190 + 17.1191 + for ac_prog in touch 17.1192 do 17.1193 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1194 set dummy $ac_prog; ac_word=$2 17.1195 @@ -5607,20 +5607,20 @@ 17.1196 done 17.1197 17.1198 17.1199 - if test "x$TOUCH" = x; then 17.1200 - if test "xtouch" = x; then 17.1201 - PROG_NAME=touch 17.1202 - else 17.1203 - PROG_NAME=touch 17.1204 - fi 17.1205 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1206 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1207 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1208 - fi 17.1209 - 17.1210 - 17.1211 - 17.1212 - for ac_prog in tr 17.1213 + if test "x$TOUCH" = x; then 17.1214 + if test "xtouch" = x; then 17.1215 + PROG_NAME=touch 17.1216 + else 17.1217 + PROG_NAME=touch 17.1218 + fi 17.1219 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1220 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1221 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1222 + fi 17.1223 + 17.1224 + 17.1225 + 17.1226 + for ac_prog in tr 17.1227 do 17.1228 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1229 set dummy $ac_prog; ac_word=$2 17.1230 @@ -5666,20 +5666,20 @@ 17.1231 done 17.1232 17.1233 17.1234 - if test "x$TR" = x; then 17.1235 - if test "xtr" = x; then 17.1236 - PROG_NAME=tr 17.1237 - else 17.1238 - PROG_NAME=tr 17.1239 - fi 17.1240 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1241 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1242 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1243 - fi 17.1244 - 17.1245 - 17.1246 - 17.1247 - for ac_prog in uname 17.1248 + if test "x$TR" = x; then 17.1249 + if test "xtr" = x; then 17.1250 + PROG_NAME=tr 17.1251 + else 17.1252 + PROG_NAME=tr 17.1253 + fi 17.1254 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1255 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1256 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1257 + fi 17.1258 + 17.1259 + 17.1260 + 17.1261 + for ac_prog in uname 17.1262 do 17.1263 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1264 set dummy $ac_prog; ac_word=$2 17.1265 @@ -5725,20 +5725,20 @@ 17.1266 done 17.1267 17.1268 17.1269 - if test "x$UNAME" = x; then 17.1270 - if test "xuname" = x; then 17.1271 - PROG_NAME=uname 17.1272 - else 17.1273 - PROG_NAME=uname 17.1274 - fi 17.1275 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1276 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1277 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1278 - fi 17.1279 - 17.1280 - 17.1281 - 17.1282 - for ac_prog in uniq 17.1283 + if test "x$UNAME" = x; then 17.1284 + if test "xuname" = x; then 17.1285 + PROG_NAME=uname 17.1286 + else 17.1287 + PROG_NAME=uname 17.1288 + fi 17.1289 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1290 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1291 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1292 + fi 17.1293 + 17.1294 + 17.1295 + 17.1296 + for ac_prog in uniq 17.1297 do 17.1298 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1299 set dummy $ac_prog; ac_word=$2 17.1300 @@ -5784,20 +5784,20 @@ 17.1301 done 17.1302 17.1303 17.1304 - if test "x$UNIQ" = x; then 17.1305 - if test "xuniq" = x; then 17.1306 - PROG_NAME=uniq 17.1307 - else 17.1308 - PROG_NAME=uniq 17.1309 - fi 17.1310 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1311 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1312 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1313 - fi 17.1314 - 17.1315 - 17.1316 - 17.1317 - for ac_prog in wc 17.1318 + if test "x$UNIQ" = x; then 17.1319 + if test "xuniq" = x; then 17.1320 + PROG_NAME=uniq 17.1321 + else 17.1322 + PROG_NAME=uniq 17.1323 + fi 17.1324 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1325 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1326 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1327 + fi 17.1328 + 17.1329 + 17.1330 + 17.1331 + for ac_prog in wc 17.1332 do 17.1333 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1334 set dummy $ac_prog; ac_word=$2 17.1335 @@ -5843,20 +5843,20 @@ 17.1336 done 17.1337 17.1338 17.1339 - if test "x$WC" = x; then 17.1340 - if test "xwc" = x; then 17.1341 - PROG_NAME=wc 17.1342 - else 17.1343 - PROG_NAME=wc 17.1344 - fi 17.1345 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1346 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1347 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1348 - fi 17.1349 - 17.1350 - 17.1351 - 17.1352 - for ac_prog in which 17.1353 + if test "x$WC" = x; then 17.1354 + if test "xwc" = x; then 17.1355 + PROG_NAME=wc 17.1356 + else 17.1357 + PROG_NAME=wc 17.1358 + fi 17.1359 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1360 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1361 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1362 + fi 17.1363 + 17.1364 + 17.1365 + 17.1366 + for ac_prog in which 17.1367 do 17.1368 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1369 set dummy $ac_prog; ac_word=$2 17.1370 @@ -5902,20 +5902,20 @@ 17.1371 done 17.1372 17.1373 17.1374 - if test "x$WHICH" = x; then 17.1375 - if test "xwhich" = x; then 17.1376 - PROG_NAME=which 17.1377 - else 17.1378 - PROG_NAME=which 17.1379 - fi 17.1380 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1381 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1382 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1383 - fi 17.1384 - 17.1385 - 17.1386 - 17.1387 - for ac_prog in xargs 17.1388 + if test "x$WHICH" = x; then 17.1389 + if test "xwhich" = x; then 17.1390 + PROG_NAME=which 17.1391 + else 17.1392 + PROG_NAME=which 17.1393 + fi 17.1394 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1395 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1396 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1397 + fi 17.1398 + 17.1399 + 17.1400 + 17.1401 + for ac_prog in xargs 17.1402 do 17.1403 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1404 set dummy $ac_prog; ac_word=$2 17.1405 @@ -5961,21 +5961,21 @@ 17.1406 done 17.1407 17.1408 17.1409 - if test "x$XARGS" = x; then 17.1410 - if test "xxargs" = x; then 17.1411 - PROG_NAME=xargs 17.1412 - else 17.1413 - PROG_NAME=xargs 17.1414 - fi 17.1415 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1416 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1417 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1418 - fi 17.1419 - 17.1420 - 17.1421 - 17.1422 -# Then required tools that require some special treatment. 17.1423 -for ac_prog in gawk mawk nawk awk 17.1424 + if test "x$XARGS" = x; then 17.1425 + if test "xxargs" = x; then 17.1426 + PROG_NAME=xargs 17.1427 + else 17.1428 + PROG_NAME=xargs 17.1429 + fi 17.1430 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1431 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1432 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1433 + fi 17.1434 + 17.1435 + 17.1436 + 17.1437 + # Then required tools that require some special treatment. 17.1438 + for ac_prog in gawk mawk nawk awk 17.1439 do 17.1440 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1441 set dummy $ac_prog; ac_word=$2 17.1442 @@ -6018,18 +6018,18 @@ 17.1443 done 17.1444 17.1445 17.1446 - if test "x$AWK" = x; then 17.1447 - if test "x" = x; then 17.1448 - PROG_NAME=awk 17.1449 - else 17.1450 - PROG_NAME= 17.1451 - fi 17.1452 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1453 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1454 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1455 - fi 17.1456 - 17.1457 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 17.1458 + if test "x$AWK" = x; then 17.1459 + if test "x" = x; then 17.1460 + PROG_NAME=awk 17.1461 + else 17.1462 + PROG_NAME= 17.1463 + fi 17.1464 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1465 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1466 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1467 + fi 17.1468 + 17.1469 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 17.1470 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 17.1471 if ${ac_cv_path_GREP+:} false; then : 17.1472 $as_echo_n "(cached) " >&6 17.1473 @@ -6093,18 +6093,18 @@ 17.1474 17.1475 17.1476 17.1477 - if test "x$GREP" = x; then 17.1478 - if test "x" = x; then 17.1479 - PROG_NAME=grep 17.1480 - else 17.1481 - PROG_NAME= 17.1482 - fi 17.1483 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1484 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1485 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1486 - fi 17.1487 - 17.1488 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 17.1489 + if test "x$GREP" = x; then 17.1490 + if test "x" = x; then 17.1491 + PROG_NAME=grep 17.1492 + else 17.1493 + PROG_NAME= 17.1494 + fi 17.1495 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1496 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1497 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1498 + fi 17.1499 + 17.1500 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 17.1501 $as_echo_n "checking for egrep... " >&6; } 17.1502 if ${ac_cv_path_EGREP+:} false; then : 17.1503 $as_echo_n "(cached) " >&6 17.1504 @@ -6172,18 +6172,18 @@ 17.1505 17.1506 17.1507 17.1508 - if test "x$EGREP" = x; then 17.1509 - if test "x" = x; then 17.1510 - PROG_NAME=egrep 17.1511 - else 17.1512 - PROG_NAME= 17.1513 - fi 17.1514 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1515 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1516 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1517 - fi 17.1518 - 17.1519 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 17.1520 + if test "x$EGREP" = x; then 17.1521 + if test "x" = x; then 17.1522 + PROG_NAME=egrep 17.1523 + else 17.1524 + PROG_NAME= 17.1525 + fi 17.1526 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1527 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1528 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1529 + fi 17.1530 + 17.1531 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 17.1532 $as_echo_n "checking for fgrep... " >&6; } 17.1533 if ${ac_cv_path_FGREP+:} false; then : 17.1534 $as_echo_n "(cached) " >&6 17.1535 @@ -6251,18 +6251,18 @@ 17.1536 17.1537 17.1538 17.1539 - if test "x$FGREP" = x; then 17.1540 - if test "x" = x; then 17.1541 - PROG_NAME=fgrep 17.1542 - else 17.1543 - PROG_NAME= 17.1544 - fi 17.1545 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1546 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1547 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1548 - fi 17.1549 - 17.1550 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 17.1551 + if test "x$FGREP" = x; then 17.1552 + if test "x" = x; then 17.1553 + PROG_NAME=fgrep 17.1554 + else 17.1555 + PROG_NAME= 17.1556 + fi 17.1557 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1558 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1559 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1560 + fi 17.1561 + 17.1562 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 17.1563 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 17.1564 if ${ac_cv_path_SED+:} false; then : 17.1565 $as_echo_n "(cached) " >&6 17.1566 @@ -6332,19 +6332,19 @@ 17.1567 rm -f conftest.sed 17.1568 17.1569 17.1570 - if test "x$SED" = x; then 17.1571 - if test "x" = x; then 17.1572 - PROG_NAME=sed 17.1573 - else 17.1574 - PROG_NAME= 17.1575 - fi 17.1576 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1577 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1578 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1579 - fi 17.1580 - 17.1581 - 17.1582 -for ac_prog in nawk gawk awk 17.1583 + if test "x$SED" = x; then 17.1584 + if test "x" = x; then 17.1585 + PROG_NAME=sed 17.1586 + else 17.1587 + PROG_NAME= 17.1588 + fi 17.1589 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1590 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1591 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1592 + fi 17.1593 + 17.1594 + 17.1595 + for ac_prog in nawk gawk awk 17.1596 do 17.1597 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.1598 set dummy $ac_prog; ac_word=$2 17.1599 @@ -6390,27 +6390,27 @@ 17.1600 done 17.1601 17.1602 17.1603 - if test "x$NAWK" = x; then 17.1604 - if test "x" = x; then 17.1605 - PROG_NAME=nawk 17.1606 - else 17.1607 - PROG_NAME= 17.1608 - fi 17.1609 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1610 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1611 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.1612 - fi 17.1613 - 17.1614 - 17.1615 -# Always force rm. 17.1616 -RM="$RM -f" 17.1617 - 17.1618 -# pwd behaves differently on various platforms and some don't support the -L flag. 17.1619 -# Always use the bash builtin pwd to get uniform behavior. 17.1620 -THEPWDCMD=pwd 17.1621 - 17.1622 -# These are not required on all platforms 17.1623 -# Extract the first word of "cygpath", so it can be a program name with args. 17.1624 + if test "x$NAWK" = x; then 17.1625 + if test "x" = x; then 17.1626 + PROG_NAME=nawk 17.1627 + else 17.1628 + PROG_NAME= 17.1629 + fi 17.1630 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.1631 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.1632 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.1633 + fi 17.1634 + 17.1635 + 17.1636 + # Always force rm. 17.1637 + RM="$RM -f" 17.1638 + 17.1639 + # pwd behaves differently on various platforms and some don't support the -L flag. 17.1640 + # Always use the bash builtin pwd to get uniform behavior. 17.1641 + THEPWDCMD=pwd 17.1642 + 17.1643 + # These are not required on all platforms 17.1644 + # Extract the first word of "cygpath", so it can be a program name with args. 17.1645 set dummy cygpath; ac_word=$2 17.1646 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.1647 $as_echo_n "checking for $ac_word... " >&6; } 17.1648 @@ -6450,7 +6450,7 @@ 17.1649 fi 17.1650 17.1651 17.1652 -# Extract the first word of "readlink", so it can be a program name with args. 17.1653 + # Extract the first word of "readlink", so it can be a program name with args. 17.1654 set dummy readlink; ac_word=$2 17.1655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.1656 $as_echo_n "checking for $ac_word... " >&6; } 17.1657 @@ -6490,7 +6490,7 @@ 17.1658 fi 17.1659 17.1660 17.1661 -# Extract the first word of "df", so it can be a program name with args. 17.1662 + # Extract the first word of "df", so it can be a program name with args. 17.1663 set dummy df; ac_word=$2 17.1664 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.1665 $as_echo_n "checking for $ac_word... " >&6; } 17.1666 @@ -6530,7 +6530,7 @@ 17.1667 fi 17.1668 17.1669 17.1670 -# Extract the first word of "SetFile", so it can be a program name with args. 17.1671 + # Extract the first word of "SetFile", so it can be a program name with args. 17.1672 set dummy SetFile; ac_word=$2 17.1673 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.1674 $as_echo_n "checking for $ac_word... " >&6; } 17.1675 @@ -6685,26 +6685,26 @@ 17.1676 NONENONEs,x,x, && 17.1677 program_prefix=${target_alias}- 17.1678 17.1679 -# Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target" 17.1680 -# is confusing; it assumes you are cross-compiling a cross-compiler (!) and "target" is thus the target of the 17.1681 -# product you're building. The target of this build is called "host". Since this is confusing to most people, we 17.1682 -# have not adopted that system, but use "target" as the platform we are building for. In some places though we need 17.1683 -# to use the configure naming style. 17.1684 - 17.1685 - 17.1686 - 17.1687 - 17.1688 - 17.1689 - # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME 17.1690 - # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME 17.1691 - # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build, 17.1692 - # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME. 17.1693 - OPENJDK_TARGET_AUTOCONF_NAME="$host" 17.1694 - OPENJDK_BUILD_AUTOCONF_NAME="$build" 17.1695 - 17.1696 - 17.1697 - 17.1698 - # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. 17.1699 + # Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target" 17.1700 + # is confusing; it assumes you are cross-compiling a cross-compiler (!) and "target" is thus the target of the 17.1701 + # product you're building. The target of this build is called "host". Since this is confusing to most people, we 17.1702 + # have not adopted that system, but use "target" as the platform we are building for. In some places though we need 17.1703 + # to use the configure naming style. 17.1704 + 17.1705 + 17.1706 + 17.1707 + 17.1708 + 17.1709 + # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME 17.1710 + # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME 17.1711 + # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build, 17.1712 + # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME. 17.1713 + OPENJDK_TARGET_AUTOCONF_NAME="$host" 17.1714 + OPENJDK_BUILD_AUTOCONF_NAME="$build" 17.1715 + 17.1716 + 17.1717 + 17.1718 + # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. 17.1719 17.1720 case "$build_os" in 17.1721 *linux*) 17.1722 @@ -6768,63 +6768,63 @@ 17.1723 VAR_CPU_ARCH=ppc 17.1724 VAR_CPU_BITS=32 17.1725 VAR_CPU_ENDIAN=big 17.1726 - ;; 17.1727 + ;; 17.1728 powerpc64) 17.1729 VAR_CPU=ppc64 17.1730 VAR_CPU_ARCH=ppc 17.1731 VAR_CPU_BITS=64 17.1732 VAR_CPU_ENDIAN=big 17.1733 - ;; 17.1734 + ;; 17.1735 s390) 17.1736 VAR_CPU=s390 17.1737 VAR_CPU_ARCH=s390 17.1738 VAR_CPU_BITS=32 17.1739 VAR_CPU_ENDIAN=big 17.1740 - ;; 17.1741 + ;; 17.1742 s390x) 17.1743 VAR_CPU=s390x 17.1744 VAR_CPU_ARCH=s390 17.1745 VAR_CPU_BITS=64 17.1746 VAR_CPU_ENDIAN=big 17.1747 - ;; 17.1748 + ;; 17.1749 sparc) 17.1750 VAR_CPU=sparc 17.1751 VAR_CPU_ARCH=sparc 17.1752 VAR_CPU_BITS=32 17.1753 VAR_CPU_ENDIAN=big 17.1754 - ;; 17.1755 + ;; 17.1756 sparcv9) 17.1757 VAR_CPU=sparcv9 17.1758 VAR_CPU_ARCH=sparc 17.1759 VAR_CPU_BITS=64 17.1760 VAR_CPU_ENDIAN=big 17.1761 - ;; 17.1762 + ;; 17.1763 *) 17.1764 as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5 17.1765 ;; 17.1766 esac 17.1767 17.1768 - # ..and setup our own variables. (Do this explicitely to facilitate searching) 17.1769 - OPENJDK_BUILD_OS="$VAR_OS" 17.1770 - OPENJDK_BUILD_OS_API="$VAR_OS_API" 17.1771 - OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV" 17.1772 - OPENJDK_BUILD_CPU="$VAR_CPU" 17.1773 - OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH" 17.1774 - OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS" 17.1775 - OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN" 17.1776 - 17.1777 - 17.1778 - 17.1779 - 17.1780 - 17.1781 - 17.1782 - 17.1783 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5 17.1784 + # ..and setup our own variables. (Do this explicitely to facilitate searching) 17.1785 + OPENJDK_BUILD_OS="$VAR_OS" 17.1786 + OPENJDK_BUILD_OS_API="$VAR_OS_API" 17.1787 + OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV" 17.1788 + OPENJDK_BUILD_CPU="$VAR_CPU" 17.1789 + OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH" 17.1790 + OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS" 17.1791 + OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN" 17.1792 + 17.1793 + 17.1794 + 17.1795 + 17.1796 + 17.1797 + 17.1798 + 17.1799 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5 17.1800 $as_echo_n "checking openjdk-build os-cpu... " >&6; } 17.1801 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5 17.1802 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5 17.1803 $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; } 17.1804 17.1805 - # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. 17.1806 + # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables. 17.1807 17.1808 case "$host_os" in 17.1809 *linux*) 17.1810 @@ -6888,60 +6888,60 @@ 17.1811 VAR_CPU_ARCH=ppc 17.1812 VAR_CPU_BITS=32 17.1813 VAR_CPU_ENDIAN=big 17.1814 - ;; 17.1815 + ;; 17.1816 powerpc64) 17.1817 VAR_CPU=ppc64 17.1818 VAR_CPU_ARCH=ppc 17.1819 VAR_CPU_BITS=64 17.1820 VAR_CPU_ENDIAN=big 17.1821 - ;; 17.1822 + ;; 17.1823 s390) 17.1824 VAR_CPU=s390 17.1825 VAR_CPU_ARCH=s390 17.1826 VAR_CPU_BITS=32 17.1827 VAR_CPU_ENDIAN=big 17.1828 - ;; 17.1829 + ;; 17.1830 s390x) 17.1831 VAR_CPU=s390x 17.1832 VAR_CPU_ARCH=s390 17.1833 VAR_CPU_BITS=64 17.1834 VAR_CPU_ENDIAN=big 17.1835 - ;; 17.1836 + ;; 17.1837 sparc) 17.1838 VAR_CPU=sparc 17.1839 VAR_CPU_ARCH=sparc 17.1840 VAR_CPU_BITS=32 17.1841 VAR_CPU_ENDIAN=big 17.1842 - ;; 17.1843 + ;; 17.1844 sparcv9) 17.1845 VAR_CPU=sparcv9 17.1846 VAR_CPU_ARCH=sparc 17.1847 VAR_CPU_BITS=64 17.1848 VAR_CPU_ENDIAN=big 17.1849 - ;; 17.1850 + ;; 17.1851 *) 17.1852 as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5 17.1853 ;; 17.1854 esac 17.1855 17.1856 - # ... and setup our own variables. (Do this explicitely to facilitate searching) 17.1857 - OPENJDK_TARGET_OS="$VAR_OS" 17.1858 - OPENJDK_TARGET_OS_API="$VAR_OS_API" 17.1859 - OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" 17.1860 - OPENJDK_TARGET_CPU="$VAR_CPU" 17.1861 - OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH" 17.1862 - OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS" 17.1863 - OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN" 17.1864 - 17.1865 - 17.1866 - 17.1867 - 17.1868 - 17.1869 - 17.1870 - 17.1871 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5 17.1872 + # ... and setup our own variables. (Do this explicitely to facilitate searching) 17.1873 + OPENJDK_TARGET_OS="$VAR_OS" 17.1874 + OPENJDK_TARGET_OS_API="$VAR_OS_API" 17.1875 + OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" 17.1876 + OPENJDK_TARGET_CPU="$VAR_CPU" 17.1877 + OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH" 17.1878 + OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS" 17.1879 + OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN" 17.1880 + 17.1881 + 17.1882 + 17.1883 + 17.1884 + 17.1885 + 17.1886 + 17.1887 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5 17.1888 $as_echo_n "checking openjdk-target os-cpu... " >&6; } 17.1889 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5 17.1890 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5 17.1891 $as_echo "$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&6; } 17.1892 17.1893 17.1894 @@ -6991,168 +6991,167 @@ 17.1895 fi 17.1896 17.1897 17.1898 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compilation type" >&5 17.1899 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking compilation type" >&5 17.1900 $as_echo_n "checking compilation type... " >&6; } 17.1901 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_TYPE" >&5 17.1902 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_TYPE" >&5 17.1903 $as_echo "$COMPILE_TYPE" >&6; } 17.1904 17.1905 17.1906 - if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then 17.1907 - REQUIRED_OS_NAME=SunOS 17.1908 - REQUIRED_OS_VERSION=5.10 17.1909 - fi 17.1910 - if test "x$OPENJDK_TARGET_OS" = "xlinux"; then 17.1911 - REQUIRED_OS_NAME=Linux 17.1912 - REQUIRED_OS_VERSION=2.6 17.1913 - fi 17.1914 - if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 17.1915 - REQUIRED_OS_NAME=Windows 17.1916 - if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then 17.1917 - REQUIRED_OS_VERSION=5.2 17.1918 - else 17.1919 - REQUIRED_OS_VERSION=5.1 17.1920 - fi 17.1921 - fi 17.1922 - if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 17.1923 - REQUIRED_OS_NAME=Darwin 17.1924 - REQUIRED_OS_VERSION=11.2 17.1925 - fi 17.1926 - 17.1927 - 17.1928 - 17.1929 - 17.1930 - 17.1931 - # Also store the legacy naming of the cpu. 17.1932 - # Ie i586 and amd64 instead of x86 and x86_64 17.1933 - OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU" 17.1934 - if test "x$OPENJDK_TARGET_CPU" = xx86; then 17.1935 - OPENJDK_TARGET_CPU_LEGACY="i586" 17.1936 - elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.1937 - # On all platforms except MacOSX replace x86_64 with amd64. 17.1938 - OPENJDK_TARGET_CPU_LEGACY="amd64" 17.1939 - fi 17.1940 - 17.1941 - 17.1942 - # And the second legacy naming of the cpu. 17.1943 - # Ie i386 and amd64 instead of x86 and x86_64. 17.1944 - OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU" 17.1945 - if test "x$OPENJDK_TARGET_CPU" = xx86; then 17.1946 - OPENJDK_TARGET_CPU_LEGACY_LIB="i386" 17.1947 - elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.1948 - OPENJDK_TARGET_CPU_LEGACY_LIB="amd64" 17.1949 - fi 17.1950 - 17.1951 - 17.1952 - # This is the name of the cpu (but using i386 and amd64 instead of 17.1953 - # x86 and x86_64, respectively), preceeded by a /, to be used when 17.1954 - # locating libraries. On macosx, it's empty, though. 17.1955 - OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB" 17.1956 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then 17.1957 - OPENJDK_TARGET_CPU_LIBDIR="" 17.1958 - fi 17.1959 - 17.1960 - 17.1961 - # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to 17.1962 - # /amd64 or /sparcv9. This string is appended to some library paths, like this: 17.1963 - # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so 17.1964 - OPENJDK_TARGET_CPU_ISADIR="" 17.1965 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then 17.1966 - if test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.1967 - OPENJDK_TARGET_CPU_ISADIR="/amd64" 17.1968 - elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then 17.1969 - OPENJDK_TARGET_CPU_ISADIR="/sparcv9" 17.1970 - fi 17.1971 - fi 17.1972 - 17.1973 - 17.1974 - # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property 17.1975 - OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU" 17.1976 - if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then 17.1977 - # On linux only, we replace x86 with i386. 17.1978 - OPENJDK_TARGET_CPU_OSARCH="i386" 17.1979 - elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.1980 - # On all platforms except macosx, we replace x86_64 with amd64. 17.1981 - OPENJDK_TARGET_CPU_OSARCH="amd64" 17.1982 - fi 17.1983 - 17.1984 - 17.1985 - OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU" 17.1986 - if test "x$OPENJDK_TARGET_CPU" = xx86; then 17.1987 - OPENJDK_TARGET_CPU_JLI="i386" 17.1988 - elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.1989 - # On all platforms except macosx, we replace x86_64 with amd64. 17.1990 - OPENJDK_TARGET_CPU_JLI="amd64" 17.1991 - fi 17.1992 - # Now setup the -D flags for building libjli. 17.1993 - OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'" 17.1994 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then 17.1995 - if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then 17.1996 - OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'" 17.1997 - elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then 17.1998 - OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'" 17.1999 - fi 17.2000 - fi 17.2001 - 17.2002 - 17.2003 - # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths. 17.2004 - if test "x$OPENJDK_TARGET_OS_API" = xposix; then 17.2005 - OPENJDK_TARGET_OS_API_DIR="solaris" 17.2006 - fi 17.2007 - if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then 17.2008 - OPENJDK_TARGET_OS_API_DIR="windows" 17.2009 - fi 17.2010 - 17.2011 - 17.2012 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 17.2013 - A_LP64="LP64:=" 17.2014 - # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in 17.2015 - # unpack200.exe 17.2016 - if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then 17.2017 - ADD_LP64="-D_LP64=1" 17.2018 - fi 17.2019 - fi 17.2020 - LP64=$A_LP64 17.2021 - 17.2022 - 17.2023 - if test "x$COMPILE_TYPE" = "xcross"; then 17.2024 - # FIXME: ... or should this include reduced builds..? 17.2025 - DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY" 17.2026 - else 17.2027 - DEFINE_CROSS_COMPILE_ARCH="" 17.2028 - fi 17.2029 - 17.2030 - 17.2031 - # ZERO_ARCHDEF is used to enable architecture-specific code 17.2032 - case "${OPENJDK_TARGET_CPU}" in 17.2033 - ppc*) ZERO_ARCHDEF=PPC ;; 17.2034 - s390*) ZERO_ARCHDEF=S390 ;; 17.2035 - sparc*) ZERO_ARCHDEF=SPARC ;; 17.2036 - x86_64*) ZERO_ARCHDEF=AMD64 ;; 17.2037 - x86) ZERO_ARCHDEF=IA32 ;; 17.2038 - *) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z) 17.2039 - esac 17.2040 - 17.2041 + if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then 17.2042 + REQUIRED_OS_NAME=SunOS 17.2043 + REQUIRED_OS_VERSION=5.10 17.2044 + fi 17.2045 + if test "x$OPENJDK_TARGET_OS" = "xlinux"; then 17.2046 + REQUIRED_OS_NAME=Linux 17.2047 + REQUIRED_OS_VERSION=2.6 17.2048 + fi 17.2049 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 17.2050 + REQUIRED_OS_NAME=Windows 17.2051 + if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then 17.2052 + REQUIRED_OS_VERSION=5.2 17.2053 + else 17.2054 + REQUIRED_OS_VERSION=5.1 17.2055 + fi 17.2056 + fi 17.2057 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 17.2058 + REQUIRED_OS_NAME=Darwin 17.2059 + REQUIRED_OS_VERSION=11.2 17.2060 + fi 17.2061 + 17.2062 + 17.2063 + 17.2064 + 17.2065 + 17.2066 + # Also store the legacy naming of the cpu. 17.2067 + # Ie i586 and amd64 instead of x86 and x86_64 17.2068 + OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU" 17.2069 + if test "x$OPENJDK_TARGET_CPU" = xx86; then 17.2070 + OPENJDK_TARGET_CPU_LEGACY="i586" 17.2071 + elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.2072 + # On all platforms except MacOSX replace x86_64 with amd64. 17.2073 + OPENJDK_TARGET_CPU_LEGACY="amd64" 17.2074 + fi 17.2075 + 17.2076 + 17.2077 + # And the second legacy naming of the cpu. 17.2078 + # Ie i386 and amd64 instead of x86 and x86_64. 17.2079 + OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU" 17.2080 + if test "x$OPENJDK_TARGET_CPU" = xx86; then 17.2081 + OPENJDK_TARGET_CPU_LEGACY_LIB="i386" 17.2082 + elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.2083 + OPENJDK_TARGET_CPU_LEGACY_LIB="amd64" 17.2084 + fi 17.2085 + 17.2086 + 17.2087 + # This is the name of the cpu (but using i386 and amd64 instead of 17.2088 + # x86 and x86_64, respectively), preceeded by a /, to be used when 17.2089 + # locating libraries. On macosx, it's empty, though. 17.2090 + OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB" 17.2091 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then 17.2092 + OPENJDK_TARGET_CPU_LIBDIR="" 17.2093 + fi 17.2094 + 17.2095 + 17.2096 + # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to 17.2097 + # /amd64 or /sparcv9. This string is appended to some library paths, like this: 17.2098 + # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so 17.2099 + OPENJDK_TARGET_CPU_ISADIR="" 17.2100 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then 17.2101 + if test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.2102 + OPENJDK_TARGET_CPU_ISADIR="/amd64" 17.2103 + elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then 17.2104 + OPENJDK_TARGET_CPU_ISADIR="/sparcv9" 17.2105 + fi 17.2106 + fi 17.2107 + 17.2108 + 17.2109 + # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property 17.2110 + OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU" 17.2111 + if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then 17.2112 + # On linux only, we replace x86 with i386. 17.2113 + OPENJDK_TARGET_CPU_OSARCH="i386" 17.2114 + elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.2115 + # On all platforms except macosx, we replace x86_64 with amd64. 17.2116 + OPENJDK_TARGET_CPU_OSARCH="amd64" 17.2117 + fi 17.2118 + 17.2119 + 17.2120 + OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU" 17.2121 + if test "x$OPENJDK_TARGET_CPU" = xx86; then 17.2122 + OPENJDK_TARGET_CPU_JLI="i386" 17.2123 + elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then 17.2124 + # On all platforms except macosx, we replace x86_64 with amd64. 17.2125 + OPENJDK_TARGET_CPU_JLI="amd64" 17.2126 + fi 17.2127 + # Now setup the -D flags for building libjli. 17.2128 + OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'" 17.2129 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then 17.2130 + if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then 17.2131 + OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'" 17.2132 + elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then 17.2133 + OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'" 17.2134 + fi 17.2135 + fi 17.2136 + 17.2137 + 17.2138 + # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths. 17.2139 + if test "x$OPENJDK_TARGET_OS_API" = xposix; then 17.2140 + OPENJDK_TARGET_OS_API_DIR="solaris" 17.2141 + fi 17.2142 + if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then 17.2143 + OPENJDK_TARGET_OS_API_DIR="windows" 17.2144 + fi 17.2145 + 17.2146 + 17.2147 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 17.2148 + A_LP64="LP64:=" 17.2149 + # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in 17.2150 + # unpack200.exe 17.2151 + if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then 17.2152 + ADD_LP64="-D_LP64=1" 17.2153 + fi 17.2154 + fi 17.2155 + LP64=$A_LP64 17.2156 + 17.2157 + 17.2158 + if test "x$COMPILE_TYPE" = "xcross"; then 17.2159 + # FIXME: ... or should this include reduced builds..? 17.2160 + DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY" 17.2161 + else 17.2162 + DEFINE_CROSS_COMPILE_ARCH="" 17.2163 + fi 17.2164 + 17.2165 + 17.2166 + # ZERO_ARCHDEF is used to enable architecture-specific code 17.2167 + case "${OPENJDK_TARGET_CPU}" in 17.2168 + ppc*) ZERO_ARCHDEF=PPC ;; 17.2169 + s390*) ZERO_ARCHDEF=S390 ;; 17.2170 + sparc*) ZERO_ARCHDEF=SPARC ;; 17.2171 + x86_64*) ZERO_ARCHDEF=AMD64 ;; 17.2172 + x86) ZERO_ARCHDEF=IA32 ;; 17.2173 + *) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z) 17.2174 + esac 17.2175 17.2176 17.2177 17.2178 17.2179 # Continue setting up basic stuff. Most remaining code require fundamental tools. 17.2180 17.2181 -# Locate the directory of this script. 17.2182 -SCRIPT="$0" 17.2183 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L` 17.2184 - 17.2185 -# Where is the source? It is located two levels above the configure script. 17.2186 -CURDIR="$PWD" 17.2187 -cd "$AUTOCONF_DIR/../.." 17.2188 -SRC_ROOT="`$THEPWDCMD -L`" 17.2189 - 17.2190 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 17.2191 - PATH_SEP=";" 17.2192 + # Locate the directory of this script. 17.2193 + SCRIPT="$0" 17.2194 + AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L` 17.2195 + 17.2196 + # Where is the source? It is located two levels above the configure script. 17.2197 + CURDIR="$PWD" 17.2198 + cd "$AUTOCONF_DIR/../.." 17.2199 + SRC_ROOT="`$THEPWDCMD -L`" 17.2200 + 17.2201 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 17.2202 + PATH_SEP=";" 17.2203 17.2204 SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m` 17.2205 if test $SRC_ROOT_LENGTH -gt 100; then 17.2206 - as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5 17.2207 + as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5 17.2208 fi 17.2209 17.2210 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 17.2211 @@ -7171,7 +7170,7 @@ 17.2212 as_fn_error $? "Cannot continue" "$LINENO" 5 17.2213 fi 17.2214 if test "x$CYGPATH" = x; then 17.2215 - as_fn_error $? "Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path" "$LINENO" 5 17.2216 + as_fn_error $? "Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path" "$LINENO" 5 17.2217 fi 17.2218 { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin root directory as unix-style path" >&5 17.2219 $as_echo_n "checking cygwin root directory as unix-style path... " >&6; } 17.2220 @@ -7184,7 +7183,7 @@ 17.2221 WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH" 17.2222 test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/` 17.2223 if test "x$test_cygdrive_prefix" = x; then 17.2224 - as_fn_error $? "Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c." "$LINENO" 5 17.2225 + as_fn_error $? "Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c." "$LINENO" 5 17.2226 fi 17.2227 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 17.2228 { $as_echo "$as_me:${as_lineno-$LINENO}: checking msys release" >&5 17.2229 @@ -7239,13 +7238,13 @@ 17.2230 $as_echo "$as_me: WARNING: It seems that your find utility is non-standard." >&2;} 17.2231 fi 17.2232 17.2233 -else 17.2234 - PATH_SEP=":" 17.2235 -fi 17.2236 - 17.2237 - 17.2238 - 17.2239 -cd "$CURDIR" 17.2240 + else 17.2241 + PATH_SEP=":" 17.2242 + fi 17.2243 + 17.2244 + 17.2245 + 17.2246 + cd "$CURDIR" 17.2247 17.2248 17.2249 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 17.2250 @@ -7492,13 +7491,13 @@ 17.2251 fi 17.2252 17.2253 17.2254 -if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then 17.2255 + if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then 17.2256 # Add extra search paths on solaris for utilities like ar and as etc... 17.2257 PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin" 17.2258 -fi 17.2259 - 17.2260 -# You can force the sys-root if the sys-root encoded into the cross compiler tools 17.2261 -# is not correct. 17.2262 + fi 17.2263 + 17.2264 + # You can force the sys-root if the sys-root encoded into the cross compiler tools 17.2265 + # is not correct. 17.2266 17.2267 # Check whether --with-sys-root was given. 17.2268 if test "${with_sys_root+set}" = set; then : 17.2269 @@ -7506,11 +7505,11 @@ 17.2270 fi 17.2271 17.2272 17.2273 -if test "x$with_sys_root" != x; then 17.2274 - SYS_ROOT=$with_sys_root 17.2275 -else 17.2276 - SYS_ROOT=/ 17.2277 -fi 17.2278 + if test "x$with_sys_root" != x; then 17.2279 + SYS_ROOT=$with_sys_root 17.2280 + else 17.2281 + SYS_ROOT=/ 17.2282 + fi 17.2283 17.2284 17.2285 17.2286 @@ -7525,9 +7524,9 @@ 17.2287 # Check whether --with-devkit was given. 17.2288 if test "${with_devkit+set}" = set; then : 17.2289 withval=$with_devkit; 17.2290 - if test "x$with_sys_root" != x; then 17.2291 - as_fn_error $? "Cannot specify both --with-devkit and --with-sys-root at the same time" "$LINENO" 5 17.2292 - fi 17.2293 + if test "x$with_sys_root" != x; then 17.2294 + as_fn_error $? "Cannot specify both --with-devkit and --with-sys-root at the same time" "$LINENO" 5 17.2295 + fi 17.2296 17.2297 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 17.2298 17.2299 @@ -7657,20 +7656,20 @@ 17.2300 TOOLS_DIR="$TOOLS_DIR:$with_devkit/bin" 17.2301 fi 17.2302 17.2303 - if test -d "$with_devkit/$host_alias/libc"; then 17.2304 - SYS_ROOT=$with_devkit/$host_alias/libc 17.2305 - elif test -d "$with_devkit/$host/sys-root"; then 17.2306 - SYS_ROOT=$with_devkit/$host/sys-root 17.2307 - fi 17.2308 - 17.2309 -fi 17.2310 - 17.2311 - 17.2312 - 17.2313 -# Setup default logging of stdout and stderr to build.log in the output root. 17.2314 -BUILD_LOG='$(OUTPUT_ROOT)/build.log' 17.2315 -BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old' 17.2316 -BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' 17.2317 + if test -d "$with_devkit/$host_alias/libc"; then 17.2318 + SYS_ROOT=$with_devkit/$host_alias/libc 17.2319 + elif test -d "$with_devkit/$host/sys-root"; then 17.2320 + SYS_ROOT=$with_devkit/$host/sys-root 17.2321 + fi 17.2322 + 17.2323 +fi 17.2324 + 17.2325 + 17.2326 + 17.2327 + # Setup default logging of stdout and stderr to build.log in the output root. 17.2328 + BUILD_LOG='$(OUTPUT_ROOT)/build.log' 17.2329 + BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old' 17.2330 + BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' 17.2331 17.2332 17.2333 17.2334 @@ -7725,18 +7724,18 @@ 17.2335 17.2336 # These are needed to be able to create a configuration name (and thus the output directory) 17.2337 17.2338 -############################################################################### 17.2339 -# 17.2340 -# Check which variant of the JDK that we want to build. 17.2341 -# Currently we have: 17.2342 -# normal: standard edition 17.2343 -# but the custom make system may add other variants 17.2344 -# 17.2345 -# Effectively the JDK variant gives a name to a specific set of 17.2346 -# modules to compile into the JDK. In the future, these modules 17.2347 -# might even be Jigsaw modules. 17.2348 -# 17.2349 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of the JDK to build" >&5 17.2350 + ############################################################################### 17.2351 + # 17.2352 + # Check which variant of the JDK that we want to build. 17.2353 + # Currently we have: 17.2354 + # normal: standard edition 17.2355 + # but the custom make system may add other variants 17.2356 + # 17.2357 + # Effectively the JDK variant gives a name to a specific set of 17.2358 + # modules to compile into the JDK. In the future, these modules 17.2359 + # might even be Jigsaw modules. 17.2360 + # 17.2361 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of the JDK to build" >&5 17.2362 $as_echo_n "checking which variant of the JDK to build... " >&6; } 17.2363 17.2364 # Check whether --with-jdk-variant was given. 17.2365 @@ -7745,31 +7744,31 @@ 17.2366 fi 17.2367 17.2368 17.2369 -if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then 17.2370 + if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then 17.2371 JDK_VARIANT="normal" 17.2372 -else 17.2373 + else 17.2374 as_fn_error $? "The available JDK variants are: normal" "$LINENO" 5 17.2375 -fi 17.2376 - 17.2377 - 17.2378 - 17.2379 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_VARIANT" >&5 17.2380 + fi 17.2381 + 17.2382 + 17.2383 + 17.2384 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_VARIANT" >&5 17.2385 $as_echo "$JDK_VARIANT" >&6; } 17.2386 17.2387 17.2388 17.2389 -############################################################################### 17.2390 -# 17.2391 -# Check which variants of the JVM that we want to build. 17.2392 -# Currently we have: 17.2393 -# server: normal interpreter and a tiered C1/C2 compiler 17.2394 -# client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms) 17.2395 -# minimal1: reduced form of client with optional VM services and features stripped out 17.2396 -# kernel: kernel footprint JVM that passes the TCK without major performance problems, 17.2397 -# ie normal interpreter and C1, only the serial GC, kernel jvmti etc 17.2398 -# zero: no machine code interpreter, no compiler 17.2399 -# zeroshark: zero interpreter and shark/llvm compiler backend 17.2400 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5 17.2401 + ############################################################################### 17.2402 + # 17.2403 + # Check which variants of the JVM that we want to build. 17.2404 + # Currently we have: 17.2405 + # server: normal interpreter and a tiered C1/C2 compiler 17.2406 + # client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms) 17.2407 + # minimal1: reduced form of client with optional VM services and features stripped out 17.2408 + # kernel: kernel footprint JVM that passes the TCK without major performance problems, 17.2409 + # ie normal interpreter and C1, only the serial GC, kernel jvmti etc 17.2410 + # zero: no machine code interpreter, no compiler 17.2411 + # zeroshark: zero interpreter and shark/llvm compiler backend 17.2412 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5 17.2413 $as_echo_n "checking which variants of the JVM to build... " >&6; } 17.2414 17.2415 # Check whether --with-jvm-variants was given. 17.2416 @@ -7778,87 +7777,86 @@ 17.2417 fi 17.2418 17.2419 17.2420 -if test "x$with_jvm_variants" = x; then 17.2421 - with_jvm_variants="server" 17.2422 -fi 17.2423 - 17.2424 -JVM_VARIANTS=",$with_jvm_variants," 17.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,//'` 17.2426 - 17.2427 -if test "x$TEST_VARIANTS" != "x,"; then 17.2428 - as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5 17.2429 -fi 17.2430 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5 17.2431 + if test "x$with_jvm_variants" = x; then 17.2432 + with_jvm_variants="server" 17.2433 + fi 17.2434 + 17.2435 + JVM_VARIANTS=",$with_jvm_variants," 17.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,//'` 17.2437 + 17.2438 + if test "x$TEST_VARIANTS" != "x,"; then 17.2439 + as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5 17.2440 + fi 17.2441 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5 17.2442 $as_echo "$with_jvm_variants" >&6; } 17.2443 17.2444 -JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'` 17.2445 -JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` 17.2446 -JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'` 17.2447 -JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'` 17.2448 -JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` 17.2449 -JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` 17.2450 - 17.2451 -if test "x$JVM_VARIANT_CLIENT" = xtrue; then 17.2452 + JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'` 17.2453 + JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` 17.2454 + JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'` 17.2455 + JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'` 17.2456 + JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` 17.2457 + JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` 17.2458 + 17.2459 + if test "x$JVM_VARIANT_CLIENT" = xtrue; then 17.2460 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 17.2461 - as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5 17.2462 - fi 17.2463 -fi 17.2464 -if test "x$JVM_VARIANT_KERNEL" = xtrue; then 17.2465 + as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5 17.2466 + fi 17.2467 + fi 17.2468 + if test "x$JVM_VARIANT_KERNEL" = xtrue; then 17.2469 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 17.2470 - as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5 17.2471 - fi 17.2472 -fi 17.2473 -if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 17.2474 + as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5 17.2475 + fi 17.2476 + fi 17.2477 + if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 17.2478 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 17.2479 - as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5 17.2480 - fi 17.2481 -fi 17.2482 - 17.2483 -# Replace the commas with AND for use in the build directory name. 17.2484 -ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` 17.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/'` 17.2486 -if test "x$COUNT_VARIANTS" != "x,1"; then 17.2487 + as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5 17.2488 + fi 17.2489 + fi 17.2490 + 17.2491 + # Replace the commas with AND for use in the build directory name. 17.2492 + ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` 17.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/'` 17.2494 + if test "x$COUNT_VARIANTS" != "x,1"; then 17.2495 BUILDING_MULTIPLE_JVM_VARIANTS=yes 17.2496 -else 17.2497 + else 17.2498 BUILDING_MULTIPLE_JVM_VARIANTS=no 17.2499 -fi 17.2500 - 17.2501 - 17.2502 - 17.2503 - 17.2504 - 17.2505 - 17.2506 - 17.2507 - 17.2508 - 17.2509 -INCLUDE_SA=true 17.2510 -if test "x$JVM_VARIANT_ZERO" = xtrue ; then 17.2511 + fi 17.2512 + 17.2513 + 17.2514 + 17.2515 + 17.2516 + 17.2517 + 17.2518 + 17.2519 + 17.2520 + 17.2521 + INCLUDE_SA=true 17.2522 + if test "x$JVM_VARIANT_ZERO" = xtrue ; then 17.2523 INCLUDE_SA=false 17.2524 -fi 17.2525 -if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then 17.2526 + fi 17.2527 + if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then 17.2528 INCLUDE_SA=false 17.2529 -fi 17.2530 - 17.2531 - 17.2532 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 17.2533 - MACOSX_UNIVERSAL="true" 17.2534 -fi 17.2535 - 17.2536 - 17.2537 - 17.2538 - 17.2539 - 17.2540 -############################################################################### 17.2541 -# 17.2542 -# Set the debug level 17.2543 -# release: no debug information, all optimizations, no asserts. 17.2544 -# fastdebug: debug information (-g), all optimizations, all asserts 17.2545 -# slowdebug: debug information (-g), no optimizations, all asserts 17.2546 -# 17.2547 -DEBUG_LEVEL="release" 17.2548 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which debug level to use" >&5 17.2549 + fi 17.2550 + 17.2551 + 17.2552 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 17.2553 + MACOSX_UNIVERSAL="true" 17.2554 + fi 17.2555 + 17.2556 + 17.2557 + 17.2558 + 17.2559 + ############################################################################### 17.2560 + # 17.2561 + # Set the debug level 17.2562 + # release: no debug information, all optimizations, no asserts. 17.2563 + # fastdebug: debug information (-g), all optimizations, all asserts 17.2564 + # slowdebug: debug information (-g), no optimizations, all asserts 17.2565 + # 17.2566 + DEBUG_LEVEL="release" 17.2567 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which debug level to use" >&5 17.2568 $as_echo_n "checking which debug level to use... " >&6; } 17.2569 -# Check whether --enable-debug was given. 17.2570 + # Check whether --enable-debug was given. 17.2571 if test "${enable_debug+set}" = set; then : 17.2572 enableval=$enable_debug; 17.2573 ENABLE_DEBUG="${enableval}" 17.2574 @@ -7875,96 +7873,96 @@ 17.2575 withval=$with_debug_level; 17.2576 DEBUG_LEVEL="${withval}" 17.2577 if test "x$ENABLE_DEBUG" = xyes; then 17.2578 - as_fn_error $? "You cannot use both --enable-debug and --with-debug-level at the same time." "$LINENO" 5 17.2579 - fi 17.2580 - 17.2581 -fi 17.2582 - 17.2583 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG_LEVEL" >&5 17.2584 + as_fn_error $? "You cannot use both --enable-debug and --with-debug-level at the same time." "$LINENO" 5 17.2585 + fi 17.2586 + 17.2587 +fi 17.2588 + 17.2589 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG_LEVEL" >&5 17.2590 $as_echo "$DEBUG_LEVEL" >&6; } 17.2591 17.2592 -if test "x$DEBUG_LEVEL" != xrelease && \ 17.2593 - test "x$DEBUG_LEVEL" != xfastdebug && \ 17.2594 - test "x$DEBUG_LEVEL" != xslowdebug; then 17.2595 - as_fn_error $? "Allowed debug levels are: release, fastdebug and slowdebug" "$LINENO" 5 17.2596 -fi 17.2597 - 17.2598 - 17.2599 -############################################################################### 17.2600 -# 17.2601 -# Setup legacy vars/targets and new vars to deal with different debug levels. 17.2602 -# 17.2603 - 17.2604 -case $DEBUG_LEVEL in 17.2605 - release ) 17.2606 - VARIANT="OPT" 17.2607 - FASTDEBUG="false" 17.2608 - DEBUG_CLASSFILES="false" 17.2609 - BUILD_VARIANT_RELEASE="" 17.2610 - HOTSPOT_DEBUG_LEVEL="product" 17.2611 - HOTSPOT_EXPORT="product" 17.2612 - ;; 17.2613 - fastdebug ) 17.2614 - VARIANT="DBG" 17.2615 - FASTDEBUG="true" 17.2616 - DEBUG_CLASSFILES="true" 17.2617 - BUILD_VARIANT_RELEASE="-fastdebug" 17.2618 - HOTSPOT_DEBUG_LEVEL="fastdebug" 17.2619 - HOTSPOT_EXPORT="fastdebug" 17.2620 - ;; 17.2621 - slowdebug ) 17.2622 - VARIANT="DBG" 17.2623 - FASTDEBUG="false" 17.2624 - DEBUG_CLASSFILES="true" 17.2625 - BUILD_VARIANT_RELEASE="-debug" 17.2626 - HOTSPOT_DEBUG_LEVEL="jvmg" 17.2627 - HOTSPOT_EXPORT="debug" 17.2628 - ;; 17.2629 -esac 17.2630 - 17.2631 -##### 17.2632 -# Generate the legacy makefile targets for hotspot. 17.2633 -# The hotspot api for selecting the build artifacts, really, needs to be improved. 17.2634 -# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to 17.2635 -# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc 17.2636 -# But until then ... 17.2637 -HOTSPOT_TARGET="" 17.2638 - 17.2639 -if test "x$JVM_VARIANT_SERVER" = xtrue; then 17.2640 + if test "x$DEBUG_LEVEL" != xrelease && \ 17.2641 + test "x$DEBUG_LEVEL" != xfastdebug && \ 17.2642 + test "x$DEBUG_LEVEL" != xslowdebug; then 17.2643 + as_fn_error $? "Allowed debug levels are: release, fastdebug and slowdebug" "$LINENO" 5 17.2644 + fi 17.2645 + 17.2646 + 17.2647 + ############################################################################### 17.2648 + # 17.2649 + # Setup legacy vars/targets and new vars to deal with different debug levels. 17.2650 + # 17.2651 + 17.2652 + case $DEBUG_LEVEL in 17.2653 + release ) 17.2654 + VARIANT="OPT" 17.2655 + FASTDEBUG="false" 17.2656 + DEBUG_CLASSFILES="false" 17.2657 + BUILD_VARIANT_RELEASE="" 17.2658 + HOTSPOT_DEBUG_LEVEL="product" 17.2659 + HOTSPOT_EXPORT="product" 17.2660 + ;; 17.2661 + fastdebug ) 17.2662 + VARIANT="DBG" 17.2663 + FASTDEBUG="true" 17.2664 + DEBUG_CLASSFILES="true" 17.2665 + BUILD_VARIANT_RELEASE="-fastdebug" 17.2666 + HOTSPOT_DEBUG_LEVEL="fastdebug" 17.2667 + HOTSPOT_EXPORT="fastdebug" 17.2668 + ;; 17.2669 + slowdebug ) 17.2670 + VARIANT="DBG" 17.2671 + FASTDEBUG="false" 17.2672 + DEBUG_CLASSFILES="true" 17.2673 + BUILD_VARIANT_RELEASE="-debug" 17.2674 + HOTSPOT_DEBUG_LEVEL="jvmg" 17.2675 + HOTSPOT_EXPORT="debug" 17.2676 + ;; 17.2677 + esac 17.2678 + 17.2679 + ##### 17.2680 + # Generate the legacy makefile targets for hotspot. 17.2681 + # The hotspot api for selecting the build artifacts, really, needs to be improved. 17.2682 + # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to 17.2683 + # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc 17.2684 + # But until then ... 17.2685 + HOTSPOT_TARGET="" 17.2686 + 17.2687 + if test "x$JVM_VARIANT_SERVER" = xtrue; then 17.2688 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} " 17.2689 -fi 17.2690 - 17.2691 -if test "x$JVM_VARIANT_CLIENT" = xtrue; then 17.2692 + fi 17.2693 + 17.2694 + if test "x$JVM_VARIANT_CLIENT" = xtrue; then 17.2695 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 " 17.2696 -fi 17.2697 - 17.2698 -if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 17.2699 + fi 17.2700 + 17.2701 + if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 17.2702 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 " 17.2703 -fi 17.2704 - 17.2705 -if test "x$JVM_VARIANT_KERNEL" = xtrue; then 17.2706 + fi 17.2707 + 17.2708 + if test "x$JVM_VARIANT_KERNEL" = xtrue; then 17.2709 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel " 17.2710 -fi 17.2711 - 17.2712 -if test "x$JVM_VARIANT_ZERO" = xtrue; then 17.2713 + fi 17.2714 + 17.2715 + if test "x$JVM_VARIANT_ZERO" = xtrue; then 17.2716 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero " 17.2717 -fi 17.2718 - 17.2719 -if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then 17.2720 + fi 17.2721 + 17.2722 + if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then 17.2723 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark " 17.2724 -fi 17.2725 - 17.2726 -HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT" 17.2727 - 17.2728 -# On Macosx universal binaries are produced, but they only contain 17.2729 -# 64 bit intel. This invalidates control of which jvms are built 17.2730 -# from configure, but only server is valid anyway. Fix this 17.2731 -# when hotspot makefiles are rewritten. 17.2732 -if test "x$MACOSX_UNIVERSAL" = xtrue; then 17.2733 + fi 17.2734 + 17.2735 + HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT" 17.2736 + 17.2737 + # On Macosx universal binaries are produced, but they only contain 17.2738 + # 64 bit intel. This invalidates control of which jvms are built 17.2739 + # from configure, but only server is valid anyway. Fix this 17.2740 + # when hotspot makefiles are rewritten. 17.2741 + if test "x$MACOSX_UNIVERSAL" = xtrue; then 17.2742 HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} 17.2743 -fi 17.2744 - 17.2745 -##### 17.2746 + fi 17.2747 + 17.2748 + ##### 17.2749 17.2750 17.2751 17.2752 @@ -7987,27 +7985,27 @@ 17.2753 fi 17.2754 17.2755 17.2756 -# Test from where we are running configure, in or outside of src root. 17.2757 -if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ 17.2758 - || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ 17.2759 - || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 17.2760 + # Test from where we are running configure, in or outside of src root. 17.2761 + if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ 17.2762 + || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ 17.2763 + || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 17.2764 # We are running configure from the src root. 17.2765 # Create a default ./build/target-variant-debuglevel output root. 17.2766 if test "x${CONF_NAME}" = x; then 17.2767 - CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" 17.2768 + CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" 17.2769 fi 17.2770 OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" 17.2771 $MKDIR -p "$OUTPUT_ROOT" 17.2772 if test ! -d "$OUTPUT_ROOT"; then 17.2773 - as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5 17.2774 - fi 17.2775 -else 17.2776 + as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5 17.2777 + fi 17.2778 + else 17.2779 # We are running configure from outside of the src dir. 17.2780 # Then use the current directory as output dir! 17.2781 # If configuration is situated in normal build directory, just use the build 17.2782 # directory name as configuration name, otherwise use the complete path. 17.2783 if test "x${CONF_NAME}" = x; then 17.2784 - CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"` 17.2785 + CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"` 17.2786 fi 17.2787 OUTPUT_ROOT="$CURDIR" 17.2788 17.2789 @@ -8021,7 +8019,7 @@ 17.2790 # Configure has already touched config.log and confdefs.h in the current dir when this check 17.2791 # is performed. 17.2792 filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \ 17.2793 - | $TR -d '\n'` 17.2794 + | $TR -d '\n'` 17.2795 if test "x$filtered_files" != x; then 17.2796 { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5 17.2797 $as_echo "$as_me: Current directory is $CURDIR." >&6;} 17.2798 @@ -8040,10 +8038,10 @@ 17.2799 as_fn_error $? "Will not continue creating configuration in $CURDIR" "$LINENO" 5 17.2800 fi 17.2801 fi 17.2802 -fi 17.2803 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5 17.2804 + fi 17.2805 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5 17.2806 $as_echo_n "checking what configuration name to use... " >&6; } 17.2807 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5 17.2808 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5 17.2809 $as_echo "$CONF_NAME" >&6; } 17.2810 17.2811 17.2812 @@ -8169,44 +8167,44 @@ 17.2813 fi 17.2814 17.2815 17.2816 -SPEC=$OUTPUT_ROOT/spec.gmk 17.2817 - 17.2818 -CONF_NAME=$CONF_NAME 17.2819 - 17.2820 -OUTPUT_ROOT=$OUTPUT_ROOT 17.2821 - 17.2822 - 17.2823 -# Most of the probed defines are put into config.h 17.2824 -ac_config_headers="$ac_config_headers $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in" 17.2825 - 17.2826 -# The spec.gmk file contains all variables for the make system. 17.2827 -ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in" 17.2828 - 17.2829 -# The hotspot-spec.gmk file contains legacy variables for the hotspot make system. 17.2830 -ac_config_files="$ac_config_files $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in" 17.2831 - 17.2832 -# The bootcycle-spec.gmk file contains support for boot cycle builds. 17.2833 -ac_config_files="$ac_config_files $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in" 17.2834 - 17.2835 -# The compare.sh is used to compare the build output to other builds. 17.2836 -ac_config_files="$ac_config_files $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in" 17.2837 - 17.2838 -# Spec.sh is currently used by compare-objects.sh 17.2839 -ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" 17.2840 - 17.2841 -# The generated Makefile knows where the spec.gmk is and where the source is. 17.2842 -# You can run make from the OUTPUT_ROOT, or from the top-level Makefile 17.2843 -# which will look for generated configurations 17.2844 -ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" 17.2845 - 17.2846 - 17.2847 -# Save the arguments given to us 17.2848 -echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments 17.2849 + SPEC=$OUTPUT_ROOT/spec.gmk 17.2850 + 17.2851 + CONF_NAME=$CONF_NAME 17.2852 + 17.2853 + OUTPUT_ROOT=$OUTPUT_ROOT 17.2854 + 17.2855 + 17.2856 + # Most of the probed defines are put into config.h 17.2857 + ac_config_headers="$ac_config_headers $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in" 17.2858 + 17.2859 + # The spec.gmk file contains all variables for the make system. 17.2860 + ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in" 17.2861 + 17.2862 + # The hotspot-spec.gmk file contains legacy variables for the hotspot make system. 17.2863 + ac_config_files="$ac_config_files $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in" 17.2864 + 17.2865 + # The bootcycle-spec.gmk file contains support for boot cycle builds. 17.2866 + ac_config_files="$ac_config_files $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in" 17.2867 + 17.2868 + # The compare.sh is used to compare the build output to other builds. 17.2869 + ac_config_files="$ac_config_files $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in" 17.2870 + 17.2871 + # Spec.sh is currently used by compare-objects.sh 17.2872 + ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" 17.2873 + 17.2874 + # The generated Makefile knows where the spec.gmk is and where the source is. 17.2875 + # You can run make from the OUTPUT_ROOT, or from the top-level Makefile 17.2876 + # which will look for generated configurations 17.2877 + ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" 17.2878 + 17.2879 + 17.2880 + # Save the arguments given to us 17.2881 + echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments 17.2882 17.2883 17.2884 # Must be done before we can call HELP_MSG_MISSING_DEPENDENCY. 17.2885 17.2886 - for ac_prog in apt-get yum port pkgutil pkgadd 17.2887 + for ac_prog in apt-get yum port pkgutil pkgadd 17.2888 do 17.2889 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.2890 set dummy $ac_prog; ac_word=$2 17.2891 @@ -8314,8 +8312,8 @@ 17.2892 # bat and cmd files are not always considered executable in cygwin causing which 17.2893 # to not find them 17.2894 if test "x$new_path" = x \ 17.2895 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.2896 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.2897 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.2898 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.2899 new_path=`$CYGPATH -u "$path"` 17.2900 fi 17.2901 if test "x$new_path" = x; then 17.2902 @@ -8330,8 +8328,8 @@ 17.2903 # bat and cmd files are not always considered executable in cygwin causing which 17.2904 # to not find them 17.2905 if test "x$new_path" = x \ 17.2906 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.2907 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.2908 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.2909 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.2910 new_path=`$CYGPATH -u "$path"` 17.2911 fi 17.2912 if test "x$new_path" = x; then 17.2913 @@ -8359,9 +8357,9 @@ 17.2914 # Short path failed, file does not exist as specified. 17.2915 # Try adding .exe or .cmd 17.2916 if test -f "${new_path}.exe"; then 17.2917 - input_to_shortpath="${new_path}.exe" 17.2918 + input_to_shortpath="${new_path}.exe" 17.2919 elif test -f "${new_path}.cmd"; then 17.2920 - input_to_shortpath="${new_path}.cmd" 17.2921 + input_to_shortpath="${new_path}.cmd" 17.2922 else 17.2923 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5 17.2924 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;} 17.2925 @@ -8537,29 +8535,29 @@ 17.2926 fi 17.2927 17.2928 if test "x$new_path" = x; then 17.2929 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.2930 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.2931 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 17.2932 - has_space=`$ECHO "$complete" | $GREP " "` 17.2933 - if test "x$has_space" != x; then 17.2934 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.2935 + has_space=`$ECHO "$complete" | $GREP " "` 17.2936 + if test "x$has_space" != x; then 17.2937 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.2938 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} 17.2939 - fi 17.2940 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.2941 - fi 17.2942 - fi 17.2943 - 17.2944 - # Now join together the path and the arguments once again 17.2945 - if test "x$arguments" != xEOL; then 17.2946 - new_complete="$new_path ${arguments% *}" 17.2947 - else 17.2948 - new_complete="$new_path" 17.2949 - fi 17.2950 + fi 17.2951 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.2952 + fi 17.2953 + fi 17.2954 + 17.2955 + # Now join together the path and the arguments once again 17.2956 + if test "x$arguments" != xEOL; then 17.2957 + new_complete="$new_path ${arguments% *}" 17.2958 + else 17.2959 + new_complete="$new_path" 17.2960 + fi 17.2961 17.2962 if test "x$complete" != "x$new_complete"; then 17.2963 - FOUND_MAKE="$new_complete" 17.2964 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.2965 + FOUND_MAKE="$new_complete" 17.2966 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.2967 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 17.2968 - fi 17.2969 + fi 17.2970 17.2971 fi 17.2972 fi 17.2973 @@ -8671,8 +8669,8 @@ 17.2974 # bat and cmd files are not always considered executable in cygwin causing which 17.2975 # to not find them 17.2976 if test "x$new_path" = x \ 17.2977 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.2978 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.2979 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.2980 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.2981 new_path=`$CYGPATH -u "$path"` 17.2982 fi 17.2983 if test "x$new_path" = x; then 17.2984 @@ -8687,8 +8685,8 @@ 17.2985 # bat and cmd files are not always considered executable in cygwin causing which 17.2986 # to not find them 17.2987 if test "x$new_path" = x \ 17.2988 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.2989 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.2990 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.2991 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.2992 new_path=`$CYGPATH -u "$path"` 17.2993 fi 17.2994 if test "x$new_path" = x; then 17.2995 @@ -8716,9 +8714,9 @@ 17.2996 # Short path failed, file does not exist as specified. 17.2997 # Try adding .exe or .cmd 17.2998 if test -f "${new_path}.exe"; then 17.2999 - input_to_shortpath="${new_path}.exe" 17.3000 + input_to_shortpath="${new_path}.exe" 17.3001 elif test -f "${new_path}.cmd"; then 17.3002 - input_to_shortpath="${new_path}.cmd" 17.3003 + input_to_shortpath="${new_path}.cmd" 17.3004 else 17.3005 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5 17.3006 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;} 17.3007 @@ -8894,29 +8892,29 @@ 17.3008 fi 17.3009 17.3010 if test "x$new_path" = x; then 17.3011 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.3012 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.3013 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 17.3014 - has_space=`$ECHO "$complete" | $GREP " "` 17.3015 - if test "x$has_space" != x; then 17.3016 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.3017 + has_space=`$ECHO "$complete" | $GREP " "` 17.3018 + if test "x$has_space" != x; then 17.3019 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.3020 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} 17.3021 - fi 17.3022 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.3023 - fi 17.3024 - fi 17.3025 - 17.3026 - # Now join together the path and the arguments once again 17.3027 - if test "x$arguments" != xEOL; then 17.3028 - new_complete="$new_path ${arguments% *}" 17.3029 - else 17.3030 - new_complete="$new_path" 17.3031 - fi 17.3032 + fi 17.3033 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.3034 + fi 17.3035 + fi 17.3036 + 17.3037 + # Now join together the path and the arguments once again 17.3038 + if test "x$arguments" != xEOL; then 17.3039 + new_complete="$new_path ${arguments% *}" 17.3040 + else 17.3041 + new_complete="$new_path" 17.3042 + fi 17.3043 17.3044 if test "x$complete" != "x$new_complete"; then 17.3045 - FOUND_MAKE="$new_complete" 17.3046 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.3047 + FOUND_MAKE="$new_complete" 17.3048 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.3049 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 17.3050 - fi 17.3051 + fi 17.3052 17.3053 fi 17.3054 fi 17.3055 @@ -9025,8 +9023,8 @@ 17.3056 # bat and cmd files are not always considered executable in cygwin causing which 17.3057 # to not find them 17.3058 if test "x$new_path" = x \ 17.3059 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3060 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3061 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3062 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3063 new_path=`$CYGPATH -u "$path"` 17.3064 fi 17.3065 if test "x$new_path" = x; then 17.3066 @@ -9041,8 +9039,8 @@ 17.3067 # bat and cmd files are not always considered executable in cygwin causing which 17.3068 # to not find them 17.3069 if test "x$new_path" = x \ 17.3070 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3071 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3072 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3073 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3074 new_path=`$CYGPATH -u "$path"` 17.3075 fi 17.3076 if test "x$new_path" = x; then 17.3077 @@ -9070,9 +9068,9 @@ 17.3078 # Short path failed, file does not exist as specified. 17.3079 # Try adding .exe or .cmd 17.3080 if test -f "${new_path}.exe"; then 17.3081 - input_to_shortpath="${new_path}.exe" 17.3082 + input_to_shortpath="${new_path}.exe" 17.3083 elif test -f "${new_path}.cmd"; then 17.3084 - input_to_shortpath="${new_path}.cmd" 17.3085 + input_to_shortpath="${new_path}.cmd" 17.3086 else 17.3087 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5 17.3088 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;} 17.3089 @@ -9248,29 +9246,29 @@ 17.3090 fi 17.3091 17.3092 if test "x$new_path" = x; then 17.3093 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.3094 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.3095 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 17.3096 - has_space=`$ECHO "$complete" | $GREP " "` 17.3097 - if test "x$has_space" != x; then 17.3098 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.3099 + has_space=`$ECHO "$complete" | $GREP " "` 17.3100 + if test "x$has_space" != x; then 17.3101 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.3102 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} 17.3103 - fi 17.3104 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.3105 - fi 17.3106 - fi 17.3107 - 17.3108 - # Now join together the path and the arguments once again 17.3109 - if test "x$arguments" != xEOL; then 17.3110 - new_complete="$new_path ${arguments% *}" 17.3111 - else 17.3112 - new_complete="$new_path" 17.3113 - fi 17.3114 + fi 17.3115 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.3116 + fi 17.3117 + fi 17.3118 + 17.3119 + # Now join together the path and the arguments once again 17.3120 + if test "x$arguments" != xEOL; then 17.3121 + new_complete="$new_path ${arguments% *}" 17.3122 + else 17.3123 + new_complete="$new_path" 17.3124 + fi 17.3125 17.3126 if test "x$complete" != "x$new_complete"; then 17.3127 - FOUND_MAKE="$new_complete" 17.3128 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.3129 + FOUND_MAKE="$new_complete" 17.3130 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.3131 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 17.3132 - fi 17.3133 + fi 17.3134 17.3135 fi 17.3136 fi 17.3137 @@ -9384,8 +9382,8 @@ 17.3138 # bat and cmd files are not always considered executable in cygwin causing which 17.3139 # to not find them 17.3140 if test "x$new_path" = x \ 17.3141 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3142 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3143 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3144 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3145 new_path=`$CYGPATH -u "$path"` 17.3146 fi 17.3147 if test "x$new_path" = x; then 17.3148 @@ -9400,8 +9398,8 @@ 17.3149 # bat and cmd files are not always considered executable in cygwin causing which 17.3150 # to not find them 17.3151 if test "x$new_path" = x \ 17.3152 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3153 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3154 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3155 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3156 new_path=`$CYGPATH -u "$path"` 17.3157 fi 17.3158 if test "x$new_path" = x; then 17.3159 @@ -9429,9 +9427,9 @@ 17.3160 # Short path failed, file does not exist as specified. 17.3161 # Try adding .exe or .cmd 17.3162 if test -f "${new_path}.exe"; then 17.3163 - input_to_shortpath="${new_path}.exe" 17.3164 + input_to_shortpath="${new_path}.exe" 17.3165 elif test -f "${new_path}.cmd"; then 17.3166 - input_to_shortpath="${new_path}.cmd" 17.3167 + input_to_shortpath="${new_path}.cmd" 17.3168 else 17.3169 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5 17.3170 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;} 17.3171 @@ -9607,29 +9605,29 @@ 17.3172 fi 17.3173 17.3174 if test "x$new_path" = x; then 17.3175 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.3176 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.3177 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 17.3178 - has_space=`$ECHO "$complete" | $GREP " "` 17.3179 - if test "x$has_space" != x; then 17.3180 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.3181 + has_space=`$ECHO "$complete" | $GREP " "` 17.3182 + if test "x$has_space" != x; then 17.3183 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.3184 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} 17.3185 - fi 17.3186 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.3187 - fi 17.3188 - fi 17.3189 - 17.3190 - # Now join together the path and the arguments once again 17.3191 - if test "x$arguments" != xEOL; then 17.3192 - new_complete="$new_path ${arguments% *}" 17.3193 - else 17.3194 - new_complete="$new_path" 17.3195 - fi 17.3196 + fi 17.3197 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.3198 + fi 17.3199 + fi 17.3200 + 17.3201 + # Now join together the path and the arguments once again 17.3202 + if test "x$arguments" != xEOL; then 17.3203 + new_complete="$new_path ${arguments% *}" 17.3204 + else 17.3205 + new_complete="$new_path" 17.3206 + fi 17.3207 17.3208 if test "x$complete" != "x$new_complete"; then 17.3209 - FOUND_MAKE="$new_complete" 17.3210 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.3211 + FOUND_MAKE="$new_complete" 17.3212 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.3213 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 17.3214 - fi 17.3215 + fi 17.3216 17.3217 fi 17.3218 fi 17.3219 @@ -9737,8 +9735,8 @@ 17.3220 # bat and cmd files are not always considered executable in cygwin causing which 17.3221 # to not find them 17.3222 if test "x$new_path" = x \ 17.3223 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3224 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3225 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3226 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3227 new_path=`$CYGPATH -u "$path"` 17.3228 fi 17.3229 if test "x$new_path" = x; then 17.3230 @@ -9753,8 +9751,8 @@ 17.3231 # bat and cmd files are not always considered executable in cygwin causing which 17.3232 # to not find them 17.3233 if test "x$new_path" = x \ 17.3234 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3235 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3236 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 17.3237 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 17.3238 new_path=`$CYGPATH -u "$path"` 17.3239 fi 17.3240 if test "x$new_path" = x; then 17.3241 @@ -9782,9 +9780,9 @@ 17.3242 # Short path failed, file does not exist as specified. 17.3243 # Try adding .exe or .cmd 17.3244 if test -f "${new_path}.exe"; then 17.3245 - input_to_shortpath="${new_path}.exe" 17.3246 + input_to_shortpath="${new_path}.exe" 17.3247 elif test -f "${new_path}.cmd"; then 17.3248 - input_to_shortpath="${new_path}.cmd" 17.3249 + input_to_shortpath="${new_path}.cmd" 17.3250 else 17.3251 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5 17.3252 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;} 17.3253 @@ -9960,29 +9958,29 @@ 17.3254 fi 17.3255 17.3256 if test "x$new_path" = x; then 17.3257 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.3258 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 17.3259 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 17.3260 - has_space=`$ECHO "$complete" | $GREP " "` 17.3261 - if test "x$has_space" != x; then 17.3262 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.3263 + has_space=`$ECHO "$complete" | $GREP " "` 17.3264 + if test "x$has_space" != x; then 17.3265 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 17.3266 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} 17.3267 - fi 17.3268 - as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.3269 - fi 17.3270 - fi 17.3271 - 17.3272 - # Now join together the path and the arguments once again 17.3273 - if test "x$arguments" != xEOL; then 17.3274 - new_complete="$new_path ${arguments% *}" 17.3275 - else 17.3276 - new_complete="$new_path" 17.3277 - fi 17.3278 + fi 17.3279 + as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 17.3280 + fi 17.3281 + fi 17.3282 + 17.3283 + # Now join together the path and the arguments once again 17.3284 + if test "x$arguments" != xEOL; then 17.3285 + new_complete="$new_path ${arguments% *}" 17.3286 + else 17.3287 + new_complete="$new_path" 17.3288 + fi 17.3289 17.3290 if test "x$complete" != "x$new_complete"; then 17.3291 - FOUND_MAKE="$new_complete" 17.3292 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.3293 + FOUND_MAKE="$new_complete" 17.3294 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 17.3295 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 17.3296 - fi 17.3297 + fi 17.3298 17.3299 fi 17.3300 fi 17.3301 @@ -10006,34 +10004,34 @@ 17.3302 17.3303 17.3304 17.3305 - # Test if find supports -delete 17.3306 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5 17.3307 + # Test if find supports -delete 17.3308 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5 17.3309 $as_echo_n "checking if find supports -delete... " >&6; } 17.3310 - FIND_DELETE="-delete" 17.3311 - 17.3312 - DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?) 17.3313 - 17.3314 - echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete 17.3315 - 17.3316 - TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1` 17.3317 - if test -f $DELETEDIR/TestIfFindSupportsDelete; then 17.3318 - # No, it does not. 17.3319 - rm $DELETEDIR/TestIfFindSupportsDelete 17.3320 - FIND_DELETE="-exec rm \{\} \+" 17.3321 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 17.3322 -$as_echo "no" >&6; } 17.3323 - else 17.3324 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 17.3325 + FIND_DELETE="-delete" 17.3326 + 17.3327 + DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?) 17.3328 + 17.3329 + echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete 17.3330 + 17.3331 + TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1` 17.3332 + if test -f $DELETEDIR/TestIfFindSupportsDelete; then 17.3333 + # No, it does not. 17.3334 + rm $DELETEDIR/TestIfFindSupportsDelete 17.3335 + FIND_DELETE="-exec rm \{\} \+" 17.3336 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 17.3337 +$as_echo "no" >&6; } 17.3338 + else 17.3339 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 17.3340 $as_echo "yes" >&6; } 17.3341 - fi 17.3342 - rmdir $DELETEDIR 17.3343 - 17.3344 - 17.3345 - 17.3346 -# These tools might not be installed by default, 17.3347 -# need hint on how to install them. 17.3348 - 17.3349 - for ac_prog in unzip 17.3350 + fi 17.3351 + rmdir $DELETEDIR 17.3352 + 17.3353 + 17.3354 + 17.3355 + # These tools might not be installed by default, 17.3356 + # need hint on how to install them. 17.3357 + 17.3358 + for ac_prog in unzip 17.3359 do 17.3360 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.3361 set dummy $ac_prog; ac_word=$2 17.3362 @@ -10079,20 +10077,20 @@ 17.3363 done 17.3364 17.3365 17.3366 - if test "x$UNZIP" = x; then 17.3367 - if test "xunzip" = x; then 17.3368 - PROG_NAME=unzip 17.3369 - else 17.3370 - PROG_NAME=unzip 17.3371 - fi 17.3372 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.3373 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.3374 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.3375 - fi 17.3376 - 17.3377 - 17.3378 - 17.3379 - for ac_prog in zip 17.3380 + if test "x$UNZIP" = x; then 17.3381 + if test "xunzip" = x; then 17.3382 + PROG_NAME=unzip 17.3383 + else 17.3384 + PROG_NAME=unzip 17.3385 + fi 17.3386 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.3387 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.3388 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.3389 + fi 17.3390 + 17.3391 + 17.3392 + 17.3393 + for ac_prog in zip 17.3394 do 17.3395 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.3396 set dummy $ac_prog; ac_word=$2 17.3397 @@ -10138,22 +10136,22 @@ 17.3398 done 17.3399 17.3400 17.3401 - if test "x$ZIP" = x; then 17.3402 - if test "xzip" = x; then 17.3403 - PROG_NAME=zip 17.3404 - else 17.3405 - PROG_NAME=zip 17.3406 - fi 17.3407 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.3408 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.3409 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.3410 - fi 17.3411 - 17.3412 - 17.3413 - 17.3414 -# Non-required basic tools 17.3415 - 17.3416 -# Extract the first word of "ldd", so it can be a program name with args. 17.3417 + if test "x$ZIP" = x; then 17.3418 + if test "xzip" = x; then 17.3419 + PROG_NAME=zip 17.3420 + else 17.3421 + PROG_NAME=zip 17.3422 + fi 17.3423 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.3424 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.3425 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.3426 + fi 17.3427 + 17.3428 + 17.3429 + 17.3430 + # Non-required basic tools 17.3431 + 17.3432 + # Extract the first word of "ldd", so it can be a program name with args. 17.3433 set dummy ldd; ac_word=$2 17.3434 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.3435 $as_echo_n "checking for $ac_word... " >&6; } 17.3436 @@ -10193,13 +10191,13 @@ 17.3437 fi 17.3438 17.3439 17.3440 -if test "x$LDD" = "x"; then 17.3441 + if test "x$LDD" = "x"; then 17.3442 # List shared lib dependencies is used for 17.3443 # debug output and checking for forbidden dependencies. 17.3444 # We can build without it. 17.3445 LDD="true" 17.3446 -fi 17.3447 -# Extract the first word of "otool", so it can be a program name with args. 17.3448 + fi 17.3449 + # Extract the first word of "otool", so it can be a program name with args. 17.3450 set dummy otool; ac_word=$2 17.3451 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.3452 $as_echo_n "checking for $ac_word... " >&6; } 17.3453 @@ -10239,10 +10237,10 @@ 17.3454 fi 17.3455 17.3456 17.3457 -if test "x$OTOOL" = "x"; then 17.3458 - OTOOL="true" 17.3459 -fi 17.3460 -for ac_prog in readelf greadelf 17.3461 + if test "x$OTOOL" = "x"; then 17.3462 + OTOOL="true" 17.3463 + fi 17.3464 + for ac_prog in readelf greadelf 17.3465 do 17.3466 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.3467 set dummy $ac_prog; ac_word=$2 17.3468 @@ -10287,7 +10285,7 @@ 17.3469 test -n "$READELF" && break 17.3470 done 17.3471 17.3472 -# Extract the first word of "hg", so it can be a program name with args. 17.3473 + # Extract the first word of "hg", so it can be a program name with args. 17.3474 set dummy hg; ac_word=$2 17.3475 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.3476 $as_echo_n "checking for $ac_word... " >&6; } 17.3477 @@ -10327,7 +10325,7 @@ 17.3478 fi 17.3479 17.3480 17.3481 -# Extract the first word of "stat", so it can be a program name with args. 17.3482 + # Extract the first word of "stat", so it can be a program name with args. 17.3483 set dummy stat; ac_word=$2 17.3484 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.3485 $as_echo_n "checking for $ac_word... " >&6; } 17.3486 @@ -10367,7 +10365,7 @@ 17.3487 fi 17.3488 17.3489 17.3490 -# Extract the first word of "time", so it can be a program name with args. 17.3491 + # Extract the first word of "time", so it can be a program name with args. 17.3492 set dummy time; ac_word=$2 17.3493 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.3494 $as_echo_n "checking for $ac_word... " >&6; } 17.3495 @@ -10407,18 +10405,18 @@ 17.3496 fi 17.3497 17.3498 17.3499 -# Check if it's GNU time 17.3500 -IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'` 17.3501 -if test "x$IS_GNU_TIME" != x; then 17.3502 - IS_GNU_TIME=yes 17.3503 -else 17.3504 - IS_GNU_TIME=no 17.3505 -fi 17.3506 - 17.3507 - 17.3508 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 17.3509 - 17.3510 - for ac_prog in comm 17.3511 + # Check if it's GNU time 17.3512 + IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'` 17.3513 + if test "x$IS_GNU_TIME" != x; then 17.3514 + IS_GNU_TIME=yes 17.3515 + else 17.3516 + IS_GNU_TIME=no 17.3517 + fi 17.3518 + 17.3519 + 17.3520 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 17.3521 + 17.3522 + for ac_prog in comm 17.3523 do 17.3524 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.3525 set dummy $ac_prog; ac_word=$2 17.3526 @@ -10464,23 +10462,23 @@ 17.3527 done 17.3528 17.3529 17.3530 - if test "x$COMM" = x; then 17.3531 - if test "xcomm" = x; then 17.3532 - PROG_NAME=comm 17.3533 - else 17.3534 - PROG_NAME=comm 17.3535 - fi 17.3536 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.3537 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.3538 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.3539 - fi 17.3540 - 17.3541 - 17.3542 -fi 17.3543 - 17.3544 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 17.3545 - 17.3546 - for ac_prog in xattr 17.3547 + if test "x$COMM" = x; then 17.3548 + if test "xcomm" = x; then 17.3549 + PROG_NAME=comm 17.3550 + else 17.3551 + PROG_NAME=comm 17.3552 + fi 17.3553 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.3554 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.3555 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.3556 + fi 17.3557 + 17.3558 + 17.3559 + fi 17.3560 + 17.3561 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 17.3562 + 17.3563 + for ac_prog in xattr 17.3564 do 17.3565 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.3566 set dummy $ac_prog; ac_word=$2 17.3567 @@ -10526,19 +10524,19 @@ 17.3568 done 17.3569 17.3570 17.3571 - if test "x$XATTR" = x; then 17.3572 - if test "xxattr" = x; then 17.3573 - PROG_NAME=xattr 17.3574 - else 17.3575 - PROG_NAME=xattr 17.3576 - fi 17.3577 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.3578 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.3579 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.3580 - fi 17.3581 - 17.3582 - 17.3583 - # Extract the first word of "codesign", so it can be a program name with args. 17.3584 + if test "x$XATTR" = x; then 17.3585 + if test "xxattr" = x; then 17.3586 + PROG_NAME=xattr 17.3587 + else 17.3588 + PROG_NAME=xattr 17.3589 + fi 17.3590 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 17.3591 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 17.3592 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.3593 + fi 17.3594 + 17.3595 + 17.3596 + # Extract the first word of "codesign", so it can be a program name with args. 17.3597 set dummy codesign; ac_word=$2 17.3598 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.3599 $as_echo_n "checking for $ac_word... " >&6; } 17.3600 @@ -10578,23 +10576,23 @@ 17.3601 fi 17.3602 17.3603 17.3604 - if test "x$CODESIGN" != "x"; then 17.3605 - # Verify that the openjdk_codesign certificate is present 17.3606 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5 17.3607 + if test "x$CODESIGN" != "x"; then 17.3608 + # Verify that the openjdk_codesign certificate is present 17.3609 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5 17.3610 $as_echo_n "checking if openjdk_codesign certificate is present... " >&6; } 17.3611 - rm -f codesign-testfile 17.3612 - touch codesign-testfile 17.3613 - codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN= 17.3614 - rm -f codesign-testfile 17.3615 - if test "x$CODESIGN" = x; then 17.3616 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 17.3617 -$as_echo "no" >&6; } 17.3618 - else 17.3619 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 17.3620 + rm -f codesign-testfile 17.3621 + touch codesign-testfile 17.3622 + codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN= 17.3623 + rm -f codesign-testfile 17.3624 + if test "x$CODESIGN" = x; then 17.3625 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 17.3626 +$as_echo "no" >&6; } 17.3627 + else 17.3628 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 17.3629 $as_echo "yes" >&6; } 17.3630 - fi 17.3631 - fi 17.3632 -fi 17.3633 + fi 17.3634 + fi 17.3635 + fi 17.3636 17.3637 17.3638 # Check if pkg-config is available. 17.3639 @@ -10717,14 +10715,14 @@ 17.3640 17.3641 # After basic tools have been setup, we can check build os specific details. 17.3642 17.3643 -############################################################################### 17.3644 - 17.3645 -# Note that this is the build platform OS version! 17.3646 - 17.3647 -OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`" 17.3648 -OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`" 17.3649 -OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`" 17.3650 -OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`" 17.3651 + ############################################################################### 17.3652 + 17.3653 + # Note that this is the build platform OS version! 17.3654 + 17.3655 + OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`" 17.3656 + OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`" 17.3657 + OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`" 17.3658 + OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`" 17.3659 17.3660 17.3661 17.3662 @@ -10766,57 +10764,57 @@ 17.3663 17.3664 17.3665 17.3666 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then 17.3667 - if test "x$with_builddeps_conf" != x; then 17.3668 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supplied builddeps configuration file" >&5 17.3669 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then 17.3670 + if test "x$with_builddeps_conf" != x; then 17.3671 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supplied builddeps configuration file" >&5 17.3672 $as_echo_n "checking for supplied builddeps configuration file... " >&6; } 17.3673 - builddepsfile=$with_builddeps_conf 17.3674 - if test -s $builddepsfile; then 17.3675 - . $builddepsfile 17.3676 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: loaded!" >&5 17.3677 + builddepsfile=$with_builddeps_conf 17.3678 + if test -s $builddepsfile; then 17.3679 + . $builddepsfile 17.3680 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loaded!" >&5 17.3681 $as_echo "loaded!" >&6; } 17.3682 - else 17.3683 - as_fn_error $? "The given builddeps conf file $with_builddeps_conf could not be loaded!" "$LINENO" 5 17.3684 - fi 17.3685 - else 17.3686 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builddeps.conf files in sources..." >&5 17.3687 + else 17.3688 + as_fn_error $? "The given builddeps conf file $with_builddeps_conf could not be loaded!" "$LINENO" 5 17.3689 + fi 17.3690 + else 17.3691 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builddeps.conf files in sources..." >&5 17.3692 $as_echo_n "checking for builddeps.conf files in sources...... " >&6; } 17.3693 - builddepsfile=`mktemp` 17.3694 - touch $builddepsfile 17.3695 - # Put all found confs into a single file. 17.3696 - find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile 17.3697 - # Source the file to acquire the variables 17.3698 - if test -s $builddepsfile; then 17.3699 - . $builddepsfile 17.3700 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found at least one!" >&5 17.3701 + builddepsfile=`mktemp` 17.3702 + touch $builddepsfile 17.3703 + # Put all found confs into a single file. 17.3704 + find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile 17.3705 + # Source the file to acquire the variables 17.3706 + if test -s $builddepsfile; then 17.3707 + . $builddepsfile 17.3708 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found at least one!" >&5 17.3709 $as_echo "found at least one!" >&6; } 17.3710 - else 17.3711 - as_fn_error $? "Could not find any builddeps.conf at all!" "$LINENO" 5 17.3712 - fi 17.3713 - fi 17.3714 - # Create build and target names that use _ instead of "-" and ".". 17.3715 - # This is necessary to use them in variable names. 17.3716 - build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` 17.3717 - target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` 17.3718 - # Extract rewrite information for build and target 17.3719 - eval rewritten_build=\${REWRITE_${build_var}} 17.3720 - if test "x$rewritten_build" = x; then 17.3721 - rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME} 17.3722 - echo Build stays the same $rewritten_build 17.3723 - else 17.3724 - echo Rewriting build for builddeps into $rewritten_build 17.3725 - fi 17.3726 - eval rewritten_target=\${REWRITE_${target_var}} 17.3727 - if test "x$rewritten_target" = x; then 17.3728 - rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME} 17.3729 - echo Target stays the same $rewritten_target 17.3730 - else 17.3731 - echo Rewriting target for builddeps into $rewritten_target 17.3732 - fi 17.3733 - rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'` 17.3734 - rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'` 17.3735 - fi 17.3736 - for ac_prog in 7z unzip 17.3737 + else 17.3738 + as_fn_error $? "Could not find any builddeps.conf at all!" "$LINENO" 5 17.3739 + fi 17.3740 + fi 17.3741 + # Create build and target names that use _ instead of "-" and ".". 17.3742 + # This is necessary to use them in variable names. 17.3743 + build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` 17.3744 + target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` 17.3745 + # Extract rewrite information for build and target 17.3746 + eval rewritten_build=\${REWRITE_${build_var}} 17.3747 + if test "x$rewritten_build" = x; then 17.3748 + rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME} 17.3749 + echo Build stays the same $rewritten_build 17.3750 + else 17.3751 + echo Rewriting build for builddeps into $rewritten_build 17.3752 + fi 17.3753 + eval rewritten_target=\${REWRITE_${target_var}} 17.3754 + if test "x$rewritten_target" = x; then 17.3755 + rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME} 17.3756 + echo Target stays the same $rewritten_target 17.3757 + else 17.3758 + echo Rewriting target for builddeps into $rewritten_target 17.3759 + fi 17.3760 + rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'` 17.3761 + rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'` 17.3762 + fi 17.3763 + for ac_prog in 7z unzip 17.3764 do 17.3765 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.3766 set dummy $ac_prog; ac_word=$2 17.3767 @@ -10858,11 +10856,11 @@ 17.3768 test -n "$BDEPS_UNZIP" && break 17.3769 done 17.3770 17.3771 - if test "x$BDEPS_UNZIP" = x7z; then 17.3772 - BDEPS_UNZIP="7z x" 17.3773 - fi 17.3774 - 17.3775 - for ac_prog in wget lftp ftp 17.3776 + if test "x$BDEPS_UNZIP" = x7z; then 17.3777 + BDEPS_UNZIP="7z x" 17.3778 + fi 17.3779 + 17.3780 + for ac_prog in wget lftp ftp 17.3781 do 17.3782 # Extract the first word of "$ac_prog", so it can be a program name with args. 17.3783 set dummy $ac_prog; ac_word=$2 17.3784 @@ -10915,14 +10913,14 @@ 17.3785 # We need build & target for this. 17.3786 17.3787 17.3788 -############################################################################### 17.3789 -# 17.3790 -# Should we build a JDK/JVM with headful support (ie a graphical ui)? 17.3791 -# We always build headless support. 17.3792 -# 17.3793 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking headful support" >&5 17.3794 + ############################################################################### 17.3795 + # 17.3796 + # Should we build a JDK/JVM with headful support (ie a graphical ui)? 17.3797 + # We always build headless support. 17.3798 + # 17.3799 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking headful support" >&5 17.3800 $as_echo_n "checking headful support... " >&6; } 17.3801 -# Check whether --enable-headful was given. 17.3802 + # Check whether --enable-headful was given. 17.3803 if test "${enable_headful+set}" = set; then : 17.3804 enableval=$enable_headful; SUPPORT_HEADFUL=${enable_headful} 17.3805 else 17.3806 @@ -10930,110 +10928,110 @@ 17.3807 fi 17.3808 17.3809 17.3810 -SUPPORT_HEADLESS=yes 17.3811 -BUILD_HEADLESS="BUILD_HEADLESS:=true" 17.3812 - 17.3813 -if test "x$SUPPORT_HEADFUL" = xyes; then 17.3814 + SUPPORT_HEADLESS=yes 17.3815 + BUILD_HEADLESS="BUILD_HEADLESS:=true" 17.3816 + 17.3817 + if test "x$SUPPORT_HEADFUL" = xyes; then 17.3818 # We are building both headful and headless. 17.3819 headful_msg="include support for both headful and headless" 17.3820 -fi 17.3821 - 17.3822 -if test "x$SUPPORT_HEADFUL" = xno; then 17.3823 + fi 17.3824 + 17.3825 + if test "x$SUPPORT_HEADFUL" = xno; then 17.3826 # Thus we are building headless only. 17.3827 BUILD_HEADLESS="BUILD_HEADLESS:=true" 17.3828 headful_msg="headless only" 17.3829 -fi 17.3830 - 17.3831 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $headful_msg" >&5 17.3832 + fi 17.3833 + 17.3834 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $headful_msg" >&5 17.3835 $as_echo "$headful_msg" >&6; } 17.3836 17.3837 17.3838 17.3839 17.3840 17.3841 -# Control wether Hotspot runs Queens test after build. 17.3842 -# Check whether --enable-hotspot-test-in-build was given. 17.3843 + # Control wether Hotspot runs Queens test after build. 17.3844 + # Check whether --enable-hotspot-test-in-build was given. 17.3845 if test "${enable_hotspot_test_in_build+set}" = set; then : 17.3846 enableval=$enable_hotspot_test_in_build; 17.3847 else 17.3848 enable_hotspot_test_in_build=no 17.3849 fi 17.3850 17.3851 -if test "x$enable_hotspot_test_in_build" = "xyes"; then 17.3852 + if test "x$enable_hotspot_test_in_build" = "xyes"; then 17.3853 TEST_IN_BUILD=true 17.3854 -else 17.3855 + else 17.3856 TEST_IN_BUILD=false 17.3857 -fi 17.3858 - 17.3859 - 17.3860 -############################################################################### 17.3861 -# 17.3862 -# Choose cacerts source file 17.3863 -# 17.3864 + fi 17.3865 + 17.3866 + 17.3867 + ############################################################################### 17.3868 + # 17.3869 + # Choose cacerts source file 17.3870 + # 17.3871 17.3872 # Check whether --with-cacerts-file was given. 17.3873 if test "${with_cacerts_file+set}" = set; then : 17.3874 withval=$with_cacerts_file; 17.3875 fi 17.3876 17.3877 -if test "x$with_cacerts_file" != x; then 17.3878 + if test "x$with_cacerts_file" != x; then 17.3879 CACERTS_FILE=$with_cacerts_file 17.3880 -else 17.3881 + else 17.3882 CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts 17.3883 -fi 17.3884 - 17.3885 - 17.3886 -############################################################################### 17.3887 -# 17.3888 -# Enable or disable unlimited crypto 17.3889 -# 17.3890 -# Check whether --enable-unlimited-crypto was given. 17.3891 + fi 17.3892 + 17.3893 + 17.3894 + ############################################################################### 17.3895 + # 17.3896 + # Enable or disable unlimited crypto 17.3897 + # 17.3898 + # Check whether --enable-unlimited-crypto was given. 17.3899 if test "${enable_unlimited_crypto+set}" = set; then : 17.3900 enableval=$enable_unlimited_crypto; 17.3901 else 17.3902 enable_unlimited_crypto=no 17.3903 fi 17.3904 17.3905 -if test "x$enable_unlimited_crypto" = "xyes"; then 17.3906 + if test "x$enable_unlimited_crypto" = "xyes"; then 17.3907 UNLIMITED_CRYPTO=true 17.3908 -else 17.3909 + else 17.3910 UNLIMITED_CRYPTO=false 17.3911 -fi 17.3912 - 17.3913 - 17.3914 -############################################################################### 17.3915 -# 17.3916 -# Enable or disable the elliptic curve crypto implementation 17.3917 -# 17.3918 - 17.3919 - 17.3920 -############################################################################### 17.3921 -# 17.3922 -# Compress jars 17.3923 -# 17.3924 -COMPRESS_JARS=false 17.3925 - 17.3926 - 17.3927 - 17.3928 - 17.3929 -# Source the version numbers 17.3930 -. $AUTOCONF_DIR/version-numbers 17.3931 - 17.3932 -# Get the settings from parameters 17.3933 + fi 17.3934 + 17.3935 + 17.3936 + ############################################################################### 17.3937 + # 17.3938 + # Enable or disable the elliptic curve crypto implementation 17.3939 + # 17.3940 + 17.3941 + 17.3942 + ############################################################################### 17.3943 + # 17.3944 + # Compress jars 17.3945 + # 17.3946 + COMPRESS_JARS=false 17.3947 + 17.3948 + 17.3949 + 17.3950 + 17.3951 + # Source the version numbers 17.3952 + . $AUTOCONF_DIR/version-numbers 17.3953 + 17.3954 + # Get the settings from parameters 17.3955 17.3956 # Check whether --with-milestone was given. 17.3957 if test "${with_milestone+set}" = set; then : 17.3958 withval=$with_milestone; 17.3959 fi 17.3960 17.3961 -if test "x$with_milestone" = xyes; then 17.3962 - as_fn_error $? "Milestone must have a value" "$LINENO" 5 17.3963 -elif test "x$with_milestone" != x; then 17.3964 + if test "x$with_milestone" = xyes; then 17.3965 + as_fn_error $? "Milestone must have a value" "$LINENO" 5 17.3966 + elif test "x$with_milestone" != x; then 17.3967 MILESTONE="$with_milestone" 17.3968 -fi 17.3969 -if test "x$MILESTONE" = x; then 17.3970 - MILESTONE=internal 17.3971 -fi 17.3972 + fi 17.3973 + if test "x$MILESTONE" = x; then 17.3974 + MILESTONE=internal 17.3975 + fi 17.3976 17.3977 17.3978 # Check whether --with-update-version was given. 17.3979 @@ -11041,11 +11039,11 @@ 17.3980 withval=$with_update_version; 17.3981 fi 17.3982 17.3983 -if test "x$with_update_version" = xyes; then 17.3984 - as_fn_error $? "Update version must have a value" "$LINENO" 5 17.3985 -elif test "x$with_update_version" != x; then 17.3986 - JDK_UPDATE_VERSION="$with_update_version" 17.3987 -fi 17.3988 + if test "x$with_update_version" = xyes; then 17.3989 + as_fn_error $? "Update version must have a value" "$LINENO" 5 17.3990 + elif test "x$with_update_version" != x; then 17.3991 + JDK_UPDATE_VERSION="$with_update_version" 17.3992 + fi 17.3993 17.3994 17.3995 # Check whether --with-user-release-suffix was given. 17.3996 @@ -11053,11 +11051,11 @@ 17.3997 withval=$with_user_release_suffix; 17.3998 fi 17.3999 17.4000 -if test "x$with_user_release_suffix" = xyes; then 17.4001 - as_fn_error $? "Release suffix must have a value" "$LINENO" 5 17.4002 -elif test "x$with_user_release_suffix" != x; then 17.4003 - USER_RELEASE_SUFFIX="$with_user_release_suffix" 17.4004 -fi 17.4005 + if test "x$with_user_release_suffix" = xyes; then 17.4006 + as_fn_error $? "Release suffix must have a value" "$LINENO" 5 17.4007 + elif test "x$with_user_release_suffix" != x; then 17.4008 + USER_RELEASE_SUFFIX="$with_user_release_suffix" 17.4009 + fi 17.4010 17.4011 17.4012 # Check whether --with-build-number was given. 17.4013 @@ -11065,49 +11063,49 @@ 17.4014 withval=$with_build_number; 17.4015 fi 17.4016 17.4017 -if test "x$with_build_number" = xyes; then 17.4018 - as_fn_error $? "Build number must have a value" "$LINENO" 5 17.4019 -elif test "x$with_build_number" != x; then 17.4020 - JDK_BUILD_NUMBER="$with_build_number" 17.4021 -fi 17.4022 -# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set 17.4023 -if test "x$JDK_BUILD_NUMBER" = x; then 17.4024 - JDK_BUILD_NUMBER=b00 17.4025 - if test "x$USER_RELEASE_SUFFIX" = x; then 17.4026 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 17.4027 - # Avoid [:alnum:] since it depends on the locale. 17.4028 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` 17.4029 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 17.4030 - fi 17.4031 -fi 17.4032 - 17.4033 -# Now set the JDK version, milestone, build number etc. 17.4034 - 17.4035 - 17.4036 - 17.4037 - 17.4038 - 17.4039 - 17.4040 - 17.4041 - 17.4042 - 17.4043 - 17.4044 - 17.4045 - 17.4046 - 17.4047 - 17.4048 - 17.4049 -COPYRIGHT_YEAR=`date +'%Y'` 17.4050 - 17.4051 - 17.4052 -if test "x$JDK_UPDATE_VERSION" != x; then 17.4053 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 17.4054 -else 17.4055 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 17.4056 -fi 17.4057 - 17.4058 - 17.4059 -COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 17.4060 + if test "x$with_build_number" = xyes; then 17.4061 + as_fn_error $? "Build number must have a value" "$LINENO" 5 17.4062 + elif test "x$with_build_number" != x; then 17.4063 + JDK_BUILD_NUMBER="$with_build_number" 17.4064 + fi 17.4065 + # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set 17.4066 + if test "x$JDK_BUILD_NUMBER" = x; then 17.4067 + JDK_BUILD_NUMBER=b00 17.4068 + if test "x$USER_RELEASE_SUFFIX" = x; then 17.4069 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 17.4070 + # Avoid [:alnum:] since it depends on the locale. 17.4071 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` 17.4072 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 17.4073 + fi 17.4074 + fi 17.4075 + 17.4076 + # Now set the JDK version, milestone, build number etc. 17.4077 + 17.4078 + 17.4079 + 17.4080 + 17.4081 + 17.4082 + 17.4083 + 17.4084 + 17.4085 + 17.4086 + 17.4087 + 17.4088 + 17.4089 + 17.4090 + 17.4091 + 17.4092 + COPYRIGHT_YEAR=`date +'%Y'` 17.4093 + 17.4094 + 17.4095 + if test "x$JDK_UPDATE_VERSION" != x; then 17.4096 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 17.4097 + else 17.4098 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 17.4099 + fi 17.4100 + 17.4101 + 17.4102 + COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 17.4103 17.4104 17.4105 17.4106 @@ -11118,7 +11116,7 @@ 17.4107 ############################################################################### 17.4108 17.4109 17.4110 -BOOT_JDK_FOUND=no 17.4111 + BOOT_JDK_FOUND=no 17.4112 17.4113 # Check whether --with-boot-jdk was given. 17.4114 if test "${with_boot_jdk+set}" = set; then : 17.4115 @@ -11126,22 +11124,22 @@ 17.4116 fi 17.4117 17.4118 17.4119 -# We look for the Boot JDK through various means, going from more certain to 17.4120 -# more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if 17.4121 -# we detected something (if so, the path to the jdk is in BOOT_JDK). But we 17.4122 -# must check if this is indeed valid; otherwise we'll continue looking. 17.4123 - 17.4124 -# Test: Is bootjdk explicitely set by command line arguments? 17.4125 + # We look for the Boot JDK through various means, going from more certain to 17.4126 + # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if 17.4127 + # we detected something (if so, the path to the jdk is in BOOT_JDK). But we 17.4128 + # must check if this is indeed valid; otherwise we'll continue looking. 17.4129 + 17.4130 + # Test: Is bootjdk explicitely set by command line arguments? 17.4131 17.4132 if test "x$BOOT_JDK_FOUND" = xno; then 17.4133 # Now execute the test 17.4134 17.4135 -if test "x$with_boot_jdk" != x; then 17.4136 + if test "x$with_boot_jdk" != x; then 17.4137 BOOT_JDK=$with_boot_jdk 17.4138 BOOT_JDK_FOUND=maybe 17.4139 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using configure arguments" >&5 17.4140 $as_echo "$as_me: Found potential Boot JDK using configure arguments" >&6;} 17.4141 -fi 17.4142 + fi 17.4143 17.4144 17.4145 # If previous step claimed to have found a JDK, check it to see if it seems to be valid. 17.4146 @@ -11318,161 +11316,161 @@ 17.4147 fi # end check boot jdk found 17.4148 fi 17.4149 17.4150 -if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then 17.4151 - # Having specified an argument which is incorrect will produce an instant failure; 17.4152 - # we should not go on looking 17.4153 - as_fn_error $? "The path given by --with-boot-jdk does not contain a valid Boot JDK" "$LINENO" 5 17.4154 -fi 17.4155 - 17.4156 -# Test: Is bootjdk available from builddeps? 17.4157 + if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then 17.4158 + # Having specified an argument which is incorrect will produce an instant failure; 17.4159 + # we should not go on looking 17.4160 + as_fn_error $? "The path given by --with-boot-jdk does not contain a valid Boot JDK" "$LINENO" 5 17.4161 + fi 17.4162 + 17.4163 + # Test: Is bootjdk available from builddeps? 17.4164 17.4165 if test "x$BOOT_JDK_FOUND" = xno; then 17.4166 # Now execute the test 17.4167 17.4168 17.4169 17.4170 - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then 17.4171 - # Source the builddeps file again, to make sure it uses the latest variables! 17.4172 - . $builddepsfile 17.4173 - # Look for a target and build machine specific resource! 17.4174 - eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}} 17.4175 - if test "x$resource" = x; then 17.4176 - # Ok, lets instead look for a target specific resource 17.4177 - eval resource=\${builddep_bootjdk_TARGET_${rewritten_target_var}} 17.4178 - fi 17.4179 - if test "x$resource" = x; then 17.4180 - # Ok, lets instead look for a build specific resource 17.4181 - eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}} 17.4182 - fi 17.4183 - if test "x$resource" = x; then 17.4184 - # Ok, lets instead look for a generic resource 17.4185 - # (The bootjdk comes from M4 and not the shell, thus no need for eval here.) 17.4186 - resource=${builddep_bootjdk} 17.4187 - fi 17.4188 - if test "x$resource" != x; then 17.4189 - { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for bootjdk" >&5 17.4190 + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then 17.4191 + # Source the builddeps file again, to make sure it uses the latest variables! 17.4192 + . $builddepsfile 17.4193 + # Look for a target and build machine specific resource! 17.4194 + eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}} 17.4195 + if test "x$resource" = x; then 17.4196 + # Ok, lets instead look for a target specific resource 17.4197 + eval resource=\${builddep_bootjdk_TARGET_${rewritten_target_var}} 17.4198 + fi 17.4199 + if test "x$resource" = x; then 17.4200 + # Ok, lets instead look for a build specific resource 17.4201 + eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}} 17.4202 + fi 17.4203 + if test "x$resource" = x; then 17.4204 + # Ok, lets instead look for a generic resource 17.4205 + # (The bootjdk comes from M4 and not the shell, thus no need for eval here.) 17.4206 + resource=${builddep_bootjdk} 17.4207 + fi 17.4208 + if test "x$resource" != x; then 17.4209 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for bootjdk" >&5 17.4210 $as_echo "$as_me: Using builddeps $resource for bootjdk" >&6;} 17.4211 - # If the resource in the builddeps.conf file is an existing directory, 17.4212 - # for example /java/linux/cups 17.4213 - if test -d ${resource}; then 17.4214 - depdir=${resource} 17.4215 - else 17.4216 - 17.4217 -# bootjdk is for example mymodule 17.4218 -# $resource is for example libs/general/libmymod_1_2_3.zip 17.4219 -# $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps 17.4220 -# $with_builddeps_dir is for example /localhome/builddeps 17.4221 -# depdir is the name of the variable into which we store the depdir, eg MYMOD 17.4222 -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and 17.4223 -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3 17.4224 - filename=`basename $resource` 17.4225 - filebase=`echo $filename | sed 's/\.[^\.]*$//'` 17.4226 - filebase=${filename%%.*} 17.4227 - extension=${filename#*.} 17.4228 - installdir=$with_builddeps_dir/$filebase 17.4229 - if test ! -f $installdir/$filename.unpacked; then 17.4230 - { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&5 17.4231 + # If the resource in the builddeps.conf file is an existing directory, 17.4232 + # for example /java/linux/cups 17.4233 + if test -d ${resource}; then 17.4234 + depdir=${resource} 17.4235 + else 17.4236 + 17.4237 + # bootjdk is for example mymodule 17.4238 + # $resource is for example libs/general/libmymod_1_2_3.zip 17.4239 + # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps 17.4240 + # $with_builddeps_dir is for example /localhome/builddeps 17.4241 + # depdir is the name of the variable into which we store the depdir, eg MYMOD 17.4242 + # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and 17.4243 + # unzip into the directory: /localhome/builddeps/libmymod_1_2_3 17.4244 + filename=`basename $resource` 17.4245 + filebase=`echo $filename | sed 's/\.[^\.]*$//'` 17.4246 + filebase=${filename%%.*} 17.4247 + extension=${filename#*.} 17.4248 + installdir=$with_builddeps_dir/$filebase 17.4249 + if test ! -f $installdir/$filename.unpacked; then 17.4250 + { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&5 17.4251 $as_echo "$as_me: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&6;} 17.4252 - if test ! -d $installdir; then 17.4253 - mkdir -p $installdir 17.4254 - fi 17.4255 - if test ! -d $installdir; then 17.4256 - as_fn_error $? "Could not create directory $installdir" "$LINENO" 5 17.4257 - fi 17.4258 - tmpfile=`mktemp $installdir/bootjdk.XXXXXXXXX` 17.4259 - touch $tmpfile 17.4260 - if test ! -f $tmpfile; then 17.4261 - as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5 17.4262 - fi 17.4263 - 17.4264 - # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip 17.4265 - # $tmpfile is the local file name for the downloaded file. 17.4266 - VALID_TOOL=no 17.4267 - if test "x$BDEPS_FTP" = xwget; then 17.4268 - VALID_TOOL=yes 17.4269 - wget -O $tmpfile $with_builddeps_server/$resource 17.4270 - fi 17.4271 - if test "x$BDEPS_FTP" = xlftp; then 17.4272 - VALID_TOOL=yes 17.4273 - lftp -c "get $with_builddeps_server/$resource -o $tmpfile" 17.4274 - fi 17.4275 - if test "x$BDEPS_FTP" = xftp; then 17.4276 - VALID_TOOL=yes 17.4277 - FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'` 17.4278 - FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'` 17.4279 - FTPUSERPWD=${FTPSERVER%%@*} 17.4280 - if test "x$FTPSERVER" != "x$FTPUSERPWD"; then 17.4281 - FTPUSER=${userpwd%%:*} 17.4282 - FTPPWD=${userpwd#*@} 17.4283 - FTPSERVER=${FTPSERVER#*@} 17.4284 - else 17.4285 - FTPUSER=ftp 17.4286 - FTPPWD=ftp 17.4287 - fi 17.4288 - # the "pass" command does not work on some 17.4289 - # ftp clients (read ftp.exe) but if it works, 17.4290 - # passive mode is better! 17.4291 - (\ 17.4292 - echo "user $FTPUSER $FTPPWD" ;\ 17.4293 - echo "pass" ;\ 17.4294 - echo "bin" ;\ 17.4295 - echo "get $FTPPATH $tmpfile" ;\ 17.4296 - ) | ftp -in $FTPSERVER 17.4297 - fi 17.4298 - if test "x$VALID_TOOL" != xyes; then 17.4299 - as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5 17.4300 - fi 17.4301 - 17.4302 - mv $tmpfile $installdir/$filename 17.4303 - if test ! -s $installdir/$filename; then 17.4304 - as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5 17.4305 - fi 17.4306 - case "$extension" in 17.4307 - zip) echo "Unzipping $installdir/$filename..." 17.4308 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked) 17.4309 - ;; 17.4310 - tar.gz) echo "Untaring $installdir/$filename..." 17.4311 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) 17.4312 - ;; 17.4313 - tgz) echo "Untaring $installdir/$filename..." 17.4314 - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) 17.4315 - ;; 17.4316 - *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5 17.4317 - ;; 17.4318 - esac 17.4319 - fi 17.4320 - if test -f $installdir/$filename.unpacked; then 17.4321 - depdir=$installdir 17.4322 - fi 17.4323 - 17.4324 - fi 17.4325 - # Source the builddeps file again, because in the previous command, the depdir 17.4326 - # was updated to point at the current build dependency install directory. 17.4327 - . $builddepsfile 17.4328 - # Now extract variables from the builddeps.conf files. 17.4329 - theroot=${builddep_bootjdk_ROOT} 17.4330 - thecflags=${builddep_bootjdk_CFLAGS} 17.4331 - thelibs=${builddep_bootjdk_LIBS} 17.4332 - if test "x$depdir" = x; then 17.4333 - as_fn_error $? "Could not download build dependency bootjdk" "$LINENO" 5 17.4334 - fi 17.4335 - BOOT_JDK=$depdir 17.4336 - if test "x$theroot" != x; then 17.4337 - BOOT_JDK="$theroot" 17.4338 - fi 17.4339 - if test "x$thecflags" != x; then 17.4340 - BOOT_JDK_CFLAGS="$thecflags" 17.4341 - fi 17.4342 - if test "x$thelibs" != x; then 17.4343 - BOOT_JDK_LIBS="$thelibs" 17.4344 - fi 17.4345 - BOOT_JDK_FOUND=maybe 17.4346 - else BOOT_JDK_FOUND=no 17.4347 - 17.4348 - fi 17.4349 - else BOOT_JDK_FOUND=no 17.4350 - 17.4351 - fi 17.4352 + if test ! -d $installdir; then 17.4353 + mkdir -p $installdir 17.4354 + fi 17.4355 + if test ! -d $installdir; then 17.4356 + as_fn_error $? "Could not create directory $installdir" "$LINENO" 5 17.4357 + fi 17.4358 + tmpfile=`mktemp $installdir/bootjdk.XXXXXXXXX` 17.4359 + touch $tmpfile 17.4360 + if test ! -f $tmpfile; then 17.4361 + as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5 17.4362 + fi 17.4363 + 17.4364 + # $with_builddeps_server/$resource is the ftp://abuilddeps.server.com/libs/cups.zip 17.4365 + # $tmpfile is the local file name for the downloaded file. 17.4366 + VALID_TOOL=no 17.4367 + if test "x$BDEPS_FTP" = xwget; then 17.4368 + VALID_TOOL=yes 17.4369 + wget -O $tmpfile $with_builddeps_server/$resource 17.4370 + fi 17.4371 + if test "x$BDEPS_FTP" = xlftp; then 17.4372 + VALID_TOOL=yes 17.4373 + lftp -c "get $with_builddeps_server/$resource -o $tmpfile" 17.4374 + fi 17.4375 + if test "x$BDEPS_FTP" = xftp; then 17.4376 + VALID_TOOL=yes 17.4377 + FTPSERVER=`echo $with_builddeps_server/$resource | cut -f 3 -d '/'` 17.4378 + FTPPATH=`echo $with_builddeps_server/$resource | cut -f 4- -d '/'` 17.4379 + FTPUSERPWD=${FTPSERVER%%@*} 17.4380 + if test "x$FTPSERVER" != "x$FTPUSERPWD"; then 17.4381 + FTPUSER=${userpwd%%:*} 17.4382 + FTPPWD=${userpwd#*@} 17.4383 + FTPSERVER=${FTPSERVER#*@} 17.4384 + else 17.4385 + FTPUSER=ftp 17.4386 + FTPPWD=ftp 17.4387 + fi 17.4388 + # the "pass" command does not work on some 17.4389 + # ftp clients (read ftp.exe) but if it works, 17.4390 + # passive mode is better! 17.4391 + ( \ 17.4392 + echo "user $FTPUSER $FTPPWD" ; \ 17.4393 + echo "pass" ; \ 17.4394 + echo "bin" ; \ 17.4395 + echo "get $FTPPATH $tmpfile" ; \ 17.4396 + ) | ftp -in $FTPSERVER 17.4397 + fi 17.4398 + if test "x$VALID_TOOL" != xyes; then 17.4399 + as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5 17.4400 + fi 17.4401 + 17.4402 + mv $tmpfile $installdir/$filename 17.4403 + if test ! -s $installdir/$filename; then 17.4404 + as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5 17.4405 + fi 17.4406 + case "$extension" in 17.4407 + zip) echo "Unzipping $installdir/$filename..." 17.4408 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked) 17.4409 + ;; 17.4410 + tar.gz) echo "Untaring $installdir/$filename..." 17.4411 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) 17.4412 + ;; 17.4413 + tgz) echo "Untaring $installdir/$filename..." 17.4414 + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) 17.4415 + ;; 17.4416 + *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5 17.4417 + ;; 17.4418 + esac 17.4419 + fi 17.4420 + if test -f $installdir/$filename.unpacked; then 17.4421 + depdir=$installdir 17.4422 + fi 17.4423 + 17.4424 + fi 17.4425 + # Source the builddeps file again, because in the previous command, the depdir 17.4426 + # was updated to point at the current build dependency install directory. 17.4427 + . $builddepsfile 17.4428 + # Now extract variables from the builddeps.conf files. 17.4429 + theroot=${builddep_bootjdk_ROOT} 17.4430 + thecflags=${builddep_bootjdk_CFLAGS} 17.4431 + thelibs=${builddep_bootjdk_LIBS} 17.4432 + if test "x$depdir" = x; then 17.4433 + as_fn_error $? "Could not download build dependency bootjdk" "$LINENO" 5 17.4434 + fi 17.4435 + BOOT_JDK=$depdir 17.4436 + if test "x$theroot" != x; then 17.4437 + BOOT_JDK="$theroot" 17.4438 + fi 17.4439 + if test "x$thecflags" != x; then 17.4440 + BOOT_JDK_CFLAGS="$thecflags" 17.4441 + fi 17.4442 + if test "x$thelibs" != x; then 17.4443 + BOOT_JDK_LIBS="$thelibs" 17.4444 + fi 17.4445 + BOOT_JDK_FOUND=maybe 17.4446 + else BOOT_JDK_FOUND=no 17.4447 + 17.4448 + fi 17.4449 + else BOOT_JDK_FOUND=no 17.4450 + 17.4451 + fi 17.4452 17.4453 17.4454 17.4455 @@ -11651,13 +11649,13 @@ 17.4456 fi 17.4457 17.4458 17.4459 -# Test: Is $JAVA_HOME set? 17.4460 + # Test: Is $JAVA_HOME set? 17.4461 17.4462 if test "x$BOOT_JDK_FOUND" = xno; then 17.4463 # Now execute the test 17.4464 17.4465 - if test "x$JAVA_HOME" != x; then 17.4466 - JAVA_HOME_PROCESSED="$JAVA_HOME" 17.4467 + if test "x$JAVA_HOME" != x; then 17.4468 + JAVA_HOME_PROCESSED="$JAVA_HOME" 17.4469 17.4470 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 17.4471 17.4472 @@ -11780,18 +11778,18 @@ 17.4473 JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`" 17.4474 fi 17.4475 17.4476 - if test ! -d "$JAVA_HOME_PROCESSED"; then 17.4477 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your JAVA_HOME points to a non-existing directory!" >&5 17.4478 + if test ! -d "$JAVA_HOME_PROCESSED"; then 17.4479 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your JAVA_HOME points to a non-existing directory!" >&5 17.4480 $as_echo "$as_me: Your JAVA_HOME points to a non-existing directory!" >&6;} 17.4481 - else 17.4482 - # Aha, the user has set a JAVA_HOME 17.4483 - # let us use that as the Boot JDK. 17.4484 - BOOT_JDK="$JAVA_HOME_PROCESSED" 17.4485 - BOOT_JDK_FOUND=maybe 17.4486 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using JAVA_HOME" >&5 17.4487 + else 17.4488 + # Aha, the user has set a JAVA_HOME 17.4489 + # let us use that as the Boot JDK. 17.4490 + BOOT_JDK="$JAVA_HOME_PROCESSED" 17.4491 + BOOT_JDK_FOUND=maybe 17.4492 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using JAVA_HOME" >&5 17.4493 $as_echo "$as_me: Found potential Boot JDK using JAVA_HOME" >&6;} 17.4494 - fi 17.4495 - fi 17.4496 + fi 17.4497 + fi 17.4498 17.4499 17.4500 # If previous step claimed to have found a JDK, check it to see if it seems to be valid. 17.4501 @@ -11969,17 +11967,17 @@ 17.4502 fi 17.4503 17.4504 17.4505 -# Test: Is there a /usr/libexec/java_home? (Typically on MacOSX) 17.4506 + # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX) 17.4507 17.4508 if test "x$BOOT_JDK_FOUND" = xno; then 17.4509 # Now execute the test 17.4510 17.4511 - if test -x /usr/libexec/java_home; then 17.4512 - BOOT_JDK=`/usr/libexec/java_home` 17.4513 - BOOT_JDK_FOUND=maybe 17.4514 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using /usr/libexec/java_home" >&5 17.4515 + if test -x /usr/libexec/java_home; then 17.4516 + BOOT_JDK=`/usr/libexec/java_home` 17.4517 + BOOT_JDK_FOUND=maybe 17.4518 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using /usr/libexec/java_home" >&5 17.4519 $as_echo "$as_me: Found potential Boot JDK using /usr/libexec/java_home" >&6;} 17.4520 - fi 17.4521 + fi 17.4522 17.4523 17.4524 # If previous step claimed to have found a JDK, check it to see if it seems to be valid. 17.4525 @@ -12157,12 +12155,12 @@ 17.4526 fi 17.4527 17.4528 17.4529 -# Test: Is there a java or javac in the PATH, which is a symlink to the JDK? 17.4530 + # Test: Is there a java or javac in the PATH, which is a symlink to the JDK? 17.4531 17.4532 if test "x$BOOT_JDK_FOUND" = xno; then 17.4533 # Now execute the test 17.4534 17.4535 - # Extract the first word of "javac", so it can be a program name with args. 17.4536 + # Extract the first word of "javac", so it can be a program name with args. 17.4537 set dummy javac; ac_word=$2 17.4538 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.4539 $as_echo_n "checking for $ac_word... " >&6; } 17.4540 @@ -12202,7 +12200,7 @@ 17.4541 fi 17.4542 17.4543 17.4544 - # Extract the first word of "java", so it can be a program name with args. 17.4545 + # Extract the first word of "java", so it can be a program name with args. 17.4546 set dummy java; ac_word=$2 17.4547 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17.4548 $as_echo_n "checking for $ac_word... " >&6; } 17.4549 @@ -12242,72 +12240,72 @@ 17.4550 fi 17.4551 17.4552 17.4553 - BINARY="$JAVAC_CHECK" 17.4554 - if test "x$JAVAC_CHECK" = x; then 17.4555 - BINARY="$JAVA_CHECK" 17.4556 - fi 17.4557 - if test "x$BINARY" != x; then 17.4558 - # So there is a java(c) binary, it might be part of a JDK. 17.4559 - # Lets find the JDK/JRE directory by following symbolic links. 17.4560 - # Linux/GNU systems often have links from /usr/bin/java to 17.4561 - # /etc/alternatives/java to the real JDK binary. 17.4562 - 17.4563 - if test "x$OPENJDK_BUILD_OS" != xwindows; then 17.4564 - # Follow a chain of symbolic links. Use readlink 17.4565 - # where it exists, else fall back to horribly 17.4566 - # complicated shell code. 17.4567 - if test "x$READLINK_TESTED" != yes; then 17.4568 - # On MacOSX there is a readlink tool with a different 17.4569 - # purpose than the GNU readlink tool. Check the found readlink. 17.4570 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 17.4571 - if test "x$ISGNU" = x; then 17.4572 - # A readlink that we do not know how to use. 17.4573 - # Are there other non-GNU readlinks out there? 17.4574 - READLINK_TESTED=yes 17.4575 - READLINK= 17.4576 - fi 17.4577 - fi 17.4578 - 17.4579 - if test "x$READLINK" != x; then 17.4580 - BINARY=`$READLINK -f $BINARY` 17.4581 - else 17.4582 - # Save the current directory for restoring afterwards 17.4583 - STARTDIR=$PWD 17.4584 - COUNTER=0 17.4585 - sym_link_dir=`$DIRNAME $BINARY` 17.4586 - sym_link_file=`$BASENAME $BINARY` 17.4587 - cd $sym_link_dir 17.4588 - # Use -P flag to resolve symlinks in directories. 17.4589 - cd `$THEPWDCMD -P` 17.4590 - sym_link_dir=`$THEPWDCMD -P` 17.4591 - # Resolve file symlinks 17.4592 - while test $COUNTER -lt 20; do 17.4593 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 17.4594 - if test "x$ISLINK" == x; then 17.4595 - # This is not a symbolic link! We are done! 17.4596 - break 17.4597 - fi 17.4598 - # Again resolve directory symlinks since the target of the just found 17.4599 - # link could be in a different directory 17.4600 - cd `$DIRNAME $ISLINK` 17.4601 - sym_link_dir=`$THEPWDCMD -P` 17.4602 - sym_link_file=`$BASENAME $ISLINK` 17.4603 - let COUNTER=COUNTER+1 17.4604 - done 17.4605 - cd $STARTDIR 17.4606 - BINARY=$sym_link_dir/$sym_link_file 17.4607 - fi 17.4608 - fi 17.4609 - 17.4610 - BOOT_JDK=`dirname "$BINARY"` 17.4611 - BOOT_JDK=`cd "$BOOT_JDK/.."; pwd` 17.4612 - if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then 17.4613 - # Looks like we found ourselves an JDK 17.4614 - BOOT_JDK_FOUND=maybe 17.4615 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using java(c) in PATH" >&5 17.4616 + BINARY="$JAVAC_CHECK" 17.4617 + if test "x$JAVAC_CHECK" = x; then 17.4618 + BINARY="$JAVA_CHECK" 17.4619 + fi 17.4620 + if test "x$BINARY" != x; then 17.4621 + # So there is a java(c) binary, it might be part of a JDK. 17.4622 + # Lets find the JDK/JRE directory by following symbolic links. 17.4623 + # Linux/GNU systems often have links from /usr/bin/java to 17.4624 + # /etc/alternatives/java to the real JDK binary. 17.4625 + 17.4626 + if test "x$OPENJDK_BUILD_OS" != xwindows; then 17.4627 + # Follow a chain of symbolic links. Use readlink 17.4628 + # where it exists, else fall back to horribly 17.4629 + # complicated shell code. 17.4630 + if test "x$READLINK_TESTED" != yes; then 17.4631 + # On MacOSX there is a readlink tool with a different 17.4632 + # purpose than the GNU readlink tool. Check the found readlink. 17.4633 + ISGNU=`$READLINK --version 2>&1 | $GREP GNU` 17.4634 + if test "x$ISGNU" = x; then 17.4635 + # A readlink that we do not know how to use. 17.4636 + # Are there other non-GNU readlinks out there? 17.4637 + READLINK_TESTED=yes 17.4638 + READLINK= 17.4639 + fi 17.4640 + fi 17.4641 + 17.4642 + if test "x$READLINK" != x; then 17.4643 + BINARY=`$READLINK -f $BINARY` 17.4644 + else 17.4645 + # Save the current directory for restoring afterwards 17.4646 + STARTDIR=$PWD 17.4647 + COUNTER=0 17.4648 + sym_link_dir=`$DIRNAME $BINARY` 17.4649 + sym_link_file=`$BASENAME $BINARY` 17.4650 + cd $sym_link_dir 17.4651 + # Use -P flag to resolve symlinks in directories. 17.4652 + cd `$THEPWDCMD -P` 17.4653 + sym_link_dir=`$THEPWDCMD -P` 17.4654 + # Resolve file symlinks 17.4655 + while test $COUNTER -lt 20; do 17.4656 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 17.4657 + if test "x$ISLINK" == x; then 17.4658 + # This is not a symbolic link! We are done! 17.4659 + break 17.4660 + fi 17.4661 + # Again resolve directory symlinks since the target of the just found 17.4662 + # link could be in a different directory 17.4663 + cd `$DIRNAME $ISLINK` 17.4664 + sym_link_dir=`$THEPWDCMD -P` 17.4665 + sym_link_file=`$BASENAME $ISLINK` 17.4666 + let COUNTER=COUNTER+1 17.4667 + done 17.4668 + cd $STARTDIR 17.4669 + BINARY=$sym_link_dir/$sym_link_file 17.4670 + fi 17.4671 + fi 17.4672 + 17.4673 + BOOT_JDK=`dirname "$BINARY"` 17.4674 + BOOT_JDK=`cd "$BOOT_JDK/.."; pwd` 17.4675 + if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then 17.4676 + # Looks like we found ourselves an JDK 17.4677 + BOOT_JDK_FOUND=maybe 17.4678 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using java(c) in PATH" >&5 17.4679 $as_echo "$as_me: Found potential Boot JDK using java(c) in PATH" >&6;} 17.4680 - fi 17.4681 - fi 17.4682 + fi 17.4683 + fi 17.4684 17.4685 17.4686 # If previous step claimed to have found a JDK, check it to see if it seems to be valid. 17.4687 @@ -12485,7 +12483,7 @@ 17.4688 fi 17.4689 17.4690 17.4691 -# Test: Is there a JDK installed in default, well-known locations? 17.4692 + # Test: Is there a JDK installed in default, well-known locations? 17.4693 17.4694 if test "x$BOOT_JDK_FOUND" = xno; then 17.4695 # Now execute the test 17.4696 @@ -15715,67 +15713,67 @@ 17.4697 fi 17.4698 17.4699 17.4700 -# If we haven't found anything yet, we've truly lost. Give up. 17.4701 -if test "x$BOOT_JDK_FOUND" = xno; then 17.4702 - 17.4703 - # Print a helpful message on how to acquire the necessary build dependency. 17.4704 - # openjdk is the help tag: freetyp2, cups, pulse, alsa etc 17.4705 - MISSING_DEPENDENCY=openjdk 17.4706 - PKGHANDLER_COMMAND= 17.4707 - 17.4708 - case $PKGHANDLER in 17.4709 - apt-get) 17.4710 - apt_help $MISSING_DEPENDENCY ;; 17.4711 + # If we haven't found anything yet, we've truly lost. Give up. 17.4712 + if test "x$BOOT_JDK_FOUND" = xno; then 17.4713 + 17.4714 + # Print a helpful message on how to acquire the necessary build dependency. 17.4715 + # openjdk is the help tag: freetyp2, cups, pulse, alsa etc 17.4716 + MISSING_DEPENDENCY=openjdk 17.4717 + PKGHANDLER_COMMAND= 17.4718 + 17.4719 + case $PKGHANDLER in 17.4720 + apt-get) 17.4721 + apt_help $MISSING_DEPENDENCY ;; 17.4722 yum) 17.4723 - yum_help $MISSING_DEPENDENCY ;; 17.4724 - port) 17.4725 - port_help $MISSING_DEPENDENCY ;; 17.4726 - pkgutil) 17.4727 - pkgutil_help $MISSING_DEPENDENCY ;; 17.4728 - pkgadd) 17.4729 - pkgadd_help $MISSING_DEPENDENCY ;; 17.4730 + yum_help $MISSING_DEPENDENCY ;; 17.4731 + port) 17.4732 + port_help $MISSING_DEPENDENCY ;; 17.4733 + pkgutil) 17.4734 + pkgutil_help $MISSING_DEPENDENCY ;; 17.4735 + pkgadd) 17.4736 + pkgadd_help $MISSING_DEPENDENCY ;; 17.4737 * ) 17.4738 break ;; 17.4739 - esac 17.4740 - 17.4741 - if test "x$PKGHANDLER_COMMAND" != x; then 17.4742 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 17.4743 - fi 17.4744 - 17.4745 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5 17.4746 + esac 17.4747 + 17.4748 + if test "x$PKGHANDLER_COMMAND" != x; then 17.4749 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 17.4750 + fi 17.4751 + 17.4752 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5 17.4753 $as_echo "$as_me: Could not find a valid Boot JDK. $HELP_MSG" >&6;} 17.4754 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4755 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4756 $as_echo "$as_me: This might be fixed by explicitely setting --with-boot-jdk" >&6;} 17.4757 - as_fn_error $? "Cannot continue" "$LINENO" 5 17.4758 -fi 17.4759 - 17.4760 -# Setup proper paths for what we found 17.4761 -BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar" 17.4762 -if test ! -f "$BOOT_RTJAR"; then 17.4763 + as_fn_error $? "Cannot continue" "$LINENO" 5 17.4764 + fi 17.4765 + 17.4766 + # Setup proper paths for what we found 17.4767 + BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar" 17.4768 + if test ! -f "$BOOT_RTJAR"; then 17.4769 # On MacOSX it is called classes.jar 17.4770 BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar" 17.4771 if test -f "$BOOT_RTJAR"; then 17.4772 # Remove the .. 17.4773 BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}" 17.4774 fi 17.4775 -fi 17.4776 -BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar" 17.4777 -BOOT_JDK="$BOOT_JDK" 17.4778 - 17.4779 - 17.4780 - 17.4781 - 17.4782 -# Setup tools from the Boot JDK. 17.4783 + fi 17.4784 + BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar" 17.4785 + BOOT_JDK="$BOOT_JDK" 17.4786 + 17.4787 + 17.4788 + 17.4789 + 17.4790 + # Setup tools from the Boot JDK. 17.4791 17.4792 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for java in Boot JDK" >&5 17.4793 $as_echo_n "checking for java in Boot JDK... " >&6; } 17.4794 JAVA=$BOOT_JDK/bin/java 17.4795 if test ! -x $JAVA; then 17.4796 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4797 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4798 $as_echo "not found" >&6; } 17.4799 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4800 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4801 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;} 17.4802 - as_fn_error $? "Could not find java in the Boot JDK" "$LINENO" 5 17.4803 + as_fn_error $? "Could not find java in the Boot JDK" "$LINENO" 5 17.4804 fi 17.4805 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 17.4806 $as_echo "ok" >&6; } 17.4807 @@ -15785,11 +15783,11 @@ 17.4808 $as_echo_n "checking for javac in Boot JDK... " >&6; } 17.4809 JAVAC=$BOOT_JDK/bin/javac 17.4810 if test ! -x $JAVAC; then 17.4811 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4812 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4813 $as_echo "not found" >&6; } 17.4814 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4815 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4816 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;} 17.4817 - as_fn_error $? "Could not find javac in the Boot JDK" "$LINENO" 5 17.4818 + as_fn_error $? "Could not find javac in the Boot JDK" "$LINENO" 5 17.4819 fi 17.4820 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 17.4821 $as_echo "ok" >&6; } 17.4822 @@ -15799,11 +15797,11 @@ 17.4823 $as_echo_n "checking for javah in Boot JDK... " >&6; } 17.4824 JAVAH=$BOOT_JDK/bin/javah 17.4825 if test ! -x $JAVAH; then 17.4826 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4827 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4828 $as_echo "not found" >&6; } 17.4829 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4830 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4831 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;} 17.4832 - as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5 17.4833 + as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5 17.4834 fi 17.4835 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 17.4836 $as_echo "ok" >&6; } 17.4837 @@ -15813,11 +15811,11 @@ 17.4838 $as_echo_n "checking for javap in Boot JDK... " >&6; } 17.4839 JAVAP=$BOOT_JDK/bin/javap 17.4840 if test ! -x $JAVAP; then 17.4841 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4842 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4843 $as_echo "not found" >&6; } 17.4844 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4845 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4846 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;} 17.4847 - as_fn_error $? "Could not find javap in the Boot JDK" "$LINENO" 5 17.4848 + as_fn_error $? "Could not find javap in the Boot JDK" "$LINENO" 5 17.4849 fi 17.4850 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 17.4851 $as_echo "ok" >&6; } 17.4852 @@ -15827,11 +15825,11 @@ 17.4853 $as_echo_n "checking for jar in Boot JDK... " >&6; } 17.4854 JAR=$BOOT_JDK/bin/jar 17.4855 if test ! -x $JAR; then 17.4856 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4857 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4858 $as_echo "not found" >&6; } 17.4859 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4860 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4861 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;} 17.4862 - as_fn_error $? "Could not find jar in the Boot JDK" "$LINENO" 5 17.4863 + as_fn_error $? "Could not find jar in the Boot JDK" "$LINENO" 5 17.4864 fi 17.4865 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 17.4866 $as_echo "ok" >&6; } 17.4867 @@ -15841,11 +15839,11 @@ 17.4868 $as_echo_n "checking for rmic in Boot JDK... " >&6; } 17.4869 RMIC=$BOOT_JDK/bin/rmic 17.4870 if test ! -x $RMIC; then 17.4871 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4872 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4873 $as_echo "not found" >&6; } 17.4874 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4875 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4876 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;} 17.4877 - as_fn_error $? "Could not find rmic in the Boot JDK" "$LINENO" 5 17.4878 + as_fn_error $? "Could not find rmic in the Boot JDK" "$LINENO" 5 17.4879 fi 17.4880 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 17.4881 $as_echo "ok" >&6; } 17.4882 @@ -15855,28 +15853,28 @@ 17.4883 $as_echo_n "checking for native2ascii in Boot JDK... " >&6; } 17.4884 NATIVE2ASCII=$BOOT_JDK/bin/native2ascii 17.4885 if test ! -x $NATIVE2ASCII; then 17.4886 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4887 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 17.4888 $as_echo "not found" >&6; } 17.4889 - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4890 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 17.4891 $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;} 17.4892 - as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5 17.4893 + as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5 17.4894 fi 17.4895 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 17.4896 $as_echo "ok" >&6; } 17.4897 17.4898 17.4899 -# Finally, set some other options... 17.4900 - 17.4901 -# When compiling code to be executed by the Boot JDK, force jdk7 compatibility. 17.4902 -BOOT_JDK_SOURCETARGET="-source 7 -target 7" 17.4903 - 17.4904 - 17.4905 - 17.4906 - 17.4907 -############################################################################## 17.4908 -# 17.4909 -# Specify options for anything that is run with the Boot JDK. 17.4910 -# 17.4911 + # Finally, set some other options... 17.4912 + 17.4913 + # When compiling code to be executed by the Boot JDK, force jdk7 compatibility. 17.4914 + BOOT_JDK_SOURCETARGET="-source 7 -target 7" 17.4915 + 17.4916 + 17.4917 + 17.4918 + 17.4919 + ############################################################################## 17.4920 + # 17.4921 + # Specify options for anything that is run with the Boot JDK. 17.4922 + # 17.4923 17.4924 # Check whether --with-boot-jdk-jvmargs was given. 17.4925 if test "${with_boot_jdk_jvmargs+set}" = set; then : 17.4926 @@ -15884,135 +15882,135 @@ 17.4927 fi 17.4928 17.4929 17.4930 -if test "x$with_boot_jdk_jvmargs" = x; then 17.4931 + if test "x$with_boot_jdk_jvmargs" = x; then 17.4932 # Not all JVM:s accept the same arguments on the command line. 17.4933 # OpenJDK specific increase in thread stack for JDK build, 17.4934 # well more specifically, when running javac. 17.4935 if test "x$BUILD_NUM_BITS" = x32; then 17.4936 - STACK_SIZE=768 17.4937 - else 17.4938 - # Running Javac on a JVM on a 64-bit machine, the stack takes more space 17.4939 - # since 64-bit pointers are pushed on the stach. Apparently, we need 17.4940 - # to increase the stack space when javacing the JDK.... 17.4941 - STACK_SIZE=1536 17.4942 + STACK_SIZE=768 17.4943 + else 17.4944 + # Running Javac on a JVM on a 64-bit machine, the stack takes more space 17.4945 + # since 64-bit pointers are pushed on the stach. Apparently, we need 17.4946 + # to increase the stack space when javacing the JDK.... 17.4947 + STACK_SIZE=1536 17.4948 fi 17.4949 17.4950 # Minimum amount of heap memory. 17.4951 17.4952 - $ECHO "Check if jvm arg is ok: -Xms64M" >&5 17.4953 - $ECHO "Command: $JAVA -Xms64M -version" >&5 17.4954 - OUTPUT=`$JAVA -Xms64M -version 2>&1` 17.4955 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.4956 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.4957 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.4958 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M" 17.4959 - JVM_ARG_OK=true 17.4960 - else 17.4961 - $ECHO "Arg failed:" >&5 17.4962 - $ECHO "$OUTPUT" >&5 17.4963 - JVM_ARG_OK=false 17.4964 - fi 17.4965 + $ECHO "Check if jvm arg is ok: -Xms64M" >&5 17.4966 + $ECHO "Command: $JAVA -Xms64M -version" >&5 17.4967 + OUTPUT=`$JAVA -Xms64M -version 2>&1` 17.4968 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.4969 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.4970 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.4971 + boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M" 17.4972 + JVM_ARG_OK=true 17.4973 + else 17.4974 + $ECHO "Arg failed:" >&5 17.4975 + $ECHO "$OUTPUT" >&5 17.4976 + JVM_ARG_OK=false 17.4977 + fi 17.4978 17.4979 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 17.4980 - # Why does macosx need more heap? Its the huge JDK batch. 17.4981 - 17.4982 - $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5 17.4983 - $ECHO "Command: $JAVA -Xmx1600M -version" >&5 17.4984 - OUTPUT=`$JAVA -Xmx1600M -version 2>&1` 17.4985 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.4986 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.4987 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.4988 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M" 17.4989 - JVM_ARG_OK=true 17.4990 - else 17.4991 - $ECHO "Arg failed:" >&5 17.4992 - $ECHO "$OUTPUT" >&5 17.4993 - JVM_ARG_OK=false 17.4994 - fi 17.4995 - 17.4996 - else 17.4997 - 17.4998 - $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5 17.4999 - $ECHO "Command: $JAVA -Xmx1100M -version" >&5 17.5000 - OUTPUT=`$JAVA -Xmx1100M -version 2>&1` 17.5001 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5002 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5003 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5004 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M" 17.5005 - JVM_ARG_OK=true 17.5006 - else 17.5007 - $ECHO "Arg failed:" >&5 17.5008 - $ECHO "$OUTPUT" >&5 17.5009 - JVM_ARG_OK=false 17.5010 - fi 17.5011 + # Why does macosx need more heap? Its the huge JDK batch. 17.5012 + 17.5013 + $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5 17.5014 + $ECHO "Command: $JAVA -Xmx1600M -version" >&5 17.5015 + OUTPUT=`$JAVA -Xmx1600M -version 2>&1` 17.5016 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5017 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5018 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5019 + boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M" 17.5020 + JVM_ARG_OK=true 17.5021 + else 17.5022 + $ECHO "Arg failed:" >&5 17.5023 + $ECHO "$OUTPUT" >&5 17.5024 + JVM_ARG_OK=false 17.5025 + fi 17.5026 + 17.5027 + else 17.5028 + 17.5029 + $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5 17.5030 + $ECHO "Command: $JAVA -Xmx1100M -version" >&5 17.5031 + OUTPUT=`$JAVA -Xmx1100M -version 2>&1` 17.5032 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5033 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5034 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5035 + boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M" 17.5036 + JVM_ARG_OK=true 17.5037 + else 17.5038 + $ECHO "Arg failed:" >&5 17.5039 + $ECHO "$OUTPUT" >&5 17.5040 + JVM_ARG_OK=false 17.5041 + fi 17.5042 17.5043 fi 17.5044 # When is adding -client something that speeds up the JVM? 17.5045 # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA]) 17.5046 17.5047 - $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5 17.5048 - $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5 17.5049 - OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1` 17.5050 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5051 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5052 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5053 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m" 17.5054 - JVM_ARG_OK=true 17.5055 - else 17.5056 - $ECHO "Arg failed:" >&5 17.5057 - $ECHO "$OUTPUT" >&5 17.5058 - JVM_ARG_OK=false 17.5059 - fi 17.5060 - 17.5061 - 17.5062 - $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5 17.5063 - $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5 17.5064 - OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1` 17.5065 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5066 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5067 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5068 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m" 17.5069 - JVM_ARG_OK=true 17.5070 - else 17.5071 - $ECHO "Arg failed:" >&5 17.5072 - $ECHO "$OUTPUT" >&5 17.5073 - JVM_ARG_OK=false 17.5074 - fi 17.5075 - 17.5076 - 17.5077 - $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5 17.5078 - $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5 17.5079 - OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1` 17.5080 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5081 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5082 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5083 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE" 17.5084 - JVM_ARG_OK=true 17.5085 - else 17.5086 - $ECHO "Arg failed:" >&5 17.5087 - $ECHO "$OUTPUT" >&5 17.5088 - JVM_ARG_OK=false 17.5089 - fi 17.5090 + $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5 17.5091 + $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5 17.5092 + OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1` 17.5093 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5094 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5095 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5096 + boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m" 17.5097 + JVM_ARG_OK=true 17.5098 + else 17.5099 + $ECHO "Arg failed:" >&5 17.5100 + $ECHO "$OUTPUT" >&5 17.5101 + JVM_ARG_OK=false 17.5102 + fi 17.5103 + 17.5104 + 17.5105 + $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5 17.5106 + $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5 17.5107 + OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1` 17.5108 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5109 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5110 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5111 + boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m" 17.5112 + JVM_ARG_OK=true 17.5113 + else 17.5114 + $ECHO "Arg failed:" >&5 17.5115 + $ECHO "$OUTPUT" >&5 17.5116 + JVM_ARG_OK=false 17.5117 + fi 17.5118 + 17.5119 + 17.5120 + $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5 17.5121 + $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5 17.5122 + OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1` 17.5123 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5124 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5125 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5126 + boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE" 17.5127 + JVM_ARG_OK=true 17.5128 + else 17.5129 + $ECHO "Arg failed:" >&5 17.5130 + $ECHO "$OUTPUT" >&5 17.5131 + JVM_ARG_OK=false 17.5132 + fi 17.5133 17.5134 # Disable special log output when a debug build is used as Boot JDK... 17.5135 17.5136 - $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5 17.5137 - $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5 17.5138 - OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1` 17.5139 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5140 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5141 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5142 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" 17.5143 - JVM_ARG_OK=true 17.5144 - else 17.5145 - $ECHO "Arg failed:" >&5 17.5146 - $ECHO "$OUTPUT" >&5 17.5147 - JVM_ARG_OK=false 17.5148 - fi 17.5149 - 17.5150 -fi 17.5151 - 17.5152 -BOOT_JDK_JVMARGS=$boot_jdk_jvmargs 17.5153 + $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5 17.5154 + $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5 17.5155 + OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1` 17.5156 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 17.5157 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 17.5158 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 17.5159 + boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" 17.5160 + JVM_ARG_OK=true 17.5161 + else 17.5162 + $ECHO "Arg failed:" >&5 17.5163 + $ECHO "$OUTPUT" >&5 17.5164 + JVM_ARG_OK=false 17.5165 + fi 17.5166 + 17.5167 + fi 17.5168 + 17.5169 + BOOT_JDK_JVMARGS=$boot_jdk_jvmargs 17.5170 17.5171 17.5172 17.5173 @@ -16023,31 +16021,30 @@ 17.5174 ############################################################################### 17.5175 17.5176 17.5177 - 17.5178 -# Where are the sources. Any of these can be overridden 17.5179 -# using --with-override-corba and the likes. 17.5180 -LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" 17.5181 -CORBA_TOPDIR="$SRC_ROOT/corba" 17.5182 -JAXP_TOPDIR="$SRC_ROOT/jaxp" 17.5183 -JAXWS_TOPDIR="$SRC_ROOT/jaxws" 17.5184 -HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" 17.5185 -NASHORN_TOPDIR="$SRC_ROOT/nashorn" 17.5186 -JDK_TOPDIR="$SRC_ROOT/jdk" 17.5187 - 17.5188 - 17.5189 - 17.5190 - 17.5191 - 17.5192 - 17.5193 - 17.5194 - 17.5195 - 17.5196 - 17.5197 -############################################################################### 17.5198 -# 17.5199 -# Pickup additional source for a component from outside of the source root 17.5200 -# or override source for a component. 17.5201 -# 17.5202 + # Where are the sources. Any of these can be overridden 17.5203 + # using --with-override-corba and the likes. 17.5204 + LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" 17.5205 + CORBA_TOPDIR="$SRC_ROOT/corba" 17.5206 + JAXP_TOPDIR="$SRC_ROOT/jaxp" 17.5207 + JAXWS_TOPDIR="$SRC_ROOT/jaxws" 17.5208 + HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" 17.5209 + NASHORN_TOPDIR="$SRC_ROOT/nashorn" 17.5210 + JDK_TOPDIR="$SRC_ROOT/jdk" 17.5211 + 17.5212 + 17.5213 + 17.5214 + 17.5215 + 17.5216 + 17.5217 + 17.5218 + 17.5219 + 17.5220 + 17.5221 + ############################################################################### 17.5222 + # 17.5223 + # Pickup additional source for a component from outside of the source root 17.5224 + # or override source for a component. 17.5225 + # 17.5226 17.5227 # Check whether --with-add-source-root was given. 17.5228 if test "${with_add_source_root+set}" = set; then : 17.5229 @@ -16069,14 +16066,14 @@ 17.5230 fi 17.5231 17.5232 17.5233 -if test "x$with_adds_and_overrides" != x; then 17.5234 + if test "x$with_adds_and_overrides" != x; then 17.5235 with_add_source_root="$with_adds_and_overrides/adds" 17.5236 with_override_source_root="$with_adds_and_overrides/overrides" 17.5237 -fi 17.5238 - 17.5239 -if test "x$with_add_source_root" != x; then 17.5240 + fi 17.5241 + 17.5242 + if test "x$with_add_source_root" != x; then 17.5243 if ! test -d $with_add_source_root; then 17.5244 - as_fn_error $? "Trying to use a non-existant add-source-root $with_add_source_root" "$LINENO" 5 17.5245 + as_fn_error $? "Trying to use a non-existant add-source-root $with_add_source_root" "$LINENO" 5 17.5246 fi 17.5247 CURDIR="$PWD" 17.5248 cd "$with_add_source_root" 17.5249 @@ -16085,93 +16082,93 @@ 17.5250 # Verify that the addon source root does not have any root makefiles. 17.5251 # If it does, then it is usually an error, prevent this. 17.5252 if test -f $with_add_source_root/langtools/makefiles/Makefile || \ 17.5253 - test -f $with_add_source_root/langtools/make/Makefile; then 17.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 17.5255 + test -f $with_add_source_root/langtools/make/Makefile; then 17.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 17.5257 fi 17.5258 if test -f $with_add_source_root/corba/makefiles/Makefile || \ 17.5259 - test -f $with_add_source_root/corba/make/Makefile; then 17.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 17.5261 + test -f $with_add_source_root/corba/make/Makefile; then 17.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 17.5263 fi 17.5264 if test -f $with_add_source_root/jaxp/makefiles/Makefile || \ 17.5265 - test -f $with_add_source_root/jaxp/make/Makefile; then 17.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 17.5267 + test -f $with_add_source_root/jaxp/make/Makefile; then 17.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 17.5269 fi 17.5270 if test -f $with_add_source_root/jaxws/makefiles/Makefile || \ 17.5271 - test -f $with_add_source_root/jaxws/make/Makefile; then 17.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 17.5273 + test -f $with_add_source_root/jaxws/make/Makefile; then 17.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 17.5275 fi 17.5276 if test -f $with_add_source_root/hotspot/makefiles/Makefile || \ 17.5277 - test -f $with_add_source_root/hotspot/make/Makefile; then 17.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 17.5279 + test -f $with_add_source_root/hotspot/make/Makefile; then 17.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 17.5281 fi 17.5282 if test -f $with_add_source_root/nashorn/makefiles/Makefile || \ 17.5283 - test -f $with_add_source_root/nashorn/make/Makefile; then 17.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 17.5285 + test -f $with_add_source_root/nashorn/make/Makefile; then 17.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 17.5287 fi 17.5288 if test -f $with_add_source_root/jdk/makefiles/Makefile || \ 17.5289 - test -f $with_add_source_root/jdk/make/Makefile; then 17.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 17.5291 - fi 17.5292 -fi 17.5293 - 17.5294 - 17.5295 -if test "x$with_override_source_root" != x; then 17.5296 + test -f $with_add_source_root/jdk/make/Makefile; then 17.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 17.5298 + fi 17.5299 + fi 17.5300 + 17.5301 + 17.5302 + if test "x$with_override_source_root" != x; then 17.5303 if ! test -d $with_override_source_root; then 17.5304 - as_fn_error $? "Trying to use a non-existant override-source-root $with_override_source_root" "$LINENO" 5 17.5305 + as_fn_error $? "Trying to use a non-existant override-source-root $with_override_source_root" "$LINENO" 5 17.5306 fi 17.5307 CURDIR="$PWD" 17.5308 cd "$with_override_source_root" 17.5309 OVERRIDE_SRC_ROOT="`pwd`" 17.5310 cd "$CURDIR" 17.5311 if test -f $with_override_source_root/langtools/makefiles/Makefile || \ 17.5312 - test -f $with_override_source_root/langtools/make/Makefile; then 17.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 17.5314 + test -f $with_override_source_root/langtools/make/Makefile; then 17.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 17.5316 fi 17.5317 if test -f $with_override_source_root/corba/makefiles/Makefile || \ 17.5318 - test -f $with_override_source_root/corba/make/Makefile; then 17.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 17.5320 + test -f $with_override_source_root/corba/make/Makefile; then 17.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 17.5322 fi 17.5323 if test -f $with_override_source_root/jaxp/makefiles/Makefile || \ 17.5324 - test -f $with_override_source_root/jaxp/make/Makefile; then 17.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 17.5326 + test -f $with_override_source_root/jaxp/make/Makefile; then 17.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 17.5328 fi 17.5329 if test -f $with_override_source_root/jaxws/makefiles/Makefile || \ 17.5330 - test -f $with_override_source_root/jaxws/make/Makefile; then 17.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 17.5332 + test -f $with_override_source_root/jaxws/make/Makefile; then 17.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 17.5334 fi 17.5335 if test -f $with_override_source_root/hotspot/makefiles/Makefile || \ 17.5336 - test -f $with_override_source_root/hotspot/make/Makefile; then 17.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 17.5338 + test -f $with_override_source_root/hotspot/make/Makefile; then 17.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 17.5340 fi 17.5341 if test -f $with_override_source_root/nashorn/makefiles/Makefile || \ 17.5342 - test -f $with_override_source_root/nashorn/make/Makefile; then 17.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 17.5344 + test -f $with_override_source_root/nashorn/make/Makefile; then 17.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 17.5346 fi 17.5347 if test -f $with_override_source_root/jdk/makefiles/Makefile || \ 17.5348 - test -f $with_override_source_root/jdk/make/Makefile; then 17.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 17.5350 - fi 17.5351 -fi 17.5352 - 17.5353 - 17.5354 -############################################################################### 17.5355 -# 17.5356 -# Override a repo completely, this is used for example when you have 3 small 17.5357 -# development sandboxes of the langtools sources and want to avoid having 3 full 17.5358 -# OpenJDK sources checked out on disk. 17.5359 -# 17.5360 -# Assuming that the 3 langtools sandboxes are located here: 17.5361 -# /home/fredrik/sandbox1/langtools 17.5362 -# /home/fredrik/sandbox2/langtools 17.5363 -# /home/fredrik/sandbox3/langtools 17.5364 -# 17.5365 -# From the source root you create build subdirs manually: 17.5366 -# mkdir -p build1 build2 build3 17.5367 -# in each build directory run: 17.5368 -# (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make) 17.5369 -# (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make) 17.5370 -# (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make) 17.5371 -# 17.5372 + test -f $with_override_source_root/jdk/make/Makefile; then 17.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 17.5374 + fi 17.5375 + fi 17.5376 + 17.5377 + 17.5378 + ############################################################################### 17.5379 + # 17.5380 + # Override a repo completely, this is used for example when you have 3 small 17.5381 + # development sandboxes of the langtools sources and want to avoid having 3 full 17.5382 + # OpenJDK sources checked out on disk. 17.5383 + # 17.5384 + # Assuming that the 3 langtools sandboxes are located here: 17.5385 + # /home/fredrik/sandbox1/langtools 17.5386 + # /home/fredrik/sandbox2/langtools 17.5387 + # /home/fredrik/sandbox3/langtools 17.5388 + # 17.5389 + # From the source root you create build subdirs manually: 17.5390 + # mkdir -p build1 build2 build3 17.5391 + # in each build directory run: 17.5392 + # (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make) 17.5393 + # (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make) 17.5394 + # (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make) 17.5395 + # 17.5396 17.5397 17.5398 # Check whether --with-override-langtools was given. 17.5399 @@ -16222,106 +16219,105 @@ 17.5400 fi 17.5401 17.5402 17.5403 -if test "x$with_override_langtools" != x; then 17.5404 + if test "x$with_override_langtools" != x; then 17.5405 CURDIR="$PWD" 17.5406 cd "$with_override_langtools" 17.5407 LANGTOOLS_TOPDIR="`pwd`" 17.5408 cd "$CURDIR" 17.5409 if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then 17.5410 - as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5 17.5411 + as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5 17.5412 fi 17.5413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5 17.5414 $as_echo_n "checking if langtools should be overridden... " >&6; } 17.5415 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $LANGTOOLS_TOPDIR" >&5 17.5416 $as_echo "yes with $LANGTOOLS_TOPDIR" >&6; } 17.5417 -fi 17.5418 -if test "x$with_override_corba" != x; then 17.5419 + fi 17.5420 + if test "x$with_override_corba" != x; then 17.5421 CURDIR="$PWD" 17.5422 cd "$with_override_corba" 17.5423 CORBA_TOPDIR="`pwd`" 17.5424 cd "$CURDIR" 17.5425 if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then 17.5426 - as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5 17.5427 + as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5 17.5428 fi 17.5429 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5 17.5430 $as_echo_n "checking if corba should be overridden... " >&6; } 17.5431 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $CORBA_TOPDIR" >&5 17.5432 $as_echo "yes with $CORBA_TOPDIR" >&6; } 17.5433 -fi 17.5434 -if test "x$with_override_jaxp" != x; then 17.5435 + fi 17.5436 + if test "x$with_override_jaxp" != x; then 17.5437 CURDIR="$PWD" 17.5438 cd "$with_override_jaxp" 17.5439 JAXP_TOPDIR="`pwd`" 17.5440 cd "$CURDIR" 17.5441 if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then 17.5442 - as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5 17.5443 + as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5 17.5444 fi 17.5445 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5 17.5446 $as_echo_n "checking if jaxp should be overridden... " >&6; } 17.5447 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JAXP_TOPDIR" >&5 17.5448 $as_echo "yes with $JAXP_TOPDIR" >&6; } 17.5449 -fi 17.5450 -if test "x$with_override_jaxws" != x; then 17.5451 + fi 17.5452 + if test "x$with_override_jaxws" != x; then 17.5453 CURDIR="$PWD" 17.5454 cd "$with_override_jaxws" 17.5455 JAXWS_TOPDIR="`pwd`" 17.5456 cd "$CURDIR" 17.5457 if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then 17.5458 - as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5 17.5459 + as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5 17.5460 fi 17.5461 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5 <