8023957: Lock down version of autoconf
Reviewed-by: chegar, dsamersoff, tbell, dholmes
This commit is contained in:
parent
2c67e57840
commit
7b50e2e59c
@ -1210,19 +1210,18 @@
|
|||||||
<blockquote>
|
<blockquote>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<b>Q:</b> The <code>configure</code> file looks horrible!
|
<b>Q:</b> The <code>generated-configure.sh</code> file looks horrible!
|
||||||
How are you going to edit it?
|
How are you going to edit it?
|
||||||
<br>
|
<br>
|
||||||
<b>A:</b> The <code>configure</code> file is generated (think
|
<b>A:</b> The <code>generated-configure.sh</code> file is generated (think
|
||||||
"compiled") by the autoconf tools. The source code is
|
"compiled") by the autoconf tools. The source code is
|
||||||
in <code>configure.ac</code> various .m4 files in common/autoconf,
|
in <code>configure.ac</code> and various .m4 files in common/autoconf,
|
||||||
which are
|
which are much more readable.
|
||||||
much more readable.
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<b>Q:</b>
|
<b>Q:</b>
|
||||||
Why is the <code>configure</code> file checked in,
|
Why is the <code>generated-configure.sh</code> file checked in,
|
||||||
if it is generated?
|
if it is generated?
|
||||||
<br>
|
<br>
|
||||||
<b>A:</b>
|
<b>A:</b>
|
||||||
@ -1237,13 +1236,29 @@
|
|||||||
<p>
|
<p>
|
||||||
<b>Q:</b>
|
<b>Q:</b>
|
||||||
Do you require a specific version of autoconf for regenerating
|
Do you require a specific version of autoconf for regenerating
|
||||||
<code>configure</code>?
|
<code>generated-configure.sh</code>?
|
||||||
<br>
|
<br>
|
||||||
<b>A:</b>
|
<b>A:</b>
|
||||||
Currently, no, but this will likely be the case when things have
|
Yes, version 2.69 is required and should be easy
|
||||||
settled down a bit more. (The reason for this is to avoid
|
enough to aquire on all supported operating
|
||||||
large spurious changes in <code>configure</code>
|
systems. The reason for this is to avoid
|
||||||
in commits that made small changes to <code>configure.ac</code>).
|
large spurious changes in <code>generated-configure.sh</code>.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<b>Q:</b>
|
||||||
|
How do you regenerate <code>generated-configure.sh</code>
|
||||||
|
after making changes to the input files?
|
||||||
|
<br>
|
||||||
|
<b>A:</b>
|
||||||
|
Regnerating <code>generated-configure.sh</code>
|
||||||
|
should always be done using the
|
||||||
|
script <code>common/autoconf/autogen.sh</code> to
|
||||||
|
ensure that the correct files get updated. This
|
||||||
|
script should also be run after mercurial tries to
|
||||||
|
merge <code>generated-configure.sh</code> as a
|
||||||
|
merge of the generated file is not guaranteed to
|
||||||
|
be correct.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
@ -44,10 +44,8 @@ fi
|
|||||||
custom_hook=$custom_script_dir/custom-hook.m4
|
custom_hook=$custom_script_dir/custom-hook.m4
|
||||||
|
|
||||||
AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`"
|
AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`"
|
||||||
AUTOCONF_267="`which autoconf-2.67 2> /dev/null | grep -v '^no autoconf-2.67 in'`"
|
|
||||||
|
|
||||||
echo "Autoconf found: ${AUTOCONF}"
|
echo "Autoconf found: ${AUTOCONF}"
|
||||||
echo "Autoconf-2.67 found: ${AUTOCONF_267}"
|
|
||||||
|
|
||||||
if test "x${AUTOCONF}" = x; then
|
if test "x${AUTOCONF}" = x; then
|
||||||
echo You need autoconf installed to be able to regenerate the configure script
|
echo You need autoconf installed to be able to regenerate the configure script
|
||||||
@ -55,10 +53,6 @@ if test "x${AUTOCONF}" = x; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x${AUTOCONF_267}" != x; then
|
|
||||||
AUTOCONF=${AUTOCONF_267};
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo Generating generated-configure.sh with ${AUTOCONF}
|
echo Generating generated-configure.sh with ${AUTOCONF}
|
||||||
cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh
|
cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh
|
||||||
rm -rf autom4te.cache
|
rm -rf autom4te.cache
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
|
||||||
AC_PREREQ([2.61])
|
AC_PREREQ([2.69])
|
||||||
AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net)
|
AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net)
|
||||||
|
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
|
@ -3818,7 +3818,7 @@ fi
|
|||||||
#CUSTOM_AUTOCONF_INCLUDE
|
#CUSTOM_AUTOCONF_INCLUDE
|
||||||
|
|
||||||
# Do not change or remove the following line, it is needed for consistency checks:
|
# Do not change or remove the following line, it is needed for consistency checks:
|
||||||
DATE_WHEN_GENERATED=1377784024
|
DATE_WHEN_GENERATED=1377850299
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user