Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/configure
common/autoconf/configure
- changeset 972
- f3697e0783e2
- parent 839
- 174a54ce39c4
- child 1133
- 50aaf272884f
- child 1322
- 0dd73d0f67af
equal
deleted
inserted
replaced
| 971:584dc2e95e04 | 972:f3697e0783e2 |
|---|---|
| 86 if test "x$conf_custom_updated_autoconf_files" != x; then | 86 if test "x$conf_custom_updated_autoconf_files" != x; then |
| 87 echo "Configure custom source code has been updated, checking time stamps" | 87 echo "Configure custom source code has been updated, checking time stamps" |
| 88 check_autoconf_timestamps | 88 check_autoconf_timestamps |
| 89 fi | 89 fi |
| 90 fi | 90 fi |
| 91 | |
| 92 fi | 91 fi |
| 93 } | 92 } |
| 94 | 93 |
| 95 # Check for local changes | 94 # Check for local changes |
| 96 check_hg_updates | 95 check_hg_updates |
| 104 echo "Warning: The generated configure file contains changes not present in the custom generated file." | 103 echo "Warning: The generated configure file contains changes not present in the custom generated file." |
| 105 run_autogen_or_fail | 104 run_autogen_or_fail |
| 106 fi | 105 fi |
| 107 fi | 106 fi |
| 108 | 107 |
| 109 # Autoconf calls the configure script recursively sometimes. | 108 # Autoconf calls the configure script recursively sometimes. |
| 110 # Don't start logging twice in that case | 109 # Don't start logging twice in that case |
| 111 if test "x$conf_debug_configure" = xtrue; then | 110 if test "x$conf_debug_configure" = xtrue; then |
| 112 conf_debug_configure=recursive | 111 conf_debug_configure=recursive |
| 113 fi | 112 fi |
| 114 ### | 113 ### |
| 118 conf_openjdk_target= | 117 conf_openjdk_target= |
| 119 | 118 |
| 120 for conf_option | 119 for conf_option |
| 121 do | 120 do |
| 122 case $conf_option in | 121 case $conf_option in |
| 123 --openjdk-target=*) | 122 --openjdk-target=*) |
| 124 conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'` | 123 conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'` |
| 125 continue ;; | 124 continue ;; |
| 126 --debug-configure) | 125 --debug-configure) |
| 127 if test "x$conf_debug_configure" != xrecursive; then | 126 if test "x$conf_debug_configure" != xrecursive; then |
| 128 conf_debug_configure=true | 127 conf_debug_configure=true |
| 129 export conf_debug_configure | 128 export conf_debug_configure |
| 130 fi | 129 fi |
| 131 continue ;; | 130 continue ;; |
| 132 *) | 131 *) |
| 133 conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;; | 132 conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;; |
| 134 esac | 133 esac |
| 135 | 134 |
| 136 case $conf_option in | 135 case $conf_option in |
| 137 -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*) | 136 -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*) |
| 138 conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; | 137 conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; |
| 139 -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) | 138 -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) |
| 140 conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; | 139 conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; |
| 141 -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*) | 140 -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*) |
| 142 conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; | 141 conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; |
| 143 -help | --help | --hel | --he | -h) | 142 -help | --help | --hel | --he | -h) |
| 144 conf_print_help=true ;; | 143 conf_print_help=true ;; |
| 145 esac | 144 esac |
| 146 done | 145 done |
| 147 | 146 |
| 148 if test "x$conf_legacy_crosscompile" != "x"; then | 147 if test "x$conf_legacy_crosscompile" != "x"; then |
| 149 if test "x$conf_openjdk_target" != "x"; then | 148 if test "x$conf_openjdk_target" != "x"; then |
| 177 echo Running custom generated-configure.sh | 176 echo Running custom generated-configure.sh |
| 178 conf_script_to_run=$conf_custom_script_dir/generated-configure.sh | 177 conf_script_to_run=$conf_custom_script_dir/generated-configure.sh |
| 179 else | 178 else |
| 180 echo Running generated-configure.sh | 179 echo Running generated-configure.sh |
| 181 conf_script_to_run=$conf_script_dir/generated-configure.sh | 180 conf_script_to_run=$conf_script_dir/generated-configure.sh |
| 182 fi | 181 fi |
| 183 | 182 |
| 184 if test "x$conf_debug_configure" != x; then | 183 if test "x$conf_debug_configure" != x; then |
| 185 # Turn on shell debug output if requested (initial or recursive) | 184 # Turn on shell debug output if requested (initial or recursive) |
| 186 set -x | 185 set -x |
| 187 fi | 186 fi |
| 217 fi | 216 fi |
| 218 else | 217 else |
| 219 echo configure exiting with result code $conf_result_code | 218 echo configure exiting with result code $conf_result_code |
| 220 fi | 219 fi |
| 221 | 220 |
| 222 # Move the log file to the output root, if this was successfully created | |
| 223 if test -d "$OUTPUT_ROOT"; then | |
| 224 mv -f config.log "$OUTPUT_ROOT" 2> /dev/null | |
| 225 fi | |
| 226 | |
| 227 exit $conf_result_code | 221 exit $conf_result_code |
