author | ihse |
Tue, 21 Nov 2017 09:56:35 +0100 | |
changeset 47871 | 5ab3961d20dd |
parent 47346 | ea082b202a23 |
child 48743 | ba52fa7bbf14 |
permissions | -rw-r--r-- |
14111 | 1 |
#!/bin/bash |
2 |
# |
|
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
3 |
# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved. |
14111 | 4 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5 |
# |
|
6 |
# This code is free software; you can redistribute it and/or modify it |
|
7 |
# under the terms of the GNU General Public License version 2 only, as |
|
8 |
# published by the Free Software Foundation. |
|
9 |
# |
|
10 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
11 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
12 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
13 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
14 |
# accompanied this code). |
|
15 |
# |
|
16 |
# You should have received a copy of the GNU General Public License version |
|
17 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
18 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
19 |
# |
|
20 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
21 |
# or visit www.oracle.com if you need additional information or have any |
|
22 |
# questions. |
|
23 |
# |
|
24 |
||
22722 | 25 |
if test "x$1" != xCHECKME; then |
47346 | 26 |
echo "ERROR: Calling this wrapper script directly is not supported." |
22722 | 27 |
echo "Use the 'configure' script in the top-level directory instead." |
47346 | 28 |
exit 1 |
14111 | 29 |
fi |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
30 |
|
47346 | 31 |
# The next argument is the absolute top-level directory path. |
32 |
# The TOPDIR variable is passed on to configure.ac. |
|
33 |
TOPDIR="$2" |
|
34 |
# Remove these two arguments to get to the user supplied arguments |
|
35 |
shift |
|
36 |
shift |
|
37 |
||
28358 | 38 |
if test "x$BASH" = x; then |
39 |
echo "Error: This script must be run using bash." 1>&2 |
|
40 |
exit 1 |
|
41 |
fi |
|
28813 | 42 |
# Force autoconf to use bash. This also means we must disable autoconf re-exec. |
28358 | 43 |
export CONFIG_SHELL=$BASH |
28813 | 44 |
export _as_can_reexec=no |
28358 | 45 |
|
47217 | 46 |
conf_script_dir="$TOPDIR/make/autoconf" |
13697 | 47 |
|
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
48 |
if test "x$CUSTOM_CONFIG_DIR" != x; then |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
49 |
if test ! -e $CUSTOM_CONFIG_DIR/generated-configure.sh; then |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
50 |
echo "CUSTOM_CONFIG_DIR not pointing to a proper custom config dir." |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
51 |
echo "Error: Cannot continue" 1>&2 |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
52 |
exit 1 |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
53 |
fi |
13697 | 54 |
fi |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
55 |
|
13132 | 56 |
### |
57 |
### Test that the generated configure is up-to-date |
|
58 |
### |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
59 |
|
14111 | 60 |
run_autogen_or_fail() { |
24655
6940eba5402c
8044733: common/autoconf/configure script doesn't properly detect missing tools
mduigou
parents:
22729
diff
changeset
|
61 |
if test "x`which autoconf 2> /dev/null | grep -v '^no autoconf in'`" = x; then |
14111 | 62 |
echo "Cannot locate autoconf, unable to correct situation." |
63 |
echo "Please install autoconf and run 'bash autogen.sh' to update the generated files." |
|
64 |
echo "Error: Cannot continue" 1>&2 |
|
65 |
exit 1 |
|
66 |
else |
|
67 |
echo "Running autogen.sh to correct the situation" |
|
68 |
bash $conf_script_dir/autogen.sh |
|
69 |
fi |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
70 |
} |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
71 |
|
14111 | 72 |
check_autoconf_timestamps() { |
73 |
for file in $conf_script_dir/configure.ac $conf_script_dir/*.m4 ; do |
|
74 |
if test $file -nt $conf_script_dir/generated-configure.sh; then |
|
75 |
echo "Warning: The configure source files is newer than the generated files." |
|
76 |
run_autogen_or_fail |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
77 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
78 |
done |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
79 |
|
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
80 |
if test "x$CUSTOM_CONFIG_DIR" != x; then |
14111 | 81 |
# If custom source configure is available, make sure it is up-to-date as well. |
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
82 |
for file in $conf_script_dir/configure.ac $conf_script_dir/*.m4 $CUSTOM_CONFIG_DIR/*.m4; do |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
83 |
if test $file -nt $CUSTOM_CONFIG_DIR/generated-configure.sh; then |
14111 | 84 |
echo "Warning: The configure source files is newer than the custom generated files." |
85 |
run_autogen_or_fail |
|
86 |
fi |
|
87 |
done |
|
88 |
fi |
|
89 |
} |
|
90 |
||
91 |
check_hg_updates() { |
|
24655
6940eba5402c
8044733: common/autoconf/configure script doesn't properly detect missing tools
mduigou
parents:
22729
diff
changeset
|
92 |
if test "x`which hg 2> /dev/null | grep -v '^no hg in'`" != x; then |
47871
5ab3961d20dd
8191204: Post-consolidation cleaning up of the build system
ihse
parents:
47346
diff
changeset
|
93 |
conf_updated_autoconf_files=`cd $conf_script_dir && hg status -mard . 2> /dev/null` |
14111 | 94 |
if test "x$conf_updated_autoconf_files" != x; then |
95 |
echo "Configure source code has been updated, checking time stamps" |
|
96 |
check_autoconf_timestamps |
|
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
97 |
elif test "x$CUSTOM_CONFIG_DIR" != x; then |
14111 | 98 |
# If custom source configure is available, make sure it is up-to-date as well. |
47871
5ab3961d20dd
8191204: Post-consolidation cleaning up of the build system
ihse
parents:
47346
diff
changeset
|
99 |
conf_custom_updated_autoconf_files=`cd $CUSTOM_CONFIG_DIR && hg status -mard . 2> /dev/null` |
14111 | 100 |
if test "x$conf_custom_updated_autoconf_files" != x; then |
101 |
echo "Configure custom source code has been updated, checking time stamps" |
|
102 |
check_autoconf_timestamps |
|
103 |
fi |
|
104 |
fi |
|
105 |
fi |
|
106 |
} |
|
107 |
||
108 |
# Check for local changes |
|
109 |
check_hg_updates |
|
110 |
||
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
111 |
if test "x$CUSTOM_CONFIG_DIR" != x; then |
13697 | 112 |
# Test if open configure is newer than custom configure, if so, custom needs to |
113 |
# be regenerated. This test is required to ensure consistency with custom source. |
|
14111 | 114 |
conf_open_configure_timestamp=`grep DATE_WHEN_GENERATED= $conf_script_dir/generated-configure.sh | cut -d"=" -f 2` |
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
115 |
conf_custom_configure_timestamp=`grep DATE_WHEN_GENERATED= $CUSTOM_CONFIG_DIR/generated-configure.sh | cut -d"=" -f 2` |
14111 | 116 |
if test $conf_open_configure_timestamp -gt $conf_custom_configure_timestamp; then |
117 |
echo "Warning: The generated configure file contains changes not present in the custom generated file." |
|
118 |
run_autogen_or_fail |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
119 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
120 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
121 |
|
20363 | 122 |
# Autoconf calls the configure script recursively sometimes. |
13697 | 123 |
# Don't start logging twice in that case |
14111 | 124 |
if test "x$conf_debug_configure" = xtrue; then |
13697 | 125 |
conf_debug_configure=recursive |
126 |
fi |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
127 |
|
13132 | 128 |
### |
129 |
### Process command-line arguments |
|
130 |
### |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
131 |
|
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
132 |
# Returns a shell-escaped version of the argument given. |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
133 |
function shell_quote() { |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
134 |
if [[ -n "$1" ]]; then |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
135 |
# Uses only shell-safe characters? No quoting needed. |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
136 |
# '=' is a zsh meta-character, but only in word-initial position. |
22729
ef9f87d39598
8036145: Solaris standard grep does not understand -qE
erikj
parents:
22727
diff
changeset
|
137 |
if echo "$1" | grep '^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\.:,%/+=_-]\{1,\}$' > /dev/null \ |
ef9f87d39598
8036145: Solaris standard grep does not understand -qE
erikj
parents:
22727
diff
changeset
|
138 |
&& ! echo "$1" | grep '^=' > /dev/null; then |
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
139 |
quoted="$1" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
140 |
else |
22729
ef9f87d39598
8036145: Solaris standard grep does not understand -qE
erikj
parents:
22727
diff
changeset
|
141 |
if echo "$1" | grep "[\'!]" > /dev/null; then |
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
142 |
# csh does history expansion within single quotes, but not |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
143 |
# when backslash-escaped! |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
144 |
local quoted_quote="'\\''" quoted_exclam="'\\!'" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
145 |
word="${1//\'/${quoted_quote}}" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
146 |
word="${1//\!/${quoted_exclam}}" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
147 |
fi |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
148 |
quoted="'$1'" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
149 |
fi |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
150 |
echo "$quoted" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
151 |
fi |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
152 |
} |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
153 |
|
14111 | 154 |
conf_processed_arguments=() |
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
155 |
conf_quoted_arguments=() |
13132 | 156 |
conf_openjdk_target= |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
157 |
|
13132 | 158 |
for conf_option |
159 |
do |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
160 |
|
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
161 |
# Process (and remove) our own extensions that will not be passed to autoconf |
13132 | 162 |
case $conf_option in |
20363 | 163 |
--openjdk-target=*) |
164 |
conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'` |
|
22475 | 165 |
;; |
20363 | 166 |
--debug-configure) |
167 |
if test "x$conf_debug_configure" != xrecursive; then |
|
168 |
conf_debug_configure=true |
|
169 |
export conf_debug_configure |
|
170 |
fi |
|
22475 | 171 |
;; |
20363 | 172 |
*) |
22475 | 173 |
conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") |
174 |
;; |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
175 |
esac |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
176 |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
177 |
# Store all variables overridden on the command line |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
178 |
case $conf_option in |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
179 |
[^-]*=*) |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
180 |
# Add name of variable to CONFIGURE_OVERRIDDEN_VARIABLES list inside !...!. |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
181 |
conf_env_var=`expr "x$conf_option" : 'x\([^=]*\)='` |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
182 |
CONFIGURE_OVERRIDDEN_VARIABLES="$CONFIGURE_OVERRIDDEN_VARIABLES!$conf_env_var!" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
183 |
;; |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
184 |
esac |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
185 |
|
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
186 |
# Save the arguments, intelligently quoted for CONFIGURE_COMMAND_LINE. |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
187 |
case $conf_option in |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
188 |
*=*) |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
189 |
conf_option_name=`expr "x$conf_option" : 'x\([^=]*\)='` |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
190 |
conf_option_name=$(shell_quote "$conf_option_name") |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
191 |
conf_option_value=`expr "x$conf_option" : 'x[^=]*=\(.*\)'` |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
192 |
conf_option_value=$(shell_quote "$conf_option_value") |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
193 |
conf_quoted_arguments=("${conf_quoted_arguments[@]}" "$conf_option_name=$conf_option_value") |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
194 |
;; |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
195 |
*) |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
196 |
conf_quoted_arguments=("${conf_quoted_arguments[@]}" "$(shell_quote "$conf_option")") |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
197 |
;; |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
198 |
esac |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
199 |
|
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
200 |
# Check for certain autoconf options that require extra action |
13132 | 201 |
case $conf_option in |
20363 | 202 |
-build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*) |
203 |
conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; |
|
204 |
-target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) |
|
205 |
conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; |
|
206 |
-host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*) |
|
207 |
conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; |
|
208 |
-help | --help | --hel | --he | -h) |
|
209 |
conf_print_help=true ;; |
|
13132 | 210 |
esac |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
211 |
done |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
212 |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
213 |
# Save the quoted command line |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
214 |
CONFIGURE_COMMAND_LINE="${conf_quoted_arguments[@]}" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
215 |
|
14111 | 216 |
if test "x$conf_legacy_crosscompile" != "x"; then |
217 |
if test "x$conf_openjdk_target" != "x"; then |
|
13132 | 218 |
echo "Error: Specifying --openjdk-target together with autoconf" |
219 |
echo "legacy cross-compilation flags is not supported." |
|
220 |
echo "You specified: --openjdk-target=$conf_openjdk_target and $conf_legacy_crosscompile." |
|
221 |
echo "The recommended use is just --openjdk-target." |
|
222 |
exit 1 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
223 |
else |
13132 | 224 |
echo "Warning: You are using legacy autoconf cross-compilation flags." |
225 |
echo "It is recommended that you use --openjdk-target instead." |
|
226 |
echo "" |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
227 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
228 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
229 |
|
14111 | 230 |
if test "x$conf_openjdk_target" != "x"; then |
13132 | 231 |
conf_build_platform=`sh $conf_script_dir/build-aux/config.guess` |
14111 | 232 |
conf_processed_arguments=("--build=$conf_build_platform" "--host=$conf_openjdk_target" "--target=$conf_openjdk_target" "${conf_processed_arguments[@]}") |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
233 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
234 |
|
13132 | 235 |
# Make configure exit with error on invalid options as default. |
236 |
# Can be overridden by --disable-option-checking, since we prepend our argument |
|
237 |
# and later options override earlier. |
|
14111 | 238 |
conf_processed_arguments=("--enable-option-checking=fatal" "${conf_processed_arguments[@]}") |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
239 |
|
13132 | 240 |
### |
241 |
### Call the configure script |
|
242 |
### |
|
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
243 |
if test "x$CUSTOM_CONFIG_DIR" != x; then |
13697 | 244 |
# Custom source configure available; run that instead |
22722 | 245 |
echo "Running custom generated-configure.sh" |
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
246 |
conf_script_to_run=$CUSTOM_CONFIG_DIR/generated-configure.sh |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
247 |
else |
22722 | 248 |
echo "Running generated-configure.sh" |
13697 | 249 |
conf_script_to_run=$conf_script_dir/generated-configure.sh |
20363 | 250 |
fi |
13697 | 251 |
|
14111 | 252 |
if test "x$conf_debug_configure" != x; then |
13697 | 253 |
# Turn on shell debug output if requested (initial or recursive) |
254 |
set -x |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
255 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
256 |
|
30417
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
28813
diff
changeset
|
257 |
# Now transfer control to the script generated by autoconf. This is where the |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
28813
diff
changeset
|
258 |
# main work is done. |
34491 | 259 |
RCDIR=`mktemp -dt jdk-build-configure.tmp.XXXXXX` || exit $? |
260 |
trap "rm -rf \"$RCDIR\"" EXIT |
|
30417
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
28813
diff
changeset
|
261 |
conf_logfile=./configure.log |
34491 | 262 |
(exec 3>&1 ; ((. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) \ |
263 |
; echo $? > "$RCDIR/rc" ) \ |
|
264 |
| tee -a $conf_logfile 1>&2 ; exec 3>&-) | tee -a $conf_logfile |
|
13697 | 265 |
|
34491 | 266 |
conf_result_code=`cat "$RCDIR/rc"` |
13132 | 267 |
### |
268 |
### Post-processing |
|
269 |
### |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
270 |
|
14111 | 271 |
if test $conf_result_code -eq 0; then |
272 |
if test "x$conf_print_help" = xtrue; then |
|
273 |
cat <<EOT |
|
274 |
||
275 |
Additional (non-autoconf) OpenJDK Options: |
|
276 |
--openjdk-target=TARGET cross-compile with TARGET as target platform |
|
277 |
(i.e. the one you will run the resulting binary on). |
|
278 |
Equivalent to --host=TARGET --target=TARGET |
|
279 |
--build=<current platform> |
|
280 |
--debug-configure Run the configure script with additional debug |
|
281 |
logging enabled. |
|
282 |
||
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
283 |
EOT |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
284 |
|
37402 | 285 |
# Print additional help, e.g. a list of toolchains and JVM features. |
35747 | 286 |
# This must be done by the autoconf script. |
287 |
( CONFIGURE_PRINT_ADDITIONAL_HELP=true . $conf_script_to_run PRINTF=printf ) |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
288 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
289 |
cat <<EOT |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
290 |
|
14111 | 291 |
Please be aware that, when cross-compiling, the OpenJDK configure script will |
292 |
generally use 'target' where autoconf traditionally uses 'host'. |
|
22475 | 293 |
|
294 |
Also note that variables must be passed on the command line. Variables in the |
|
295 |
environment will generally be ignored, unlike traditional autoconf scripts. |
|
14111 | 296 |
EOT |
297 |
fi |
|
298 |
else |
|
299 |
echo configure exiting with result code $conf_result_code |
|
300 |
fi |
|
301 |
||
13697 | 302 |
exit $conf_result_code |