author | dlong |
Thu, 31 Oct 2019 16:54:16 -0700 | |
changeset 58877 | aec7bf35d6f5 |
parent 58549 | 9d9317fad3fe |
permissions | -rw-r--r-- |
14111 | 1 |
#!/bin/bash |
2 |
# |
|
53999
d7852bb72332
8219920: dependency help output in configure-step : support zypper tool
mbaesken
parents:
51585
diff
changeset
|
3 |
# Copyright (c) 2012, 2019, 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 |
|
58549
9d9317fad3fe
8065704: Set LC_ALL=C for all relevant commands in the build system
ihse
parents:
53999
diff
changeset
|
46 |
# Make sure all shell commands are executed with the C locale |
9d9317fad3fe
8065704: Set LC_ALL=C for all relevant commands in the build system
ihse
parents:
53999
diff
changeset
|
47 |
export LC_ALL=C |
9d9317fad3fe
8065704: Set LC_ALL=C for all relevant commands in the build system
ihse
parents:
53999
diff
changeset
|
48 |
|
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
49 |
if test "x$CUSTOM_CONFIG_DIR" != x; then |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
50 |
custom_hook=$CUSTOM_CONFIG_DIR/custom-hook.m4 |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
51 |
if test ! -e $custom_hook; then |
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
52 |
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
|
53 |
echo "Error: Cannot continue" 1>&2 |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
54 |
exit 1 |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
55 |
fi |
48846
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
56 |
fi |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
57 |
|
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
58 |
CURRENT_DIR=`pwd` |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
59 |
if test "x$CURRENT_DIR" = "x$TOPDIR"; then |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
60 |
# We are running configure from the src root. |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
61 |
# Create '.configure-support' under $TOPDIR/build |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
62 |
build_support_dir="$TOPDIR/build/.configure-support" |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
63 |
elif test "x$CURRENT_DIR" = "x$CUSTOM_ROOT"; then |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
64 |
# We are running configure from the custom root. |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
65 |
# Create '.configure-support' under $CUSTOM_ROOT/build |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
66 |
build_support_dir="$CUSTOM_ROOT/build/.configure-support" |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
67 |
else |
48846
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
68 |
# We are running configure from outside of the src dir. |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
69 |
# Create 'build_support_dir' in the current directory. |
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
70 |
build_support_dir="$CURRENT_DIR/configure-support" |
13697 | 71 |
fi |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
72 |
|
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
73 |
conf_script_dir="$TOPDIR/make/autoconf" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
74 |
generated_script="$build_support_dir/generated-configure.sh" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
75 |
|
13132 | 76 |
### |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
77 |
### Use autoconf to create a runnable configure script, if needed |
13132 | 78 |
### |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
79 |
|
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
80 |
autoconf_missing_help() { |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
81 |
APT_GET="`which apt-get 2> /dev/null | grep -v '^no apt-get in'`" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
82 |
YUM="`which yum 2> /dev/null | grep -v '^no yum in'`" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
83 |
BREW="`which brew 2> /dev/null | grep -v '^no brew in'`" |
53999
d7852bb72332
8219920: dependency help output in configure-step : support zypper tool
mbaesken
parents:
51585
diff
changeset
|
84 |
ZYPPER="`which zypper 2> /dev/null | grep -v '^no zypper in'`" |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
85 |
CYGWIN="`which cygpath 2> /dev/null | grep -v '^no cygpath in'`" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
86 |
|
53999
d7852bb72332
8219920: dependency help output in configure-step : support zypper tool
mbaesken
parents:
51585
diff
changeset
|
87 |
if test "x$ZYPPER" != x; then |
d7852bb72332
8219920: dependency help output in configure-step : support zypper tool
mbaesken
parents:
51585
diff
changeset
|
88 |
PKGHANDLER_COMMAND="sudo zypper install autoconf" |
d7852bb72332
8219920: dependency help output in configure-step : support zypper tool
mbaesken
parents:
51585
diff
changeset
|
89 |
elif test "x$APT_GET" != x; then |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
90 |
PKGHANDLER_COMMAND="sudo apt-get install autoconf" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
91 |
elif test "x$YUM" != x; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
92 |
PKGHANDLER_COMMAND="sudo yum install autoconf" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
93 |
elif test "x$BREW" != x; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
94 |
PKGHANDLER_COMMAND="brew install autoconf" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
95 |
elif test "x$CYGWIN" != x; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
96 |
PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P autoconf )" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
97 |
fi |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
98 |
|
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
99 |
if test "x$PKGHANDLER_COMMAND" != x; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
100 |
echo "You might be able to fix this by running '$PKGHANDLER_COMMAND'." |
14111 | 101 |
fi |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
102 |
} |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
103 |
|
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
104 |
generate_configure_script() { |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
105 |
if test "x$AUTOCONF" != x; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
106 |
if test ! -x "$AUTOCONF"; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
107 |
echo |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
108 |
echo "The specified AUTOCONF variable does not point to a valid autoconf executable:" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
109 |
echo "AUTOCONF=$AUTOCONF" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
110 |
echo "Error: Cannot continue" 1>&2 |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
111 |
exit 1 |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
112 |
fi |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
113 |
else |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
114 |
AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
115 |
if test "x$AUTOCONF" = x; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
116 |
echo |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
117 |
echo "Autoconf is not found on the PATH, and AUTOCONF is not set." |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
118 |
echo "You need autoconf to be able to generate a runnable configure script." |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
119 |
autoconf_missing_help |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
120 |
echo "Error: Cannot find autoconf" 1>&2 |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
121 |
exit 1 |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
122 |
fi |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
123 |
fi |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
124 |
|
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
125 |
autoconf_version=`$AUTOCONF --version | head -1` |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
126 |
echo "Using autoconf at ${AUTOCONF} [$autoconf_version]" |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
127 |
|
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47217
diff
changeset
|
128 |
if test "x$CUSTOM_CONFIG_DIR" != x; then |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
129 |
# Generate configure script with custom hooks compiled in. |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
130 |
custom_patcher='sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|"' |
51585
c25f6c562bf5
8210150: Allow custom-hook.m4 to include files from CUSTOM_CONFIG_DIR
ihse
parents:
48846
diff
changeset
|
131 |
custom_script_dir_include="-I$CUSTOM_CONFIG_DIR" |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
132 |
else |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
133 |
custom_patcher='cat' |
51585
c25f6c562bf5
8210150: Allow custom-hook.m4 to include files from CUSTOM_CONFIG_DIR
ihse
parents:
48846
diff
changeset
|
134 |
custom_script_dir_include="" |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
135 |
fi |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
136 |
|
48846
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
137 |
mkdir -p $build_support_dir |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
138 |
# Call autoconf but replace the "magic" variable in configure.ac if requested. |
51585
c25f6c562bf5
8210150: Allow custom-hook.m4 to include files from CUSTOM_CONFIG_DIR
ihse
parents:
48846
diff
changeset
|
139 |
|
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
140 |
cat $conf_script_dir/configure.ac | eval $custom_patcher | \ |
51585
c25f6c562bf5
8210150: Allow custom-hook.m4 to include files from CUSTOM_CONFIG_DIR
ihse
parents:
48846
diff
changeset
|
141 |
${AUTOCONF} -W all $custom_script_dir_include -I$conf_script_dir - \ |
c25f6c562bf5
8210150: Allow custom-hook.m4 to include files from CUSTOM_CONFIG_DIR
ihse
parents:
48846
diff
changeset
|
142 |
> $generated_script |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
143 |
rm -rf autom4te.cache |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
144 |
|
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
145 |
# Sanity check |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
146 |
if test ! -s $generated_script; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
147 |
echo "Error: Failed to generate runnable configure script" 1>&2 |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
148 |
rm -f $generated_script |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
149 |
exit 1 |
14111 | 150 |
fi |
151 |
} |
|
152 |
||
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
153 |
test_generated_up_to_date() { |
48764
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
154 |
conf_source_files="$conf_script_dir/configure.ac $conf_script_dir/*.m4" |
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
155 |
if test "x$CUSTOM_CONFIG_DIR" != x; then |
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
156 |
conf_custom_source_files="$CUSTOM_CONFIG_DIR/*.m4" |
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
157 |
else |
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
158 |
conf_custom_source_files="" |
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
159 |
fi |
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
160 |
|
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
161 |
for file in $conf_source_files $conf_custom_source_files ; do |
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
162 |
if test $file -nt $generated_script; then |
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
163 |
return 0 |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
164 |
fi |
48764
76ebfaa3cc3f
8196356: Changes to m4 files don't trigger autoconf execution at build time
erikj
parents:
48743
diff
changeset
|
165 |
done |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
166 |
return 1 |
14111 | 167 |
} |
168 |
||
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
169 |
run_autoconf=false |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
170 |
if test "x$1" = xautogen; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
171 |
# User called us as "configure autogen", so force regeneration |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
172 |
run_autoconf=true |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
173 |
shift |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
174 |
fi |
14111 | 175 |
|
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
176 |
if test ! -s $generated_script; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
177 |
# Generated script is missing, so we need to create it |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
178 |
echo "Runnable configure script is not present" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
179 |
run_autoconf=true |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
180 |
else |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
181 |
# File is present, but is it up to date? |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
182 |
if test_generated_up_to_date; then |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
183 |
echo "Runnable configure script is not up to date" |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
184 |
run_autoconf=true |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
185 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
186 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
187 |
|
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
188 |
if test "x$run_autoconf" = xtrue; then |
48846
fe434d568439
8197571: Change storage location for generated-configure.sh
ihse
parents:
48764
diff
changeset
|
189 |
echo "Generating runnable configure script at $generated_script" |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
190 |
generate_configure_script |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
191 |
fi |
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
192 |
|
20363 | 193 |
# Autoconf calls the configure script recursively sometimes. |
13697 | 194 |
# Don't start logging twice in that case |
14111 | 195 |
if test "x$conf_debug_configure" = xtrue; then |
13697 | 196 |
conf_debug_configure=recursive |
197 |
fi |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
198 |
|
13132 | 199 |
### |
200 |
### Process command-line arguments |
|
201 |
### |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
202 |
|
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
203 |
# Returns a shell-escaped version of the argument given. |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
204 |
function shell_quote() { |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
205 |
if [[ -n "$1" ]]; then |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
206 |
# Uses only shell-safe characters? No quoting needed. |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
207 |
# '=' 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
|
208 |
if echo "$1" | grep '^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\.:,%/+=_-]\{1,\}$' > /dev/null \ |
ef9f87d39598
8036145: Solaris standard grep does not understand -qE
erikj
parents:
22727
diff
changeset
|
209 |
&& ! echo "$1" | grep '^=' > /dev/null; then |
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
210 |
quoted="$1" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
211 |
else |
22729
ef9f87d39598
8036145: Solaris standard grep does not understand -qE
erikj
parents:
22727
diff
changeset
|
212 |
if echo "$1" | grep "[\'!]" > /dev/null; then |
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
213 |
# csh does history expansion within single quotes, but not |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
214 |
# when backslash-escaped! |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
215 |
local quoted_quote="'\\''" quoted_exclam="'\\!'" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
216 |
word="${1//\'/${quoted_quote}}" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
217 |
word="${1//\!/${quoted_exclam}}" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
218 |
fi |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
219 |
quoted="'$1'" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
220 |
fi |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
221 |
echo "$quoted" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
222 |
fi |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
223 |
} |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
224 |
|
14111 | 225 |
conf_processed_arguments=() |
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
226 |
conf_quoted_arguments=() |
13132 | 227 |
conf_openjdk_target= |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
228 |
|
13132 | 229 |
for conf_option |
230 |
do |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
231 |
|
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
232 |
# Process (and remove) our own extensions that will not be passed to autoconf |
13132 | 233 |
case $conf_option in |
20363 | 234 |
--openjdk-target=*) |
235 |
conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'` |
|
22475 | 236 |
;; |
20363 | 237 |
--debug-configure) |
238 |
if test "x$conf_debug_configure" != xrecursive; then |
|
239 |
conf_debug_configure=true |
|
240 |
export conf_debug_configure |
|
241 |
fi |
|
22475 | 242 |
;; |
20363 | 243 |
*) |
22475 | 244 |
conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") |
245 |
;; |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
246 |
esac |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
247 |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
248 |
# Store all variables overridden on the command line |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
249 |
case $conf_option in |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
250 |
[^-]*=*) |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
251 |
# 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
|
252 |
conf_env_var=`expr "x$conf_option" : 'x\([^=]*\)='` |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
253 |
CONFIGURE_OVERRIDDEN_VARIABLES="$CONFIGURE_OVERRIDDEN_VARIABLES!$conf_env_var!" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
254 |
;; |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
255 |
esac |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
256 |
|
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
257 |
# Save the arguments, intelligently quoted for CONFIGURE_COMMAND_LINE. |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
258 |
case $conf_option in |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
259 |
*=*) |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
260 |
conf_option_name=`expr "x$conf_option" : 'x\([^=]*\)='` |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
261 |
conf_option_name=$(shell_quote "$conf_option_name") |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
262 |
conf_option_value=`expr "x$conf_option" : 'x[^=]*=\(.*\)'` |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
263 |
conf_option_value=$(shell_quote "$conf_option_value") |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
264 |
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
|
265 |
;; |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
266 |
*) |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
267 |
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
|
268 |
;; |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
269 |
esac |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
270 |
|
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
271 |
# Check for certain autoconf options that require extra action |
13132 | 272 |
case $conf_option in |
20363 | 273 |
-build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*) |
274 |
conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; |
|
275 |
-target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) |
|
276 |
conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; |
|
277 |
-host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*) |
|
278 |
conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;; |
|
279 |
-help | --help | --hel | --he | -h) |
|
280 |
conf_print_help=true ;; |
|
13132 | 281 |
esac |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
282 |
done |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
283 |
|
22716
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
284 |
# Save the quoted command line |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
285 |
CONFIGURE_COMMAND_LINE="${conf_quoted_arguments[@]}" |
cf32fe2eb254
8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents:
22714
diff
changeset
|
286 |
|
14111 | 287 |
if test "x$conf_legacy_crosscompile" != "x"; then |
288 |
if test "x$conf_openjdk_target" != "x"; then |
|
13132 | 289 |
echo "Error: Specifying --openjdk-target together with autoconf" |
290 |
echo "legacy cross-compilation flags is not supported." |
|
291 |
echo "You specified: --openjdk-target=$conf_openjdk_target and $conf_legacy_crosscompile." |
|
292 |
echo "The recommended use is just --openjdk-target." |
|
293 |
exit 1 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
294 |
else |
13132 | 295 |
echo "Warning: You are using legacy autoconf cross-compilation flags." |
296 |
echo "It is recommended that you use --openjdk-target instead." |
|
297 |
echo "" |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
298 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
299 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
300 |
|
14111 | 301 |
if test "x$conf_openjdk_target" != "x"; then |
13132 | 302 |
conf_build_platform=`sh $conf_script_dir/build-aux/config.guess` |
14111 | 303 |
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
|
304 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
305 |
|
13132 | 306 |
# Make configure exit with error on invalid options as default. |
307 |
# Can be overridden by --disable-option-checking, since we prepend our argument |
|
308 |
# and later options override earlier. |
|
14111 | 309 |
conf_processed_arguments=("--enable-option-checking=fatal" "${conf_processed_arguments[@]}") |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
310 |
|
13132 | 311 |
### |
312 |
### Call the configure script |
|
313 |
### |
|
14111 | 314 |
if test "x$conf_debug_configure" != x; then |
13697 | 315 |
# Turn on shell debug output if requested (initial or recursive) |
316 |
set -x |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
317 |
fi |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
318 |
|
30417
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
28813
diff
changeset
|
319 |
# 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
|
320 |
# main work is done. |
34491 | 321 |
RCDIR=`mktemp -dt jdk-build-configure.tmp.XXXXXX` || exit $? |
322 |
trap "rm -rf \"$RCDIR\"" EXIT |
|
30417
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
28813
diff
changeset
|
323 |
conf_logfile=./configure.log |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
324 |
(exec 3>&1 ; ((. $generated_script "${conf_processed_arguments[@]}" 2>&1 1>&3 ) \ |
34491 | 325 |
; echo $? > "$RCDIR/rc" ) \ |
326 |
| tee -a $conf_logfile 1>&2 ; exec 3>&-) | tee -a $conf_logfile |
|
13697 | 327 |
|
34491 | 328 |
conf_result_code=`cat "$RCDIR/rc"` |
13132 | 329 |
### |
330 |
### Post-processing |
|
331 |
### |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
332 |
|
14111 | 333 |
if test $conf_result_code -eq 0; then |
334 |
if test "x$conf_print_help" = xtrue; then |
|
335 |
cat <<EOT |
|
336 |
||
337 |
Additional (non-autoconf) OpenJDK Options: |
|
338 |
--openjdk-target=TARGET cross-compile with TARGET as target platform |
|
339 |
(i.e. the one you will run the resulting binary on). |
|
340 |
Equivalent to --host=TARGET --target=TARGET |
|
341 |
--build=<current platform> |
|
342 |
--debug-configure Run the configure script with additional debug |
|
343 |
logging enabled. |
|
344 |
||
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
345 |
EOT |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
346 |
|
37402 | 347 |
# Print additional help, e.g. a list of toolchains and JVM features. |
35747 | 348 |
# This must be done by the autoconf script. |
48743
ba52fa7bbf14
8195689: Remove generated-configure.sh and instead use autoconf
ihse
parents:
47871
diff
changeset
|
349 |
( CONFIGURE_PRINT_ADDITIONAL_HELP=true . $generated_script PRINTF=printf ) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
350 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
351 |
cat <<EOT |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22716
diff
changeset
|
352 |
|
14111 | 353 |
Please be aware that, when cross-compiling, the OpenJDK configure script will |
354 |
generally use 'target' where autoconf traditionally uses 'host'. |
|
22475 | 355 |
|
356 |
Also note that variables must be passed on the command line. Variables in the |
|
357 |
environment will generally be ignored, unlike traditional autoconf scripts. |
|
14111 | 358 |
EOT |
359 |
fi |
|
360 |
else |
|
361 |
echo configure exiting with result code $conf_result_code |
|
362 |
fi |
|
363 |
||
13697 | 364 |
exit $conf_result_code |