Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Tue, 22 Oct 2013 14:53:08 -0700
- author
- katleman
- date
- Tue, 22 Oct 2013 14:53:08 -0700
- changeset 864
- 9e177e7fc438
- parent 856
- 9d5284dfc00d
- parent 863
- 56db38956113
- child 865
- 4293401d683b
- child 866
- 269497597620
Merge
1.1 --- a/NewMakefile.gmk Tue Oct 22 13:56:11 2013 -0700 1.2 +++ b/NewMakefile.gmk Tue Oct 22 14:53:08 2013 -0700 1.3 @@ -36,10 +36,8 @@ 1.4 TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1 1.5 1.6 # Assume we have GNU make, but check version. 1.7 -ifeq (,$(findstring 3.81,$(MAKE_VERSION))) 1.8 - ifeq (,$(findstring 3.82,$(MAKE_VERSION))) 1.9 - $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) 1.10 - endif 1.11 +ifeq ($(strip $(foreach v, 3.81 3.82 4.%, $(filter $v, $(MAKE_VERSION)))), ) 1.12 + $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) 1.13 endif 1.14 1.15 # Locate this Makefile
2.1 --- a/common/autoconf/basics.m4 Tue Oct 22 13:56:11 2013 -0700 2.2 +++ b/common/autoconf/basics.m4 Tue Oct 22 14:53:08 2013 -0700 2.3 @@ -212,6 +212,18 @@ 2.4 [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])]) 2.5 ]) 2.6 2.7 +# Register a --enable argument but mark it as deprecated 2.8 +# $1: The name of the with argument to deprecate, not including --enable- 2.9 +# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -) 2.10 +AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE], 2.11 +[ 2.12 + AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1], 2.13 + [Deprecated. Option is kept for backwards compatibility and is ignored])]) 2.14 + if test "x$enable_$2" != x; then 2.15 + AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.]) 2.16 + fi 2.17 +]) 2.18 + 2.19 AC_DEFUN_ONCE([BASIC_INIT], 2.20 [ 2.21 # Save the original command line. This is passed to us by the wrapper configure script. 2.22 @@ -502,7 +514,7 @@ 2.23 if test "x$IS_GNU_MAKE" = x; then 2.24 AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.]) 2.25 else 2.26 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[[12346789]]'` 2.27 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[[12]]\)\|\(4\.\)'` 2.28 if test "x$IS_MODERN_MAKE" = x; then 2.29 AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.]) 2.30 else
3.1 --- a/common/autoconf/generated-configure.sh Tue Oct 22 13:56:11 2013 -0700 3.2 +++ b/common/autoconf/generated-configure.sh Tue Oct 22 14:53:08 2013 -0700 3.3 @@ -1716,9 +1716,9 @@ 3.4 --disable-debug-symbols disable generation of debug symbols [enabled] 3.5 --disable-zip-debug-info 3.6 disable zipping of debug-info files [enabled] 3.7 - --disable-macosx-runtime-support 3.8 - disable the use of MacOSX Java runtime support 3.9 - framework [enabled] 3.10 + --enable-macosx-runtime-support 3.11 + Deprecated. Option is kept for backwards 3.12 + compatibility and is ignored 3.13 --enable-sjavac use sjavac to do fast incremental compiles 3.14 [disabled] 3.15 --disable-precompiled-headers 3.16 @@ -3149,6 +3149,11 @@ 3.17 # $1: The name of the with argument to deprecate, not including --with- 3.18 3.19 3.20 +# Register a --enable argument but mark it as deprecated 3.21 +# $1: The name of the with argument to deprecate, not including --enable- 3.22 +# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -) 3.23 + 3.24 + 3.25 3.26 3.27 # Test that variable $1 denoting a program is not empty. If empty, exit with an error. 3.28 @@ -3444,16 +3449,42 @@ 3.29 cygwin_help() { 3.30 case $1 in 3.31 unzip) 3.32 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;; 3.33 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )" 3.34 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.35 + ;; 3.36 zip) 3.37 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;; 3.38 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )" 3.39 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.40 + ;; 3.41 make) 3.42 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;; 3.43 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )" 3.44 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.45 + ;; 3.46 + freetype2) 3.47 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.48 + HELP_MSG="To install freetype, run: 3.49 +wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe 3.50 +chmod +x /tmp/freetype-setup.exe 3.51 +/tmp/freetype-setup.exe 3.52 +Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\". 3.53 +After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll." 3.54 + else 3.55 + HELP_MSG="You need to build a 64-bit version of freetype. 3.56 +This is not readily available. 3.57 +You can find source code and build instructions on 3.58 +http://www.freetype.org/ 3.59 +If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically." 3.60 + fi 3.61 + ;; 3.62 * ) 3.63 break ;; 3.64 esac 3.65 } 3.66 3.67 +msys_help() { 3.68 + PKGHANDLER_COMMAND="" 3.69 +} 3.70 + 3.71 apt_help() { 3.72 case $1 in 3.73 devkit) 3.74 @@ -3813,13 +3844,17 @@ 3.75 3.76 3.77 3.78 + 3.79 + 3.80 + 3.81 + 3.82 # This line needs to be here, verbatim, after all includes and the dummy hook 3.83 # definitions. It is replaced with custom functionality when building 3.84 # custom sources. 3.85 #CUSTOM_AUTOCONF_INCLUDE 3.86 3.87 # Do not change or remove the following line, it is needed for consistency checks: 3.88 -DATE_WHEN_GENERATED=1381407169 3.89 +DATE_WHEN_GENERATED=1382437436 3.90 3.91 ############################################################################### 3.92 # 3.93 @@ -8270,7 +8305,7 @@ 3.94 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5 3.95 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;} 3.96 else 3.97 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'` 3.98 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'` 3.99 if test "x$IS_MODERN_MAKE" = x; then 3.100 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5 3.101 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;} 3.102 @@ -8627,7 +8662,7 @@ 3.103 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5 3.104 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;} 3.105 else 3.106 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'` 3.107 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'` 3.108 if test "x$IS_MODERN_MAKE" = x; then 3.109 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5 3.110 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;} 3.111 @@ -8981,7 +9016,7 @@ 3.112 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5 3.113 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;} 3.114 else 3.115 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'` 3.116 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'` 3.117 if test "x$IS_MODERN_MAKE" = x; then 3.118 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5 3.119 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;} 3.120 @@ -9340,7 +9375,7 @@ 3.121 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5 3.122 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;} 3.123 else 3.124 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'` 3.125 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'` 3.126 if test "x$IS_MODERN_MAKE" = x; then 3.127 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5 3.128 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;} 3.129 @@ -9693,7 +9728,7 @@ 3.130 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5 3.131 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;} 3.132 else 3.133 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'` 3.134 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'` 3.135 if test "x$IS_MODERN_MAKE" = x; then 3.136 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5 3.137 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;} 3.138 @@ -15778,25 +15813,32 @@ 3.139 # Print a helpful message on how to acquire the necessary build dependency. 3.140 # openjdk is the help tag: freetyp2, cups, pulse, alsa etc 3.141 MISSING_DEPENDENCY=openjdk 3.142 - PKGHANDLER_COMMAND= 3.143 - 3.144 - case $PKGHANDLER in 3.145 - apt-get) 3.146 - apt_help $MISSING_DEPENDENCY ;; 3.147 - yum) 3.148 - yum_help $MISSING_DEPENDENCY ;; 3.149 - port) 3.150 - port_help $MISSING_DEPENDENCY ;; 3.151 - pkgutil) 3.152 - pkgutil_help $MISSING_DEPENDENCY ;; 3.153 - pkgadd) 3.154 - pkgadd_help $MISSING_DEPENDENCY ;; 3.155 - * ) 3.156 - break ;; 3.157 - esac 3.158 - 3.159 - if test "x$PKGHANDLER_COMMAND" != x; then 3.160 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.161 + 3.162 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.163 + cygwin_help $MISSING_DEPENDENCY 3.164 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.165 + msys_help $MISSING_DEPENDENCY 3.166 + else 3.167 + PKGHANDLER_COMMAND= 3.168 + 3.169 + case $PKGHANDLER in 3.170 + apt-get) 3.171 + apt_help $MISSING_DEPENDENCY ;; 3.172 + yum) 3.173 + yum_help $MISSING_DEPENDENCY ;; 3.174 + port) 3.175 + port_help $MISSING_DEPENDENCY ;; 3.176 + pkgutil) 3.177 + pkgutil_help $MISSING_DEPENDENCY ;; 3.178 + pkgadd) 3.179 + pkgadd_help $MISSING_DEPENDENCY ;; 3.180 + * ) 3.181 + break ;; 3.182 + esac 3.183 + 3.184 + if test "x$PKGHANDLER_COMMAND" != x; then 3.185 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.186 + fi 3.187 fi 3.188 3.189 { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5 3.190 @@ -17474,63 +17516,303 @@ 3.191 as_fn_error $? "Cannot continue" "$LINENO" 5 3.192 fi 3.193 3.194 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5 3.195 -$as_echo_n "checking for msvcr100.dll... " >&6; } 3.196 + 3.197 3.198 # Check whether --with-msvcr-dll was given. 3.199 if test "${with_msvcr_dll+set}" = set; then : 3.200 withval=$with_msvcr_dll; 3.201 fi 3.202 3.203 + 3.204 if test "x$with_msvcr_dll" != x; then 3.205 - MSVCR_DLL="$with_msvcr_dll" 3.206 - else 3.207 + # If given explicitely by user, do not probe. If not present, fail directly. 3.208 + 3.209 + POSSIBLE_MSVCR_DLL="$with_msvcr_dll" 3.210 + METHOD="--with-msvcr-dll" 3.211 + if test -e "$POSSIBLE_MSVCR_DLL"; then 3.212 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5 3.213 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;} 3.214 + 3.215 + # Need to check if the found msvcr is correct architecture 3.216 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.217 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.218 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.219 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.220 + CORRECT_MSVCR_ARCH=386 3.221 + else 3.222 + CORRECT_MSVCR_ARCH=x86-64 3.223 + fi 3.224 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.225 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.226 +$as_echo "ok" >&6; } 3.227 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.228 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5 3.229 +$as_echo_n "checking for msvcr100.dll... " >&6; } 3.230 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5 3.231 +$as_echo "$MSVCR_DLL" >&6; } 3.232 + else 3.233 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5 3.234 +$as_echo "incorrect, ignoring" >&6; } 3.235 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5 3.236 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;} 3.237 + fi 3.238 + fi 3.239 + 3.240 + if test "x$MSVCR_DLL" = x; then 3.241 + as_fn_error $? "Could not find a proper msvcr100.dll as specified by --with-msvcr-dll" "$LINENO" 5 3.242 + fi 3.243 + fi 3.244 + 3.245 + if test "x$MSVCR_DLL" = x; then 3.246 + # Probe: Using well-known location from Visual Studio 10.0 3.247 if test "x$VCINSTALLDIR" != x; then 3.248 + CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR" 3.249 + 3.250 + windows_path="$CYGWIN_VC_INSTALL_DIR" 3.251 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.252 + unix_path=`$CYGPATH -u "$windows_path"` 3.253 + CYGWIN_VC_INSTALL_DIR="$unix_path" 3.254 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.255 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.256 + CYGWIN_VC_INSTALL_DIR="$unix_path" 3.257 + fi 3.258 + 3.259 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 3.260 - MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x64 | head --lines 1` 3.261 - else 3.262 - MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1` 3.263 - if test "x$MSVCR_DLL" = x; then 3.264 - MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | head --lines 1` 3.265 - fi 3.266 - fi 3.267 - if test "x$MSVCR_DLL" != x; then 3.268 - { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR" >&5 3.269 -$as_echo "$as_me: msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR" >&6;} 3.270 - else 3.271 - { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR" >&5 3.272 -$as_echo "$as_me: Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR" >&6;} 3.273 - fi 3.274 - fi 3.275 - # Try some fallback alternatives 3.276 - if test "x$MSVCR_DLL" = x; then 3.277 - # If visual studio express is installed, there is usually one with the debugger 3.278 - if test "x$VS100COMNTOOLS" != x; then 3.279 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 3.280 - MSVCR_DLL=`find "$VS100COMNTOOLS/.." -name msvcr100.dll | grep -i x64 | head --lines 1` 3.281 - { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS.." >&5 3.282 -$as_echo "$as_me: msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS.." >&6;} 3.283 - fi 3.284 - fi 3.285 - fi 3.286 - if test "x$MSVCR_DLL" = x; then 3.287 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.288 - # Fallback for 32bit builds, look in the windows directory. 3.289 - if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then 3.290 - { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $SYSTEMROOT/system32" >&5 3.291 -$as_echo "$as_me: msvcr100.dll found in $SYSTEMROOT/system32" >&6;} 3.292 - MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll" 3.293 - fi 3.294 - fi 3.295 - fi 3.296 - fi 3.297 + POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll" 3.298 + else 3.299 + POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll" 3.300 + fi 3.301 + 3.302 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.303 + METHOD="well-known location in VCINSTALLDIR" 3.304 + if test -e "$POSSIBLE_MSVCR_DLL"; then 3.305 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5 3.306 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;} 3.307 + 3.308 + # Need to check if the found msvcr is correct architecture 3.309 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.310 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.311 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.312 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.313 + CORRECT_MSVCR_ARCH=386 3.314 + else 3.315 + CORRECT_MSVCR_ARCH=x86-64 3.316 + fi 3.317 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.318 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.319 +$as_echo "ok" >&6; } 3.320 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.321 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5 3.322 +$as_echo_n "checking for msvcr100.dll... " >&6; } 3.323 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5 3.324 +$as_echo "$MSVCR_DLL" >&6; } 3.325 + else 3.326 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5 3.327 +$as_echo "incorrect, ignoring" >&6; } 3.328 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5 3.329 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;} 3.330 + fi 3.331 + fi 3.332 + 3.333 + fi 3.334 + fi 3.335 + 3.336 if test "x$MSVCR_DLL" = x; then 3.337 + # Probe: Check in the Boot JDK directory. 3.338 + POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll" 3.339 + 3.340 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.341 + METHOD="well-known location in Boot JDK" 3.342 + if test -e "$POSSIBLE_MSVCR_DLL"; then 3.343 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5 3.344 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;} 3.345 + 3.346 + # Need to check if the found msvcr is correct architecture 3.347 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.348 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.349 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.350 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.351 + CORRECT_MSVCR_ARCH=386 3.352 + else 3.353 + CORRECT_MSVCR_ARCH=x86-64 3.354 + fi 3.355 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.356 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.357 +$as_echo "ok" >&6; } 3.358 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.359 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5 3.360 +$as_echo_n "checking for msvcr100.dll... " >&6; } 3.361 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5 3.362 +$as_echo "$MSVCR_DLL" >&6; } 3.363 + else 3.364 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5 3.365 +$as_echo "incorrect, ignoring" >&6; } 3.366 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5 3.367 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;} 3.368 + fi 3.369 + fi 3.370 + 3.371 + fi 3.372 + 3.373 + if test "x$MSVCR_DLL" = x; then 3.374 + # Probe: Look in the Windows system32 directory 3.375 + CYGWIN_SYSTEMROOT="$SYSTEMROOT" 3.376 + 3.377 + windows_path="$CYGWIN_SYSTEMROOT" 3.378 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.379 + unix_path=`$CYGPATH -u "$windows_path"` 3.380 + CYGWIN_SYSTEMROOT="$unix_path" 3.381 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.382 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.383 + CYGWIN_SYSTEMROOT="$unix_path" 3.384 + fi 3.385 + 3.386 + POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll" 3.387 + 3.388 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.389 + METHOD="well-known location in SYSTEMROOT" 3.390 + if test -e "$POSSIBLE_MSVCR_DLL"; then 3.391 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5 3.392 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;} 3.393 + 3.394 + # Need to check if the found msvcr is correct architecture 3.395 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.396 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.397 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.398 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.399 + CORRECT_MSVCR_ARCH=386 3.400 + else 3.401 + CORRECT_MSVCR_ARCH=x86-64 3.402 + fi 3.403 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.404 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.405 +$as_echo "ok" >&6; } 3.406 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.407 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5 3.408 +$as_echo_n "checking for msvcr100.dll... " >&6; } 3.409 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5 3.410 +$as_echo "$MSVCR_DLL" >&6; } 3.411 + else 3.412 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5 3.413 +$as_echo "incorrect, ignoring" >&6; } 3.414 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5 3.415 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;} 3.416 + fi 3.417 + fi 3.418 + 3.419 + fi 3.420 + 3.421 + if test "x$MSVCR_DLL" = x; then 3.422 + # Probe: If Visual Studio Express is installed, there is usually one with the debugger 3.423 + if test "x$VS100COMNTOOLS" != x; then 3.424 + CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.." 3.425 + 3.426 + windows_path="$CYGWIN_VS_TOOLS_DIR" 3.427 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.428 + unix_path=`$CYGPATH -u "$windows_path"` 3.429 + CYGWIN_VS_TOOLS_DIR="$unix_path" 3.430 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.431 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.432 + CYGWIN_VS_TOOLS_DIR="$unix_path" 3.433 + fi 3.434 + 3.435 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 3.436 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1` 3.437 + else 3.438 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1` 3.439 + fi 3.440 + 3.441 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.442 + METHOD="search of VS100COMNTOOLS" 3.443 + if test -e "$POSSIBLE_MSVCR_DLL"; then 3.444 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5 3.445 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;} 3.446 + 3.447 + # Need to check if the found msvcr is correct architecture 3.448 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.449 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.450 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.451 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.452 + CORRECT_MSVCR_ARCH=386 3.453 + else 3.454 + CORRECT_MSVCR_ARCH=x86-64 3.455 + fi 3.456 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.457 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.458 +$as_echo "ok" >&6; } 3.459 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.460 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5 3.461 +$as_echo_n "checking for msvcr100.dll... " >&6; } 3.462 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5 3.463 +$as_echo "$MSVCR_DLL" >&6; } 3.464 + else 3.465 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5 3.466 +$as_echo "incorrect, ignoring" >&6; } 3.467 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5 3.468 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;} 3.469 + fi 3.470 + fi 3.471 + 3.472 + fi 3.473 + fi 3.474 + 3.475 + if test "x$MSVCR_DLL" = x; then 3.476 + # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now. 3.477 + # (This was the original behaviour; kept since it might turn up something) 3.478 + if test "x$CYGWIN_VC_INSTALL_DIR" != x; then 3.479 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 3.480 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1` 3.481 + else 3.482 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1` 3.483 + if test "x$POSSIBLE_MSVCR_DLL" = x; then 3.484 + # We're grasping at straws now... 3.485 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1` 3.486 + fi 3.487 + fi 3.488 + 3.489 + 3.490 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.491 + METHOD="search of VCINSTALLDIR" 3.492 + if test -e "$POSSIBLE_MSVCR_DLL"; then 3.493 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5 3.494 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;} 3.495 + 3.496 + # Need to check if the found msvcr is correct architecture 3.497 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.498 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.499 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.500 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.501 + CORRECT_MSVCR_ARCH=386 3.502 + else 3.503 + CORRECT_MSVCR_ARCH=x86-64 3.504 + fi 3.505 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.506 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.507 +$as_echo "ok" >&6; } 3.508 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.509 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5 3.510 +$as_echo_n "checking for msvcr100.dll... " >&6; } 3.511 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5 3.512 +$as_echo "$MSVCR_DLL" >&6; } 3.513 + else 3.514 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5 3.515 +$as_echo "incorrect, ignoring" >&6; } 3.516 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5 3.517 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;} 3.518 + fi 3.519 + fi 3.520 + 3.521 + fi 3.522 + fi 3.523 + 3.524 + if test "x$MSVCR_DLL" = x; then 3.525 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5 3.526 +$as_echo_n "checking for msvcr100.dll... " >&6; } 3.527 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.528 $as_echo "no" >&6; } 3.529 - as_fn_error $? "Could not find msvcr100.dll !" "$LINENO" 5 3.530 - fi 3.531 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5 3.532 -$as_echo "$MSVCR_DLL" >&6; } 3.533 + as_fn_error $? "Could not find msvcr100.dll. Please specify using --with-msvcr-dll." "$LINENO" 5 3.534 + fi 3.535 + 3.536 3.537 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.538 3.539 @@ -18935,25 +19217,32 @@ 3.540 # Print a helpful message on how to acquire the necessary build dependency. 3.541 # devkit is the help tag: freetyp2, cups, pulse, alsa etc 3.542 MISSING_DEPENDENCY=devkit 3.543 - PKGHANDLER_COMMAND= 3.544 - 3.545 - case $PKGHANDLER in 3.546 - apt-get) 3.547 - apt_help $MISSING_DEPENDENCY ;; 3.548 - yum) 3.549 - yum_help $MISSING_DEPENDENCY ;; 3.550 - port) 3.551 - port_help $MISSING_DEPENDENCY ;; 3.552 - pkgutil) 3.553 - pkgutil_help $MISSING_DEPENDENCY ;; 3.554 - pkgadd) 3.555 - pkgadd_help $MISSING_DEPENDENCY ;; 3.556 - * ) 3.557 - break ;; 3.558 - esac 3.559 - 3.560 - if test "x$PKGHANDLER_COMMAND" != x; then 3.561 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.562 + 3.563 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.564 + cygwin_help $MISSING_DEPENDENCY 3.565 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.566 + msys_help $MISSING_DEPENDENCY 3.567 + else 3.568 + PKGHANDLER_COMMAND= 3.569 + 3.570 + case $PKGHANDLER in 3.571 + apt-get) 3.572 + apt_help $MISSING_DEPENDENCY ;; 3.573 + yum) 3.574 + yum_help $MISSING_DEPENDENCY ;; 3.575 + port) 3.576 + port_help $MISSING_DEPENDENCY ;; 3.577 + pkgutil) 3.578 + pkgutil_help $MISSING_DEPENDENCY ;; 3.579 + pkgadd) 3.580 + pkgadd_help $MISSING_DEPENDENCY ;; 3.581 + * ) 3.582 + break ;; 3.583 + esac 3.584 + 3.585 + if test "x$PKGHANDLER_COMMAND" != x; then 3.586 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.587 + fi 3.588 fi 3.589 3.590 as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5 3.591 @@ -20507,25 +20796,32 @@ 3.592 # Print a helpful message on how to acquire the necessary build dependency. 3.593 # devkit is the help tag: freetyp2, cups, pulse, alsa etc 3.594 MISSING_DEPENDENCY=devkit 3.595 - PKGHANDLER_COMMAND= 3.596 - 3.597 - case $PKGHANDLER in 3.598 - apt-get) 3.599 - apt_help $MISSING_DEPENDENCY ;; 3.600 - yum) 3.601 - yum_help $MISSING_DEPENDENCY ;; 3.602 - port) 3.603 - port_help $MISSING_DEPENDENCY ;; 3.604 - pkgutil) 3.605 - pkgutil_help $MISSING_DEPENDENCY ;; 3.606 - pkgadd) 3.607 - pkgadd_help $MISSING_DEPENDENCY ;; 3.608 - * ) 3.609 - break ;; 3.610 - esac 3.611 - 3.612 - if test "x$PKGHANDLER_COMMAND" != x; then 3.613 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.614 + 3.615 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.616 + cygwin_help $MISSING_DEPENDENCY 3.617 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.618 + msys_help $MISSING_DEPENDENCY 3.619 + else 3.620 + PKGHANDLER_COMMAND= 3.621 + 3.622 + case $PKGHANDLER in 3.623 + apt-get) 3.624 + apt_help $MISSING_DEPENDENCY ;; 3.625 + yum) 3.626 + yum_help $MISSING_DEPENDENCY ;; 3.627 + port) 3.628 + port_help $MISSING_DEPENDENCY ;; 3.629 + pkgutil) 3.630 + pkgutil_help $MISSING_DEPENDENCY ;; 3.631 + pkgadd) 3.632 + pkgadd_help $MISSING_DEPENDENCY ;; 3.633 + * ) 3.634 + break ;; 3.635 + esac 3.636 + 3.637 + if test "x$PKGHANDLER_COMMAND" != x; then 3.638 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.639 + fi 3.640 fi 3.641 3.642 as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5 3.643 @@ -29688,8 +29984,8 @@ 3.644 FREETYPE2_NOT_NEEDED=yes 3.645 # If the java runtime framework is disabled, then we need X11. 3.646 # This will be adjusted below. 3.647 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5 3.648 -$as_echo "alsa pulse x11" >&6; } 3.649 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11 freetype" >&5 3.650 +$as_echo "alsa pulse x11 freetype" >&6; } 3.651 fi 3.652 3.653 if test "x$OPENJDK_TARGET_OS" = xbsd; then 3.654 @@ -29710,44 +30006,31 @@ 3.655 3.656 ############################################################################### 3.657 # 3.658 - # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM 3.659 - # that uses this API. 3.660 - # 3.661 + # Check for MacOSX support for OpenJDK. 3.662 + # 3.663 + 3.664 + 3.665 # Check whether --enable-macosx-runtime-support was given. 3.666 if test "${enable_macosx_runtime_support+set}" = set; then : 3.667 - enableval=$enable_macosx_runtime_support; MACOSX_RUNTIME_SUPPORT="${enableval}" 3.668 -else 3.669 - MACOSX_RUNTIME_SUPPORT="no" 3.670 -fi 3.671 - 3.672 - 3.673 - USE_MACOSX_RUNTIME_SUPPORT=no 3.674 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit Java runtime support in the OS" >&5 3.675 -$as_echo_n "checking for explicit Java runtime support in the OS... " >&6; } 3.676 + enableval=$enable_macosx_runtime_support; 3.677 +fi 3.678 + 3.679 + if test "x$enable_macosx_runtime_support" != x; then 3.680 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&5 3.681 +$as_echo "$as_me: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&2;} 3.682 + fi 3.683 + 3.684 + 3.685 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Java Framework" >&5 3.686 +$as_echo_n "checking for Mac OS X Java Framework... " >&6; } 3.687 if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then 3.688 - if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then 3.689 - MACOSX_RUNTIME_SUPPORT=yes 3.690 - USE_MACOSX_RUNTIME_SUPPORT=yes 3.691 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, does not need alsa freetype2 pulse and X11" >&5 3.692 -$as_echo "yes, does not need alsa freetype2 pulse and X11" >&6; } 3.693 - else 3.694 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but explicitly disabled." >&5 3.695 -$as_echo "yes, but explicitly disabled." >&6; } 3.696 - fi 3.697 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: /System/Library/Frameworks/JavaVM.framework" >&5 3.698 +$as_echo "/System/Library/Frameworks/JavaVM.framework" >&6; } 3.699 else 3.700 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.701 $as_echo "no" >&6; } 3.702 fi 3.703 3.704 - if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then 3.705 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on an X11 build on MacOSX?" >&5 3.706 -$as_echo_n "checking what is not needed on an X11 build on MacOSX?... " >&6; } 3.707 - X11_NOT_NEEDED= 3.708 - FREETYPE2_NOT_NEEDED= 3.709 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 3.710 -$as_echo "alsa pulse" >&6; } 3.711 - fi 3.712 - 3.713 3.714 3.715 ############################################################################### 3.716 @@ -30473,25 +30756,32 @@ 3.717 # Print a helpful message on how to acquire the necessary build dependency. 3.718 # x11 is the help tag: freetyp2, cups, pulse, alsa etc 3.719 MISSING_DEPENDENCY=x11 3.720 - PKGHANDLER_COMMAND= 3.721 - 3.722 - case $PKGHANDLER in 3.723 - apt-get) 3.724 - apt_help $MISSING_DEPENDENCY ;; 3.725 - yum) 3.726 - yum_help $MISSING_DEPENDENCY ;; 3.727 - port) 3.728 - port_help $MISSING_DEPENDENCY ;; 3.729 - pkgutil) 3.730 - pkgutil_help $MISSING_DEPENDENCY ;; 3.731 - pkgadd) 3.732 - pkgadd_help $MISSING_DEPENDENCY ;; 3.733 - * ) 3.734 - break ;; 3.735 - esac 3.736 - 3.737 - if test "x$PKGHANDLER_COMMAND" != x; then 3.738 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.739 + 3.740 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.741 + cygwin_help $MISSING_DEPENDENCY 3.742 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.743 + msys_help $MISSING_DEPENDENCY 3.744 + else 3.745 + PKGHANDLER_COMMAND= 3.746 + 3.747 + case $PKGHANDLER in 3.748 + apt-get) 3.749 + apt_help $MISSING_DEPENDENCY ;; 3.750 + yum) 3.751 + yum_help $MISSING_DEPENDENCY ;; 3.752 + port) 3.753 + port_help $MISSING_DEPENDENCY ;; 3.754 + pkgutil) 3.755 + pkgutil_help $MISSING_DEPENDENCY ;; 3.756 + pkgadd) 3.757 + pkgadd_help $MISSING_DEPENDENCY ;; 3.758 + * ) 3.759 + break ;; 3.760 + esac 3.761 + 3.762 + if test "x$PKGHANDLER_COMMAND" != x; then 3.763 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.764 + fi 3.765 fi 3.766 3.767 as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5 3.768 @@ -30568,25 +30858,32 @@ 3.769 # Print a helpful message on how to acquire the necessary build dependency. 3.770 # x11 is the help tag: freetyp2, cups, pulse, alsa etc 3.771 MISSING_DEPENDENCY=x11 3.772 - PKGHANDLER_COMMAND= 3.773 - 3.774 - case $PKGHANDLER in 3.775 - apt-get) 3.776 - apt_help $MISSING_DEPENDENCY ;; 3.777 - yum) 3.778 - yum_help $MISSING_DEPENDENCY ;; 3.779 - port) 3.780 - port_help $MISSING_DEPENDENCY ;; 3.781 - pkgutil) 3.782 - pkgutil_help $MISSING_DEPENDENCY ;; 3.783 - pkgadd) 3.784 - pkgadd_help $MISSING_DEPENDENCY ;; 3.785 - * ) 3.786 - break ;; 3.787 - esac 3.788 - 3.789 - if test "x$PKGHANDLER_COMMAND" != x; then 3.790 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.791 + 3.792 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.793 + cygwin_help $MISSING_DEPENDENCY 3.794 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.795 + msys_help $MISSING_DEPENDENCY 3.796 + else 3.797 + PKGHANDLER_COMMAND= 3.798 + 3.799 + case $PKGHANDLER in 3.800 + apt-get) 3.801 + apt_help $MISSING_DEPENDENCY ;; 3.802 + yum) 3.803 + yum_help $MISSING_DEPENDENCY ;; 3.804 + port) 3.805 + port_help $MISSING_DEPENDENCY ;; 3.806 + pkgutil) 3.807 + pkgutil_help $MISSING_DEPENDENCY ;; 3.808 + pkgadd) 3.809 + pkgadd_help $MISSING_DEPENDENCY ;; 3.810 + * ) 3.811 + break ;; 3.812 + esac 3.813 + 3.814 + if test "x$PKGHANDLER_COMMAND" != x; then 3.815 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.816 + fi 3.817 fi 3.818 3.819 as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5 3.820 @@ -30823,25 +31120,32 @@ 3.821 # Print a helpful message on how to acquire the necessary build dependency. 3.822 # cups is the help tag: freetyp2, cups, pulse, alsa etc 3.823 MISSING_DEPENDENCY=cups 3.824 - PKGHANDLER_COMMAND= 3.825 - 3.826 - case $PKGHANDLER in 3.827 - apt-get) 3.828 - apt_help $MISSING_DEPENDENCY ;; 3.829 - yum) 3.830 - yum_help $MISSING_DEPENDENCY ;; 3.831 - port) 3.832 - port_help $MISSING_DEPENDENCY ;; 3.833 - pkgutil) 3.834 - pkgutil_help $MISSING_DEPENDENCY ;; 3.835 - pkgadd) 3.836 - pkgadd_help $MISSING_DEPENDENCY ;; 3.837 - * ) 3.838 - break ;; 3.839 - esac 3.840 - 3.841 - if test "x$PKGHANDLER_COMMAND" != x; then 3.842 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.843 + 3.844 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.845 + cygwin_help $MISSING_DEPENDENCY 3.846 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.847 + msys_help $MISSING_DEPENDENCY 3.848 + else 3.849 + PKGHANDLER_COMMAND= 3.850 + 3.851 + case $PKGHANDLER in 3.852 + apt-get) 3.853 + apt_help $MISSING_DEPENDENCY ;; 3.854 + yum) 3.855 + yum_help $MISSING_DEPENDENCY ;; 3.856 + port) 3.857 + port_help $MISSING_DEPENDENCY ;; 3.858 + pkgutil) 3.859 + pkgutil_help $MISSING_DEPENDENCY ;; 3.860 + pkgadd) 3.861 + pkgadd_help $MISSING_DEPENDENCY ;; 3.862 + * ) 3.863 + break ;; 3.864 + esac 3.865 + 3.866 + if test "x$PKGHANDLER_COMMAND" != x; then 3.867 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.868 + fi 3.869 fi 3.870 3.871 as_fn_error $? "Could not find cups! $HELP_MSG " "$LINENO" 5 3.872 @@ -31448,25 +31752,32 @@ 3.873 # Print a helpful message on how to acquire the necessary build dependency. 3.874 # freetype2 is the help tag: freetyp2, cups, pulse, alsa etc 3.875 MISSING_DEPENDENCY=freetype2 3.876 - PKGHANDLER_COMMAND= 3.877 - 3.878 - case $PKGHANDLER in 3.879 - apt-get) 3.880 - apt_help $MISSING_DEPENDENCY ;; 3.881 - yum) 3.882 - yum_help $MISSING_DEPENDENCY ;; 3.883 - port) 3.884 - port_help $MISSING_DEPENDENCY ;; 3.885 - pkgutil) 3.886 - pkgutil_help $MISSING_DEPENDENCY ;; 3.887 - pkgadd) 3.888 - pkgadd_help $MISSING_DEPENDENCY ;; 3.889 - * ) 3.890 - break ;; 3.891 - esac 3.892 - 3.893 - if test "x$PKGHANDLER_COMMAND" != x; then 3.894 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.895 + 3.896 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.897 + cygwin_help $MISSING_DEPENDENCY 3.898 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.899 + msys_help $MISSING_DEPENDENCY 3.900 + else 3.901 + PKGHANDLER_COMMAND= 3.902 + 3.903 + case $PKGHANDLER in 3.904 + apt-get) 3.905 + apt_help $MISSING_DEPENDENCY ;; 3.906 + yum) 3.907 + yum_help $MISSING_DEPENDENCY ;; 3.908 + port) 3.909 + port_help $MISSING_DEPENDENCY ;; 3.910 + pkgutil) 3.911 + pkgutil_help $MISSING_DEPENDENCY ;; 3.912 + pkgadd) 3.913 + pkgadd_help $MISSING_DEPENDENCY ;; 3.914 + * ) 3.915 + break ;; 3.916 + esac 3.917 + 3.918 + if test "x$PKGHANDLER_COMMAND" != x; then 3.919 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.920 + fi 3.921 fi 3.922 3.923 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 3.924 @@ -31821,25 +32132,32 @@ 3.925 # Print a helpful message on how to acquire the necessary build dependency. 3.926 # alsa is the help tag: freetyp2, cups, pulse, alsa etc 3.927 MISSING_DEPENDENCY=alsa 3.928 - PKGHANDLER_COMMAND= 3.929 - 3.930 - case $PKGHANDLER in 3.931 - apt-get) 3.932 - apt_help $MISSING_DEPENDENCY ;; 3.933 - yum) 3.934 - yum_help $MISSING_DEPENDENCY ;; 3.935 - port) 3.936 - port_help $MISSING_DEPENDENCY ;; 3.937 - pkgutil) 3.938 - pkgutil_help $MISSING_DEPENDENCY ;; 3.939 - pkgadd) 3.940 - pkgadd_help $MISSING_DEPENDENCY ;; 3.941 - * ) 3.942 - break ;; 3.943 - esac 3.944 - 3.945 - if test "x$PKGHANDLER_COMMAND" != x; then 3.946 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.947 + 3.948 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.949 + cygwin_help $MISSING_DEPENDENCY 3.950 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.951 + msys_help $MISSING_DEPENDENCY 3.952 + else 3.953 + PKGHANDLER_COMMAND= 3.954 + 3.955 + case $PKGHANDLER in 3.956 + apt-get) 3.957 + apt_help $MISSING_DEPENDENCY ;; 3.958 + yum) 3.959 + yum_help $MISSING_DEPENDENCY ;; 3.960 + port) 3.961 + port_help $MISSING_DEPENDENCY ;; 3.962 + pkgutil) 3.963 + pkgutil_help $MISSING_DEPENDENCY ;; 3.964 + pkgadd) 3.965 + pkgadd_help $MISSING_DEPENDENCY ;; 3.966 + * ) 3.967 + break ;; 3.968 + esac 3.969 + 3.970 + if test "x$PKGHANDLER_COMMAND" != x; then 3.971 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.972 + fi 3.973 fi 3.974 3.975 as_fn_error $? "Could not find alsa! $HELP_MSG " "$LINENO" 5 3.976 @@ -34633,25 +34951,32 @@ 3.977 # Print a helpful message on how to acquire the necessary build dependency. 3.978 # ccache is the help tag: freetyp2, cups, pulse, alsa etc 3.979 MISSING_DEPENDENCY=ccache 3.980 - PKGHANDLER_COMMAND= 3.981 - 3.982 - case $PKGHANDLER in 3.983 - apt-get) 3.984 - apt_help $MISSING_DEPENDENCY ;; 3.985 - yum) 3.986 - yum_help $MISSING_DEPENDENCY ;; 3.987 - port) 3.988 - port_help $MISSING_DEPENDENCY ;; 3.989 - pkgutil) 3.990 - pkgutil_help $MISSING_DEPENDENCY ;; 3.991 - pkgadd) 3.992 - pkgadd_help $MISSING_DEPENDENCY ;; 3.993 - * ) 3.994 - break ;; 3.995 - esac 3.996 - 3.997 - if test "x$PKGHANDLER_COMMAND" != x; then 3.998 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.999 + 3.1000 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1001 + cygwin_help $MISSING_DEPENDENCY 3.1002 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1003 + msys_help $MISSING_DEPENDENCY 3.1004 + else 3.1005 + PKGHANDLER_COMMAND= 3.1006 + 3.1007 + case $PKGHANDLER in 3.1008 + apt-get) 3.1009 + apt_help $MISSING_DEPENDENCY ;; 3.1010 + yum) 3.1011 + yum_help $MISSING_DEPENDENCY ;; 3.1012 + port) 3.1013 + port_help $MISSING_DEPENDENCY ;; 3.1014 + pkgutil) 3.1015 + pkgutil_help $MISSING_DEPENDENCY ;; 3.1016 + pkgadd) 3.1017 + pkgadd_help $MISSING_DEPENDENCY ;; 3.1018 + * ) 3.1019 + break ;; 3.1020 + esac 3.1021 + 3.1022 + if test "x$PKGHANDLER_COMMAND" != x; then 3.1023 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 3.1024 + fi 3.1025 fi 3.1026 3.1027 printf "$HELP_MSG\n"
4.1 --- a/common/autoconf/help.m4 Tue Oct 22 13:56:11 2013 -0700 4.2 +++ b/common/autoconf/help.m4 Tue Oct 22 14:53:08 2013 -0700 4.3 @@ -33,41 +33,74 @@ 4.4 # Print a helpful message on how to acquire the necessary build dependency. 4.5 # $1 is the help tag: freetyp2, cups, pulse, alsa etc 4.6 MISSING_DEPENDENCY=$1 4.7 - PKGHANDLER_COMMAND= 4.8 4.9 - case $PKGHANDLER in 4.10 - apt-get) 4.11 - apt_help $MISSING_DEPENDENCY ;; 4.12 - yum) 4.13 - yum_help $MISSING_DEPENDENCY ;; 4.14 - port) 4.15 - port_help $MISSING_DEPENDENCY ;; 4.16 - pkgutil) 4.17 - pkgutil_help $MISSING_DEPENDENCY ;; 4.18 - pkgadd) 4.19 - pkgadd_help $MISSING_DEPENDENCY ;; 4.20 - * ) 4.21 - break ;; 4.22 - esac 4.23 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 4.24 + cygwin_help $MISSING_DEPENDENCY 4.25 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 4.26 + msys_help $MISSING_DEPENDENCY 4.27 + else 4.28 + PKGHANDLER_COMMAND= 4.29 4.30 - if test "x$PKGHANDLER_COMMAND" != x; then 4.31 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 4.32 + case $PKGHANDLER in 4.33 + apt-get) 4.34 + apt_help $MISSING_DEPENDENCY ;; 4.35 + yum) 4.36 + yum_help $MISSING_DEPENDENCY ;; 4.37 + port) 4.38 + port_help $MISSING_DEPENDENCY ;; 4.39 + pkgutil) 4.40 + pkgutil_help $MISSING_DEPENDENCY ;; 4.41 + pkgadd) 4.42 + pkgadd_help $MISSING_DEPENDENCY ;; 4.43 + * ) 4.44 + break ;; 4.45 + esac 4.46 + 4.47 + if test "x$PKGHANDLER_COMMAND" != x; then 4.48 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 4.49 + fi 4.50 fi 4.51 ]) 4.52 4.53 cygwin_help() { 4.54 case $1 in 4.55 unzip) 4.56 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;; 4.57 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )" 4.58 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 4.59 + ;; 4.60 zip) 4.61 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;; 4.62 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )" 4.63 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 4.64 + ;; 4.65 make) 4.66 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;; 4.67 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )" 4.68 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 4.69 + ;; 4.70 + freetype2) 4.71 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 4.72 + HELP_MSG="To install freetype, run: 4.73 +wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe 4.74 +chmod +x /tmp/freetype-setup.exe 4.75 +/tmp/freetype-setup.exe 4.76 +Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\". 4.77 +After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll." 4.78 + else 4.79 + HELP_MSG="You need to build a 64-bit version of freetype. 4.80 +This is not readily available. 4.81 +You can find source code and build instructions on 4.82 +http://www.freetype.org/ 4.83 +If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically." 4.84 + fi 4.85 + ;; 4.86 * ) 4.87 break ;; 4.88 esac 4.89 } 4.90 4.91 +msys_help() { 4.92 + PKGHANDLER_COMMAND="" 4.93 +} 4.94 + 4.95 apt_help() { 4.96 case $1 in 4.97 devkit)
5.1 --- a/common/autoconf/libraries.m4 Tue Oct 22 13:56:11 2013 -0700 5.2 +++ b/common/autoconf/libraries.m4 Tue Oct 22 14:53:08 2013 -0700 5.3 @@ -60,7 +60,7 @@ 5.4 FREETYPE2_NOT_NEEDED=yes 5.5 # If the java runtime framework is disabled, then we need X11. 5.6 # This will be adjusted below. 5.7 - AC_MSG_RESULT([alsa pulse x11]) 5.8 + AC_MSG_RESULT([alsa pulse x11 freetype]) 5.9 fi 5.10 5.11 if test "x$OPENJDK_TARGET_OS" = xbsd; then 5.12 @@ -79,33 +79,17 @@ 5.13 5.14 ############################################################################### 5.15 # 5.16 - # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM 5.17 - # that uses this API. 5.18 + # Check for MacOSX support for OpenJDK. 5.19 # 5.20 - AC_ARG_ENABLE([macosx-runtime-support], [AS_HELP_STRING([--disable-macosx-runtime-support], 5.21 - [disable the use of MacOSX Java runtime support framework @<:@enabled@:>@])], 5.22 - [MACOSX_RUNTIME_SUPPORT="${enableval}"],[MACOSX_RUNTIME_SUPPORT="no"]) 5.23 5.24 - USE_MACOSX_RUNTIME_SUPPORT=no 5.25 - AC_MSG_CHECKING([for explicit Java runtime support in the OS]) 5.26 + BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support) 5.27 + 5.28 + AC_MSG_CHECKING([for Mac OS X Java Framework]) 5.29 if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then 5.30 - if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then 5.31 - MACOSX_RUNTIME_SUPPORT=yes 5.32 - USE_MACOSX_RUNTIME_SUPPORT=yes 5.33 - AC_MSG_RESULT([yes, does not need alsa freetype2 pulse and X11]) 5.34 - else 5.35 - AC_MSG_RESULT([yes, but explicitly disabled.]) 5.36 - fi 5.37 + AC_MSG_RESULT([/System/Library/Frameworks/JavaVM.framework]) 5.38 else 5.39 AC_MSG_RESULT([no]) 5.40 fi 5.41 - 5.42 - if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then 5.43 - AC_MSG_CHECKING([what is not needed on an X11 build on MacOSX?]) 5.44 - X11_NOT_NEEDED= 5.45 - FREETYPE2_NOT_NEEDED= 5.46 - AC_MSG_RESULT([alsa pulse]) 5.47 - fi 5.48 ]) 5.49 5.50 AC_DEFUN_ONCE([LIB_SETUP_X11],
6.1 --- a/common/autoconf/toolchain.m4 Tue Oct 22 13:56:11 2013 -0700 6.2 +++ b/common/autoconf/toolchain.m4 Tue Oct 22 14:53:08 2013 -0700 6.3 @@ -176,6 +176,7 @@ 6.4 [ 6.5 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 6.6 TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV 6.7 + TOOLCHAIN_SETUP_MSVCR_DLL 6.8 BASIC_DEPRECATED_ARG_WITH([dxsdk]) 6.9 BASIC_DEPRECATED_ARG_WITH([dxsdk-lib]) 6.10 BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
7.1 --- a/common/autoconf/toolchain_windows.m4 Tue Oct 22 13:56:11 2013 -0700 7.2 +++ b/common/autoconf/toolchain_windows.m4 Tue Oct 22 14:53:08 2013 -0700 7.3 @@ -228,52 +228,113 @@ 7.4 AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.]) 7.5 AC_MSG_ERROR([Cannot continue]) 7.6 fi 7.7 +]) 7.8 7.9 - AC_MSG_CHECKING([for msvcr100.dll]) 7.10 +AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL], 7.11 +[ 7.12 + POSSIBLE_MSVCR_DLL="$1" 7.13 + METHOD="$2" 7.14 + if test -e "$POSSIBLE_MSVCR_DLL"; then 7.15 + AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD]) 7.16 + 7.17 + # Need to check if the found msvcr is correct architecture 7.18 + AC_MSG_CHECKING([found msvcr100.dll architecture]) 7.19 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 7.20 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 7.21 + CORRECT_MSVCR_ARCH=386 7.22 + else 7.23 + CORRECT_MSVCR_ARCH=x86-64 7.24 + fi 7.25 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 7.26 + AC_MSG_RESULT([ok]) 7.27 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 7.28 + AC_MSG_CHECKING([for msvcr100.dll]) 7.29 + AC_MSG_RESULT([$MSVCR_DLL]) 7.30 + else 7.31 + AC_MSG_RESULT([incorrect, ignoring]) 7.32 + AC_MSG_NOTICE([The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE]) 7.33 + fi 7.34 + fi 7.35 +]) 7.36 + 7.37 +AC_DEFUN([TOOLCHAIN_SETUP_MSVCR_DLL], 7.38 +[ 7.39 AC_ARG_WITH(msvcr-dll, [AS_HELP_STRING([--with-msvcr-dll], 7.40 [copy this msvcr100.dll into the built JDK (Windows only) @<:@probed@:>@])]) 7.41 + 7.42 if test "x$with_msvcr_dll" != x; then 7.43 - MSVCR_DLL="$with_msvcr_dll" 7.44 - else 7.45 + # If given explicitely by user, do not probe. If not present, fail directly. 7.46 + TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$with_msvcr_dll], [--with-msvcr-dll]) 7.47 + if test "x$MSVCR_DLL" = x; then 7.48 + AC_MSG_ERROR([Could not find a proper msvcr100.dll as specified by --with-msvcr-dll]) 7.49 + fi 7.50 + fi 7.51 + 7.52 + if test "x$MSVCR_DLL" = x; then 7.53 + # Probe: Using well-known location from Visual Studio 10.0 7.54 if test "x$VCINSTALLDIR" != x; then 7.55 + CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR" 7.56 + BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR) 7.57 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 7.58 - MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x64 | head --lines 1` 7.59 + POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll" 7.60 else 7.61 - MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1` 7.62 - if test "x$MSVCR_DLL" = x; then 7.63 - MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | head --lines 1` 7.64 + POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll" 7.65 + fi 7.66 + TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in VCINSTALLDIR]) 7.67 + fi 7.68 + fi 7.69 + 7.70 + if test "x$MSVCR_DLL" = x; then 7.71 + # Probe: Check in the Boot JDK directory. 7.72 + POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll" 7.73 + TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in Boot JDK]) 7.74 + fi 7.75 + 7.76 + if test "x$MSVCR_DLL" = x; then 7.77 + # Probe: Look in the Windows system32 directory 7.78 + CYGWIN_SYSTEMROOT="$SYSTEMROOT" 7.79 + BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT) 7.80 + POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll" 7.81 + TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in SYSTEMROOT]) 7.82 + fi 7.83 + 7.84 + if test "x$MSVCR_DLL" = x; then 7.85 + # Probe: If Visual Studio Express is installed, there is usually one with the debugger 7.86 + if test "x$VS100COMNTOOLS" != x; then 7.87 + CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.." 7.88 + BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR) 7.89 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 7.90 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1` 7.91 + else 7.92 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1` 7.93 + fi 7.94 + TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VS100COMNTOOLS]) 7.95 + fi 7.96 + fi 7.97 + 7.98 + if test "x$MSVCR_DLL" = x; then 7.99 + # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now. 7.100 + # (This was the original behaviour; kept since it might turn up something) 7.101 + if test "x$CYGWIN_VC_INSTALL_DIR" != x; then 7.102 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 7.103 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1` 7.104 + else 7.105 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1` 7.106 + if test "x$POSSIBLE_MSVCR_DLL" = x; then 7.107 + # We're grasping at straws now... 7.108 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1` 7.109 fi 7.110 fi 7.111 - if test "x$MSVCR_DLL" != x; then 7.112 - AC_MSG_NOTICE([msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR]) 7.113 - else 7.114 - AC_MSG_NOTICE([Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR]) 7.115 - fi 7.116 - fi 7.117 - # Try some fallback alternatives 7.118 - if test "x$MSVCR_DLL" = x; then 7.119 - # If visual studio express is installed, there is usually one with the debugger 7.120 - if test "x$VS100COMNTOOLS" != x; then 7.121 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 7.122 - MSVCR_DLL=`find "$VS100COMNTOOLS/.." -name msvcr100.dll | grep -i x64 | head --lines 1` 7.123 - AC_MSG_NOTICE([msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS..]) 7.124 - fi 7.125 - fi 7.126 - fi 7.127 - if test "x$MSVCR_DLL" = x; then 7.128 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 7.129 - # Fallback for 32bit builds, look in the windows directory. 7.130 - if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then 7.131 - AC_MSG_NOTICE([msvcr100.dll found in $SYSTEMROOT/system32]) 7.132 - MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll" 7.133 - fi 7.134 - fi 7.135 + 7.136 + TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VCINSTALLDIR]) 7.137 fi 7.138 fi 7.139 + 7.140 if test "x$MSVCR_DLL" = x; then 7.141 + AC_MSG_CHECKING([for msvcr100.dll]) 7.142 AC_MSG_RESULT([no]) 7.143 - AC_MSG_ERROR([Could not find msvcr100.dll !]) 7.144 + AC_MSG_ERROR([Could not find msvcr100.dll. Please specify using --with-msvcr-dll.]) 7.145 fi 7.146 - AC_MSG_RESULT([$MSVCR_DLL]) 7.147 + 7.148 BASIC_FIXUP_PATH(MSVCR_DLL) 7.149 ])
8.1 --- a/common/makefiles/JavaCompilation.gmk Tue Oct 22 13:56:11 2013 -0700 8.2 +++ b/common/makefiles/JavaCompilation.gmk Tue Oct 22 14:53:08 2013 -0700 8.3 @@ -266,8 +266,12 @@ 8.4 endif 8.5 8.6 # Find all files in the source tree. 8.7 - $1_ALL_SRCS := $$(call not-containing,_the., \ 8.8 - $$(filter $$(addprefix %,$$($1_SUFFIXES)),$$(call CacheFind,$$($1_FIND_LIST)))) 8.9 + $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST))) 8.10 + 8.11 + # Filter on suffixes if set 8.12 + ifneq ($$($1_SUFFIXES),) 8.13 + $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS)) 8.14 + endif 8.15 8.16 ifneq ($$($1_INCLUDES),) 8.17 ifneq ($$($1_SUFFIXES),)
