1.1 --- a/common/autoconf/generated-configure.sh Thu Jan 22 14:39:36 2015 +0400
1.2 +++ b/common/autoconf/generated-configure.sh Fri Jan 23 14:52:26 2015 -0800
1.3 @@ -711,11 +711,11 @@
1.4 COMPILER_NAME
1.5 JT_HOME
1.6 JTREGEXE
1.7 -LIPO
1.8 ac_ct_OBJDUMP
1.9 OBJDUMP
1.10 ac_ct_OBJCOPY
1.11 OBJCOPY
1.12 +OTOOL
1.13 MCS
1.14 STRIP
1.15 GNM
1.16 @@ -762,6 +762,9 @@
1.17 PROPER_COMPILER_CC
1.18 POTENTIAL_CC
1.19 TOOLS_DIR_CC
1.20 +SDKPATH
1.21 +XCODEBUILD
1.22 +SET_DEVELOPER_DIR
1.23 BUILD_LD
1.24 BUILD_CXX
1.25 BUILD_CC
1.26 @@ -834,7 +837,6 @@
1.27 STAT
1.28 HG
1.29 READELF
1.30 -OTOOL
1.31 LDD
1.32 ZIP
1.33 UNZIP
1.34 @@ -1006,6 +1008,7 @@
1.35 with_target_bits
1.36 with_sys_root
1.37 with_tools_dir
1.38 +with_xcode_path
1.39 with_devkit
1.40 enable_openjdk_only
1.41 with_jdk_variant
1.42 @@ -1752,6 +1755,8 @@
1.43 cross-compiling)
1.44 --with-tools-dir search this directory for compilers and tools (for
1.45 cross-compiling)
1.46 + --with-xcode-path explicit path to Xcode 4 (generally for building on
1.47 + 10.9 and later)
1.48 --with-devkit use this directory as base for tools-dir and
1.49 sys-root (for cross-compiling)
1.50 --with-jdk-variant JDK variant to build (normal) [normal]
1.51 @@ -3108,7 +3113,7 @@
1.52
1.53 # Include these first...
1.54 #
1.55 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1.56 +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
1.57 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.58 #
1.59 # This code is free software; you can redistribute it and/or modify it
1.60 @@ -3624,7 +3629,7 @@
1.61
1.62
1.63 #
1.64 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.65 +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
1.66 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.67 #
1.68 # This code is free software; you can redistribute it and/or modify it
1.69 @@ -3764,7 +3769,7 @@
1.70
1.71
1.72 #
1.73 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.74 +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
1.75 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.76 #
1.77 # This code is free software; you can redistribute it and/or modify it
1.78 @@ -3872,7 +3877,7 @@
1.79 #CUSTOM_AUTOCONF_INCLUDE
1.80
1.81 # Do not change or remove the following line, it is needed for consistency checks:
1.82 -DATE_WHEN_GENERATED=1416326200
1.83 +DATE_WHEN_GENERATED=1421450260
1.84
1.85 ###############################################################################
1.86 #
1.87 @@ -7603,6 +7608,15 @@
1.88 fi
1.89
1.90
1.91 + # Xcode version will be validated later
1.92 +
1.93 +# Check whether --with-xcode-path was given.
1.94 +if test "${with_xcode_path+set}" = set; then :
1.95 + withval=$with_xcode_path; XCODE_PATH=$with_xcode_path
1.96 +
1.97 +fi
1.98 +
1.99 +
1.100
1.101 # Check whether --with-devkit was given.
1.102 if test "${with_devkit+set}" = set; then :
1.103 @@ -7960,7 +7974,7 @@
1.104
1.105
1.106 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.107 - MACOSX_UNIVERSAL="true"
1.108 + MACOSX_UNIVERSAL="false"
1.109 fi
1.110
1.111
1.112 @@ -10321,49 +10335,6 @@
1.113 # We can build without it.
1.114 LDD="true"
1.115 fi
1.116 - # Extract the first word of "otool", so it can be a program name with args.
1.117 -set dummy otool; ac_word=$2
1.118 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.119 -$as_echo_n "checking for $ac_word... " >&6; }
1.120 -if ${ac_cv_path_OTOOL+:} false; then :
1.121 - $as_echo_n "(cached) " >&6
1.122 -else
1.123 - case $OTOOL in
1.124 - [\\/]* | ?:[\\/]*)
1.125 - ac_cv_path_OTOOL="$OTOOL" # Let the user override the test with a path.
1.126 - ;;
1.127 - *)
1.128 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.129 -for as_dir in $PATH
1.130 -do
1.131 - IFS=$as_save_IFS
1.132 - test -z "$as_dir" && as_dir=.
1.133 - for ac_exec_ext in '' $ac_executable_extensions; do
1.134 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.135 - ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext"
1.136 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.137 - break 2
1.138 - fi
1.139 -done
1.140 - done
1.141 -IFS=$as_save_IFS
1.142 -
1.143 - ;;
1.144 -esac
1.145 -fi
1.146 -OTOOL=$ac_cv_path_OTOOL
1.147 -if test -n "$OTOOL"; then
1.148 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
1.149 -$as_echo "$OTOOL" >&6; }
1.150 -else
1.151 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.152 -$as_echo "no" >&6; }
1.153 -fi
1.154 -
1.155 -
1.156 - if test "x$OTOOL" = "x"; then
1.157 - OTOOL="true"
1.158 - fi
1.159 for ac_prog in readelf greadelf
1.160 do
1.161 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.162 @@ -19247,6 +19218,132 @@
1.163 PATH=$TOOLS_DIR:$PATH
1.164 fi
1.165
1.166 + # Before we locate the compilers, we need to sanitize the Xcode build environment
1.167 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.168 + # determine path to Xcode developer directory
1.169 + # can be empty in which case all the tools will rely on a sane Xcode 4 installation
1.170 + SET_DEVELOPER_DIR=
1.171 +
1.172 + if test -n "$XCODE_PATH"; then
1.173 + DEVELOPER_DIR="$XCODE_PATH"/Contents/Developer
1.174 + fi
1.175 +
1.176 + # DEVELOPER_DIR could also be provided directly
1.177 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining if we need to set DEVELOPER_DIR" >&5
1.178 +$as_echo_n "checking Determining if we need to set DEVELOPER_DIR... " >&6; }
1.179 + if test -n "$DEVELOPER_DIR"; then
1.180 + if test ! -d "$DEVELOPER_DIR"; then
1.181 + as_fn_error $? "Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode 4 application bundle using --with-xcode-path" "$LINENO" 5
1.182 + fi
1.183 + if test ! -f "$DEVELOPER_DIR"/usr/bin/xcodebuild; then
1.184 + as_fn_error $? "Xcode Developer path is not valid: $DEVELOPER_DIR, it must point to Contents/Developer inside an Xcode application bundle" "$LINENO" 5
1.185 + fi
1.186 + # make it visible to all the tools immediately
1.187 + export DEVELOPER_DIR
1.188 + SET_DEVELOPER_DIR="export DEVELOPER_DIR := $DEVELOPER_DIR"
1.189 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEVELOPER_DIR)" >&5
1.190 +$as_echo "yes ($DEVELOPER_DIR)" >&6; }
1.191 + else
1.192 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.193 +$as_echo "no" >&6; }
1.194 + fi
1.195 +
1.196 +
1.197 + # Extract the first word of "xcodebuild", so it can be a program name with args.
1.198 +set dummy xcodebuild; ac_word=$2
1.199 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.200 +$as_echo_n "checking for $ac_word... " >&6; }
1.201 +if ${ac_cv_path_XCODEBUILD+:} false; then :
1.202 + $as_echo_n "(cached) " >&6
1.203 +else
1.204 + case $XCODEBUILD in
1.205 + [\\/]* | ?:[\\/]*)
1.206 + ac_cv_path_XCODEBUILD="$XCODEBUILD" # Let the user override the test with a path.
1.207 + ;;
1.208 + *)
1.209 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.210 +for as_dir in $PATH
1.211 +do
1.212 + IFS=$as_save_IFS
1.213 + test -z "$as_dir" && as_dir=.
1.214 + for ac_exec_ext in '' $ac_executable_extensions; do
1.215 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.216 + ac_cv_path_XCODEBUILD="$as_dir/$ac_word$ac_exec_ext"
1.217 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.218 + break 2
1.219 + fi
1.220 +done
1.221 + done
1.222 +IFS=$as_save_IFS
1.223 +
1.224 + ;;
1.225 +esac
1.226 +fi
1.227 +XCODEBUILD=$ac_cv_path_XCODEBUILD
1.228 +if test -n "$XCODEBUILD"; then
1.229 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODEBUILD" >&5
1.230 +$as_echo "$XCODEBUILD" >&6; }
1.231 +else
1.232 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.233 +$as_echo "no" >&6; }
1.234 +fi
1.235 +
1.236 +
1.237 + if test -z "$XCODEBUILD"; then
1.238 + as_fn_error $? "The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X" "$LINENO" 5
1.239 + fi
1.240 +
1.241 + # Fail-fast: verify we're building on Xcode 4, we cannot build with Xcode 5 or later
1.242 + XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
1.243 + XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
1.244 + if test ! "${XC_VERSION_PARTS[0]}" = "4"; then
1.245 + as_fn_error $? "Xcode 4 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode 4 or make Xcode 4 active by using xcode-select." "$LINENO" 5
1.246 + fi
1.247 +
1.248 + # Some versions of Xcode 5 command line tools install gcc and g++ as symlinks to
1.249 + # clang and clang++, which will break the build. So handle that here if we need to.
1.250 + if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then
1.251 + # use xcrun to find the real gcc and add it's directory to PATH
1.252 + # then autoconf magic will find it
1.253 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&5
1.254 +$as_echo "$as_me: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&6;}
1.255 + XCODE_BIN_PATH=$(dirname `xcrun -find gcc`)
1.256 + PATH="$XCODE_BIN_PATH":$PATH
1.257 + fi
1.258 +
1.259 + # Determine appropriate SDKPATH, don't use SDKROOT as it interferes with the stub tools
1.260 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining Xcode SDK path" >&5
1.261 +$as_echo_n "checking Determining Xcode SDK path... " >&6; }
1.262 + # allow SDKNAME to be set to override the default SDK selection
1.263 + SDKPATH=`"$XCODEBUILD" -sdk ${SDKNAME:-macosx} -version | grep '^Path: ' | sed 's/Path: //'`
1.264 + if test -n "$SDKPATH"; then
1.265 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDKPATH" >&5
1.266 +$as_echo "$SDKPATH" >&6; }
1.267 + else
1.268 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none, will use system headers and frameworks)" >&5
1.269 +$as_echo "(none, will use system headers and frameworks)" >&6; }
1.270 + fi
1.271 +
1.272 +
1.273 + # Perform a basic sanity test
1.274 + if test ! -f "$SDKPATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
1.275 + as_fn_error $? "Unable to find required framework headers, provide a valid path to Xcode 4 using --with-xcode-path" "$LINENO" 5
1.276 + fi
1.277 +
1.278 + # if SDKPATH is non-empty then we need to add -isysroot and -iframework for gcc and g++
1.279 + if test -n "$SDKPATH"; then
1.280 + # We need -isysroot <path> and -iframework<path>/System/Library/Frameworks
1.281 + CFLAGS_JDK="${CFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
1.282 + CXXFLAGS_JDK="${CXXFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
1.283 + LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
1.284 + fi
1.285 +
1.286 + # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
1.287 + # setting this here means it doesn't have to be peppered throughout the forest
1.288 + CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.289 + CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.290 + LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.291 + fi
1.292
1.293 ### Locate C compiler (CC)
1.294
1.295 @@ -27066,6 +27163,49 @@
1.296 fi
1.297
1.298 elif test "x$OPENJDK_TARGET_OS" != xwindows; then
1.299 + # Extract the first word of "otool", so it can be a program name with args.
1.300 +set dummy otool; ac_word=$2
1.301 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.302 +$as_echo_n "checking for $ac_word... " >&6; }
1.303 +if ${ac_cv_path_OTOOL+:} false; then :
1.304 + $as_echo_n "(cached) " >&6
1.305 +else
1.306 + case $OTOOL in
1.307 + [\\/]* | ?:[\\/]*)
1.308 + ac_cv_path_OTOOL="$OTOOL" # Let the user override the test with a path.
1.309 + ;;
1.310 + *)
1.311 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.312 +for as_dir in $PATH
1.313 +do
1.314 + IFS=$as_save_IFS
1.315 + test -z "$as_dir" && as_dir=.
1.316 + for ac_exec_ext in '' $ac_executable_extensions; do
1.317 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.318 + ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext"
1.319 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.320 + break 2
1.321 + fi
1.322 +done
1.323 + done
1.324 +IFS=$as_save_IFS
1.325 +
1.326 + ;;
1.327 +esac
1.328 +fi
1.329 +OTOOL=$ac_cv_path_OTOOL
1.330 +if test -n "$OTOOL"; then
1.331 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
1.332 +$as_echo "$OTOOL" >&6; }
1.333 +else
1.334 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.335 +$as_echo "no" >&6; }
1.336 +fi
1.337 +
1.338 +
1.339 + if test "x$OTOOL" = "x"; then
1.340 + OTOOL="true"
1.341 + fi
1.342 if test -n "$ac_tool_prefix"; then
1.343 # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
1.344 set dummy ${ac_tool_prefix}nm; ac_word=$2
1.345 @@ -28530,315 +28670,6 @@
1.346
1.347 fi
1.348
1.349 - if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.350 - # Extract the first word of "lipo", so it can be a program name with args.
1.351 -set dummy lipo; ac_word=$2
1.352 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.353 -$as_echo_n "checking for $ac_word... " >&6; }
1.354 -if ${ac_cv_path_LIPO+:} false; then :
1.355 - $as_echo_n "(cached) " >&6
1.356 -else
1.357 - case $LIPO in
1.358 - [\\/]* | ?:[\\/]*)
1.359 - ac_cv_path_LIPO="$LIPO" # Let the user override the test with a path.
1.360 - ;;
1.361 - *)
1.362 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.363 -for as_dir in $PATH
1.364 -do
1.365 - IFS=$as_save_IFS
1.366 - test -z "$as_dir" && as_dir=.
1.367 - for ac_exec_ext in '' $ac_executable_extensions; do
1.368 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.369 - ac_cv_path_LIPO="$as_dir/$ac_word$ac_exec_ext"
1.370 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.371 - break 2
1.372 - fi
1.373 -done
1.374 - done
1.375 -IFS=$as_save_IFS
1.376 -
1.377 - ;;
1.378 -esac
1.379 -fi
1.380 -LIPO=$ac_cv_path_LIPO
1.381 -if test -n "$LIPO"; then
1.382 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
1.383 -$as_echo "$LIPO" >&6; }
1.384 -else
1.385 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.386 -$as_echo "no" >&6; }
1.387 -fi
1.388 -
1.389 -
1.390 -
1.391 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.392 -
1.393 - # First separate the path from the arguments. This will split at the first
1.394 - # space.
1.395 - complete="$LIPO"
1.396 - path="${complete%% *}"
1.397 - tmp="$complete EOL"
1.398 - arguments="${tmp#* }"
1.399 -
1.400 - # Input might be given as Windows format, start by converting to
1.401 - # unix format.
1.402 - new_path=`$CYGPATH -u "$path"`
1.403 -
1.404 - # Now try to locate executable using which
1.405 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.406 - # bat and cmd files are not always considered executable in cygwin causing which
1.407 - # to not find them
1.408 - if test "x$new_path" = x \
1.409 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.410 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.411 - new_path=`$CYGPATH -u "$path"`
1.412 - fi
1.413 - if test "x$new_path" = x; then
1.414 - # Oops. Which didn't find the executable.
1.415 - # The splitting of arguments from the executable at a space might have been incorrect,
1.416 - # since paths with space are more likely in Windows. Give it another try with the whole
1.417 - # argument.
1.418 - path="$complete"
1.419 - arguments="EOL"
1.420 - new_path=`$CYGPATH -u "$path"`
1.421 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.422 - # bat and cmd files are not always considered executable in cygwin causing which
1.423 - # to not find them
1.424 - if test "x$new_path" = x \
1.425 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.426 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.427 - new_path=`$CYGPATH -u "$path"`
1.428 - fi
1.429 - if test "x$new_path" = x; then
1.430 - # It's still not found. Now this is an unrecoverable error.
1.431 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
1.432 -$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
1.433 - has_space=`$ECHO "$complete" | $GREP " "`
1.434 - if test "x$has_space" != x; then
1.435 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.436 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.437 - fi
1.438 - as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.439 - fi
1.440 - fi
1.441 -
1.442 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.443 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.444 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.445 - # "foo.exe" is OK but "foo" is an error.
1.446 - #
1.447 - # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.448 - # It is also a way to make sure we got the proper file name for the real test later on.
1.449 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.450 - if test "x$test_shortpath" = x; then
1.451 - # Short path failed, file does not exist as specified.
1.452 - # Try adding .exe or .cmd
1.453 - if test -f "${new_path}.exe"; then
1.454 - input_to_shortpath="${new_path}.exe"
1.455 - elif test -f "${new_path}.cmd"; then
1.456 - input_to_shortpath="${new_path}.cmd"
1.457 - else
1.458 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$new_path\", is invalid." >&5
1.459 -$as_echo "$as_me: The path of LIPO, which resolves as \"$new_path\", is invalid." >&6;}
1.460 - { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.461 -$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.462 - as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.463 - fi
1.464 - else
1.465 - input_to_shortpath="$new_path"
1.466 - fi
1.467 -
1.468 - # Call helper function which possibly converts this using DOS-style short mode.
1.469 - # If so, the updated path is stored in $new_path.
1.470 - new_path="$input_to_shortpath"
1.471 -
1.472 - input_path="$input_to_shortpath"
1.473 - # Check if we need to convert this using DOS-style short mode. If the path
1.474 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.475 - # take no chances and rewrite it.
1.476 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.477 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.478 - if test "x$has_forbidden_chars" != x; then
1.479 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.480 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.481 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.482 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.483 - # Going to short mode and back again did indeed matter. Since short mode is
1.484 - # case insensitive, let's make it lowercase to improve readability.
1.485 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.486 - # Now convert it back to Unix-stile (cygpath)
1.487 - input_path=`$CYGPATH -u "$shortmode_path"`
1.488 - new_path="$input_path"
1.489 - fi
1.490 - fi
1.491 -
1.492 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.493 - if test "x$test_cygdrive_prefix" = x; then
1.494 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.495 - if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.496 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.497 - # a path prefixed by /cygdrive for fixpath to work.
1.498 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.499 - fi
1.500 - fi
1.501 -
1.502 - # remove trailing .exe if any
1.503 - new_path="${new_path/%.exe/}"
1.504 -
1.505 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.506 -
1.507 - # First separate the path from the arguments. This will split at the first
1.508 - # space.
1.509 - complete="$LIPO"
1.510 - path="${complete%% *}"
1.511 - tmp="$complete EOL"
1.512 - arguments="${tmp#* }"
1.513 -
1.514 - # Input might be given as Windows format, start by converting to
1.515 - # unix format.
1.516 - new_path="$path"
1.517 -
1.518 - windows_path="$new_path"
1.519 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.520 - unix_path=`$CYGPATH -u "$windows_path"`
1.521 - new_path="$unix_path"
1.522 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.523 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.524 - new_path="$unix_path"
1.525 - fi
1.526 -
1.527 -
1.528 - # Now try to locate executable using which
1.529 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.530 -
1.531 - if test "x$new_path" = x; then
1.532 - # Oops. Which didn't find the executable.
1.533 - # The splitting of arguments from the executable at a space might have been incorrect,
1.534 - # since paths with space are more likely in Windows. Give it another try with the whole
1.535 - # argument.
1.536 - path="$complete"
1.537 - arguments="EOL"
1.538 - new_path="$path"
1.539 -
1.540 - windows_path="$new_path"
1.541 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.542 - unix_path=`$CYGPATH -u "$windows_path"`
1.543 - new_path="$unix_path"
1.544 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.545 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.546 - new_path="$unix_path"
1.547 - fi
1.548 -
1.549 -
1.550 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.551 -
1.552 - if test "x$new_path" = x; then
1.553 - # It's still not found. Now this is an unrecoverable error.
1.554 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
1.555 -$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
1.556 - has_space=`$ECHO "$complete" | $GREP " "`
1.557 - if test "x$has_space" != x; then
1.558 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.559 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.560 - fi
1.561 - as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.562 - fi
1.563 - fi
1.564 -
1.565 - # Now new_path has a complete unix path to the binary
1.566 - if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.567 - # Keep paths in /bin as-is, but remove trailing .exe if any
1.568 - new_path="${new_path/%.exe/}"
1.569 - # Do not save /bin paths to all_fixpath_prefixes!
1.570 - else
1.571 - # Not in mixed or Windows style, start by that.
1.572 - new_path=`cmd //c echo $new_path`
1.573 -
1.574 - input_path="$new_path"
1.575 - # Check if we need to convert this using DOS-style short mode. If the path
1.576 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.577 - # take no chances and rewrite it.
1.578 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.579 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.580 - if test "x$has_forbidden_chars" != x; then
1.581 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.582 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.583 - fi
1.584 -
1.585 - # Output is in $new_path
1.586 -
1.587 - windows_path="$new_path"
1.588 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.589 - unix_path=`$CYGPATH -u "$windows_path"`
1.590 - new_path="$unix_path"
1.591 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.592 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.593 - new_path="$unix_path"
1.594 - fi
1.595 -
1.596 - # remove trailing .exe if any
1.597 - new_path="${new_path/%.exe/}"
1.598 -
1.599 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.600 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.601 - fi
1.602 -
1.603 - else
1.604 - # We're on a posix platform. Hooray! :)
1.605 - # First separate the path from the arguments. This will split at the first
1.606 - # space.
1.607 - complete="$LIPO"
1.608 - path="${complete%% *}"
1.609 - tmp="$complete EOL"
1.610 - arguments="${tmp#* }"
1.611 -
1.612 - # Cannot rely on the command "which" here since it doesn't always work.
1.613 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.614 - if test -z "$is_absolute_path"; then
1.615 - # Path to executable is not absolute. Find it.
1.616 - IFS_save="$IFS"
1.617 - IFS=:
1.618 - for p in $PATH; do
1.619 - if test -f "$p/$path" && test -x "$p/$path"; then
1.620 - new_path="$p/$path"
1.621 - break
1.622 - fi
1.623 - done
1.624 - IFS="$IFS_save"
1.625 - else
1.626 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving LIPO (as $path) failed, using $path directly." >&5
1.627 -$as_echo "$as_me: Resolving LIPO (as $path) failed, using $path directly." >&6;}
1.628 - new_path="$path"
1.629 - fi
1.630 -
1.631 - if test "x$new_path" = x; then
1.632 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
1.633 -$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
1.634 - has_space=`$ECHO "$complete" | $GREP " "`
1.635 - if test "x$has_space" != x; then
1.636 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.637 -$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.638 - fi
1.639 - as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.640 - fi
1.641 - fi
1.642 -
1.643 - # Now join together the path and the arguments once again
1.644 - if test "x$arguments" != xEOL; then
1.645 - new_complete="$new_path ${arguments% *}"
1.646 - else
1.647 - new_complete="$new_path"
1.648 - fi
1.649 -
1.650 - if test "x$complete" != "x$new_complete"; then
1.651 - LIPO="$new_complete"
1.652 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5
1.653 -$as_echo "$as_me: Rewriting LIPO to \"$new_complete\"" >&6;}
1.654 - fi
1.655 -
1.656 - fi
1.657 -
1.658
1.659
1.660 # Restore old path without tools dir
1.661 @@ -30388,8 +30219,6 @@
1.662 ALSA_NOT_NEEDED=yes
1.663 PULSE_NOT_NEEDED=yes
1.664 X11_NOT_NEEDED=yes
1.665 - # If the java runtime framework is disabled, then we need X11.
1.666 - # This will be adjusted below.
1.667 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
1.668 $as_echo "alsa pulse x11" >&6; }
1.669 fi
1.670 @@ -30410,11 +30239,7 @@
1.671 X11_NOT_NEEDED=yes
1.672 fi
1.673
1.674 - ###############################################################################
1.675 - #
1.676 - # Check for MacOSX support for OpenJDK.
1.677 - #
1.678 -
1.679 + # Deprecated and now ignored
1.680
1.681 # Check whether --enable-macosx-runtime-support was given.
1.682 if test "${enable_macosx_runtime_support+set}" = set; then :
1.683 @@ -30427,16 +30252,6 @@
1.684 fi
1.685
1.686
1.687 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Java Framework" >&5
1.688 -$as_echo_n "checking for Mac OS X Java Framework... " >&6; }
1.689 - if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
1.690 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: /System/Library/Frameworks/JavaVM.framework" >&5
1.691 -$as_echo "/System/Library/Frameworks/JavaVM.framework" >&6; }
1.692 - else
1.693 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.694 -$as_echo "no" >&6; }
1.695 - fi
1.696 -
1.697
1.698
1.699 ###############################################################################
