Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Fri, 05 Apr 2013 14:49:54 -0700
- author
- lana
- date
- Fri, 05 Apr 2013 14:49:54 -0700
- changeset 683
- 11c057460b91
- parent 682
- 575f2ca947ab
- parent 667
- a0fa9e93efee
- child 684
- 4c13b7994f38
- child 689
- 7da551071fe8
- child 889
- 1378ccca1c79
Merge
1.1 --- a/.hgtags Wed Apr 03 16:26:10 2013 -0700 1.2 +++ b/.hgtags Fri Apr 05 14:49:54 2013 -0700 1.3 @@ -205,3 +205,4 @@ 1.4 145dbc56f931c134e837b675b9e6e7bf08902e93 jdk8-b81 1.5 29153d0df68f84162ffe8c2cf4f402a3f2245e85 jdk8-b82 1.6 466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83 1.7 +01f631f89fa392b4e484d0812c40ea8f9d2353aa jdk8-b84
2.1 --- a/common/autoconf/autogen.sh Wed Apr 03 16:26:10 2013 -0700 2.2 +++ b/common/autoconf/autogen.sh Fri Apr 05 14:49:54 2013 -0700 2.3 @@ -43,14 +43,24 @@ 2.4 2.5 custom_hook=$custom_script_dir/custom-hook.m4 2.6 2.7 -if test "x`which autoconf 2> /dev/null`" = x; then 2.8 +AUTOCONF=$(which autoconf 2> /dev/null); 2.9 +AUTOCONF_267=$(which autoconf-2.67 2> /dev/null); 2.10 + 2.11 +echo "Autoconf found: ${AUTOCONF}" 2.12 +echo "Autoconf-2.67 found: ${AUTOCONF_267}" 2.13 + 2.14 +if test "x${AUTOCONF}" = x; then 2.15 echo You need autoconf installed to be able to regenerate the configure script 2.16 echo Error: Cannot find autoconf 1>&2 2.17 exit 1 2.18 fi 2.19 2.20 -echo Generating generated-configure.sh 2.21 -cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | autoconf -W all -I$script_dir - > $script_dir/generated-configure.sh 2.22 +if test "x${AUTOCONF_267}" != x; then 2.23 + AUTOCONF=${AUTOCONF_267}; 2.24 +fi 2.25 + 2.26 +echo Generating generated-configure.sh with ${AUTOCONF} 2.27 +cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh 2.28 rm -rf autom4te.cache 2.29 2.30 if test -e $custom_hook; then 2.31 @@ -58,7 +68,7 @@ 2.32 # We have custom sources available; also generate configure script 2.33 # with custom hooks compiled in. 2.34 cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | \ 2.35 - sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | autoconf -W all -I$script_dir - > $custom_script_dir/generated-configure.sh 2.36 + sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh 2.37 rm -rf autom4te.cache 2.38 else 2.39 echo No custom hook found: $custom_hook
3.1 --- a/common/autoconf/generated-configure.sh Wed Apr 03 16:26:10 2013 -0700 3.2 +++ b/common/autoconf/generated-configure.sh Fri Apr 05 14:49:54 2013 -0700 3.3 @@ -1013,6 +1013,7 @@ 3.4 with_alsa 3.5 with_alsa_include 3.6 with_alsa_lib 3.7 +with_giflib 3.8 with_zlib 3.9 with_stdc__lib 3.10 with_num_cores 3.11 @@ -1771,6 +1772,8 @@ 3.12 headers under PATH/include) 3.13 --with-alsa-include specify directory for the alsa include files 3.14 --with-alsa-lib specify directory for the alsa library 3.15 + --with-giflib use giflib from build system or OpenJDK source 3.16 + (system, bundled) [bundled] 3.17 --with-zlib use zlib from build system or OpenJDK source 3.18 (system, bundled) [bundled] 3.19 --with-stdc++lib=<static>,<dynamic>,<default> 3.20 @@ -3753,7 +3756,7 @@ 3.21 #CUSTOM_AUTOCONF_INCLUDE 3.22 3.23 # Do not change or remove the following line, it is needed for consistency checks: 3.24 -DATE_WHEN_GENERATED=1363706268 3.25 +DATE_WHEN_GENERATED=1364922883 3.26 3.27 ############################################################################### 3.28 # 3.29 @@ -28903,14 +28906,15 @@ 3.30 # 3.31 # ZIP_DEBUGINFO_FILES 3.32 # 3.33 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5 3.34 +$as_echo_n "checking if we should zip debug-info files... " >&6; } 3.35 # Check whether --enable-zip-debug-info was given. 3.36 if test "${enable_zip_debug_info+set}" = set; then : 3.37 - enableval=$enable_zip_debug_info; 3.38 -fi 3.39 - 3.40 - 3.41 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5 3.42 -$as_echo_n "checking if we should zip debug-info files... " >&6; } 3.43 + enableval=$enable_zip_debug_info; enable_zip_debug_info="${enableval}" 3.44 +else 3.45 + enable_zip_debug_info="yes" 3.46 +fi 3.47 + 3.48 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5 3.49 $as_echo "${enable_zip_debug_info}" >&6; } 3.50 3.51 @@ -31178,10 +31182,44 @@ 3.52 # Check for the gif library 3.53 # 3.54 3.55 -USE_EXTERNAL_LIBJPEG=true 3.56 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 3.57 -$as_echo_n "checking for main in -lgif... " >&6; } 3.58 -if ${ac_cv_lib_gif_main+:} false; then : 3.59 + 3.60 +# Check whether --with-giflib was given. 3.61 +if test "${with_giflib+set}" = set; then : 3.62 + withval=$with_giflib; 3.63 +fi 3.64 + 3.65 + 3.66 + 3.67 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for which giflib to use" >&5 3.68 +$as_echo_n "checking for which giflib to use... " >&6; } 3.69 + 3.70 +# default is bundled 3.71 +DEFAULT_GIFLIB=bundled 3.72 + 3.73 +# 3.74 +# if user didn't specify, use DEFAULT_GIFLIB 3.75 +# 3.76 +if test "x${with_giflib}" = "x"; then 3.77 + with_giflib=${DEFAULT_GIFLIB} 3.78 +fi 3.79 + 3.80 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_giflib}" >&5 3.81 +$as_echo "${with_giflib}" >&6; } 3.82 + 3.83 +if test "x${with_giflib}" = "xbundled"; then 3.84 + USE_EXTERNAL_LIBGIF=false 3.85 +elif test "x${with_giflib}" = "xsystem"; then 3.86 + ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" 3.87 +if test "x$ac_cv_header_gif_lib_h" = xyes; then : 3.88 + 3.89 +else 3.90 + as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5 3.91 +fi 3.92 + 3.93 + 3.94 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5 3.95 +$as_echo_n "checking for DGifGetCode in -lgif... " >&6; } 3.96 +if ${ac_cv_lib_gif_DGifGetCode+:} false; then : 3.97 $as_echo_n "(cached) " >&6 3.98 else 3.99 ac_check_lib_save_LIBS=$LIBS 3.100 @@ -31189,27 +31227,33 @@ 3.101 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.102 /* end confdefs.h. */ 3.103 3.104 - 3.105 -int 3.106 -main () 3.107 -{ 3.108 -return main (); 3.109 +/* Override any GCC internal prototype to avoid an error. 3.110 + Use char because int might match the return type of a GCC 3.111 + builtin and then its argument prototype would still apply. */ 3.112 +#ifdef __cplusplus 3.113 +extern "C" 3.114 +#endif 3.115 +char DGifGetCode (); 3.116 +int 3.117 +main () 3.118 +{ 3.119 +return DGifGetCode (); 3.120 ; 3.121 return 0; 3.122 } 3.123 _ACEOF 3.124 if ac_fn_cxx_try_link "$LINENO"; then : 3.125 - ac_cv_lib_gif_main=yes 3.126 -else 3.127 - ac_cv_lib_gif_main=no 3.128 + ac_cv_lib_gif_DGifGetCode=yes 3.129 +else 3.130 + ac_cv_lib_gif_DGifGetCode=no 3.131 fi 3.132 rm -f core conftest.err conftest.$ac_objext \ 3.133 conftest$ac_exeext conftest.$ac_ext 3.134 LIBS=$ac_check_lib_save_LIBS 3.135 fi 3.136 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 3.137 -$as_echo "$ac_cv_lib_gif_main" >&6; } 3.138 -if test "x$ac_cv_lib_gif_main" = xyes; then : 3.139 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5 3.140 +$as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; } 3.141 +if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then : 3.142 cat >>confdefs.h <<_ACEOF 3.143 #define HAVE_LIBGIF 1 3.144 _ACEOF 3.145 @@ -31217,12 +31261,14 @@ 3.146 LIBS="-lgif $LIBS" 3.147 3.148 else 3.149 - USE_EXTERNAL_LIBGIF=false 3.150 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use gif decoder bundled with the OpenJDK source" >&5 3.151 -$as_echo "$as_me: Will use gif decoder bundled with the OpenJDK source" >&6;} 3.152 - 3.153 -fi 3.154 - 3.155 + as_fn_error $? "--with-giflib=system specified, but no giflib found!" "$LINENO" 5 3.156 +fi 3.157 + 3.158 + 3.159 + USE_EXTERNAL_LIBGIF=true 3.160 +else 3.161 + as_fn_error $? "Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled'" "$LINENO" 5 3.162 +fi 3.163 3.164 3.165 ###############################################################################
4.1 --- a/common/autoconf/jdk-options.m4 Wed Apr 03 16:26:10 2013 -0700 4.2 +++ b/common/autoconf/jdk-options.m4 Fri Apr 05 14:49:54 2013 -0700 4.3 @@ -519,10 +519,10 @@ 4.4 # 4.5 # ZIP_DEBUGINFO_FILES 4.6 # 4.7 +AC_MSG_CHECKING([if we should zip debug-info files]) 4.8 AC_ARG_ENABLE([zip-debug-info], 4.9 - [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])]) 4.10 - 4.11 -AC_MSG_CHECKING([if we should zip debug-info files]) 4.12 + [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])], 4.13 + [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"]) 4.14 AC_MSG_RESULT([${enable_zip_debug_info}]) 4.15 4.16 if test "x${enable_zip_debug_info}" = "xno"; then
5.1 --- a/common/autoconf/libraries.m4 Wed Apr 03 16:26:10 2013 -0700 5.2 +++ b/common/autoconf/libraries.m4 Fri Apr 05 14:49:54 2013 -0700 5.3 @@ -499,11 +499,36 @@ 5.4 # Check for the gif library 5.5 # 5.6 5.7 -USE_EXTERNAL_LIBJPEG=true 5.8 -AC_CHECK_LIB(gif, main, [], 5.9 - [ USE_EXTERNAL_LIBGIF=false 5.10 - AC_MSG_NOTICE([Will use gif decoder bundled with the OpenJDK source]) 5.11 - ]) 5.12 +AC_ARG_WITH(giflib, [AS_HELP_STRING([--with-giflib], 5.13 + [use giflib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) 5.14 + 5.15 + 5.16 +AC_MSG_CHECKING([for which giflib to use]) 5.17 + 5.18 +# default is bundled 5.19 +DEFAULT_GIFLIB=bundled 5.20 + 5.21 +# 5.22 +# if user didn't specify, use DEFAULT_GIFLIB 5.23 +# 5.24 +if test "x${with_giflib}" = "x"; then 5.25 + with_giflib=${DEFAULT_GIFLIB} 5.26 +fi 5.27 + 5.28 +AC_MSG_RESULT(${with_giflib}) 5.29 + 5.30 +if test "x${with_giflib}" = "xbundled"; then 5.31 + USE_EXTERNAL_LIBGIF=false 5.32 +elif test "x${with_giflib}" = "xsystem"; then 5.33 + AC_CHECK_HEADER(gif_lib.h, [], 5.34 + [ AC_MSG_ERROR([--with-giflib=system specified, but gif_lib.h not found!])]) 5.35 + AC_CHECK_LIB(gif, DGifGetCode, [], 5.36 + [ AC_MSG_ERROR([--with-giflib=system specified, but no giflib found!])]) 5.37 + 5.38 + USE_EXTERNAL_LIBGIF=true 5.39 +else 5.40 + AC_MSG_ERROR([Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled']) 5.41 +fi 5.42 AC_SUBST(USE_EXTERNAL_LIBGIF) 5.43 5.44 ###############################################################################
