make/autoconf/configure
author ihse
Tue, 21 Nov 2017 09:56:35 +0100
changeset 47871 5ab3961d20dd
parent 47346 ea082b202a23
child 48743 ba52fa7bbf14
permissions -rw-r--r--
8191204: Post-consolidation cleaning up of the build system Reviewed-by: tbell, dholmes
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
     1
#!/bin/bash
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
     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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
     4
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
     5
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
     6
# This code is free software; you can redistribute it and/or modify it
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
     7
# under the terms of the GNU General Public License version 2 only, as
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
     8
# published by the Free Software Foundation.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
     9
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    10
# This code is distributed in the hope that it will be useful, but WITHOUT
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    11
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    12
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    13
# version 2 for more details (a copy is included in the LICENSE file that
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    14
# accompanied this code).
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    15
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    16
# You should have received a copy of the GNU General Public License version
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    17
# 2 along with this work; if not, write to the Free Software Foundation,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    18
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    19
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    20
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    21
# or visit www.oracle.com if you need additional information or have any
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    22
# questions.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    23
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    24
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
    25
if test "x$1" != xCHECKME; then
47346
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47313
diff changeset
    26
  echo "ERROR: Calling this wrapper script directly is not supported."
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
    27
  echo "Use the 'configure' script in the top-level directory instead."
47346
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47313
diff changeset
    28
  exit 1
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    29
fi
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
47346
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47313
diff changeset
    31
# The next argument is the absolute top-level directory path.
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47313
diff changeset
    32
# The TOPDIR variable is passed on to configure.ac.
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47313
diff changeset
    33
TOPDIR="$2"
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47313
diff changeset
    34
# Remove these two arguments to get to the user supplied arguments
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47313
diff changeset
    35
shift
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47313
diff changeset
    36
shift
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47313
diff changeset
    37
28358
4be84366834a 8069057: Make sure configure is run by bash
ihse
parents: 24655
diff changeset
    38
if test "x$BASH" = x; then
4be84366834a 8069057: Make sure configure is run by bash
ihse
parents: 24655
diff changeset
    39
  echo "Error: This script must be run using bash." 1>&2
4be84366834a 8069057: Make sure configure is run by bash
ihse
parents: 24655
diff changeset
    40
  exit 1
4be84366834a 8069057: Make sure configure is run by bash
ihse
parents: 24655
diff changeset
    41
fi
28813
827e40c396a6 8072732: Regression in configure due to JDK-8069057
ihse
parents: 28358
diff changeset
    42
# Force autoconf to use bash. This also means we must disable autoconf re-exec.
28358
4be84366834a 8069057: Make sure configure is run by bash
ihse
parents: 24655
diff changeset
    43
export CONFIG_SHELL=$BASH
28813
827e40c396a6 8072732: Regression in configure due to JDK-8069057
ihse
parents: 28358
diff changeset
    44
export _as_can_reexec=no
28358
4be84366834a 8069057: Make sure configure is run by bash
ihse
parents: 24655
diff changeset
    45
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    46
conf_script_dir="$TOPDIR/make/autoconf"
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    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
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    54
fi
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    55
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    56
###
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    57
### Test that the generated configure is up-to-date
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    58
###
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    59
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    62
    echo "Cannot locate autoconf, unable to correct situation."
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    63
    echo "Please install autoconf and run 'bash autogen.sh' to update the generated files."
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    64
    echo "Error: Cannot continue" 1>&2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    65
    exit 1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    66
  else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    67
    echo "Running autogen.sh to correct the situation"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    68
    bash $conf_script_dir/autogen.sh
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    72
check_autoconf_timestamps() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    73
  for file in $conf_script_dir/configure.ac $conf_script_dir/*.m4 ; do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    74
    if test $file -nt $conf_script_dir/generated-configure.sh; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    75
      echo "Warning: The configure source files is newer than the generated files."
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    84
        echo "Warning: The configure source files is newer than the custom generated files."
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    85
        run_autogen_or_fail
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    86
      fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    87
    done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    88
  fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    89
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    90
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    94
    if test "x$conf_updated_autoconf_files" != x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    95
      echo "Configure source code has been updated, checking time stamps"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   100
      if test "x$conf_custom_updated_autoconf_files" != x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   101
        echo "Configure custom source code has been updated, checking time stamps"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   102
        check_autoconf_timestamps
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   103
      fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   104
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   105
  fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   106
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   107
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   108
# Check for local changes
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   109
check_hg_updates
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   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
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   112
  # Test if open configure is newer than custom configure, if so, custom needs to
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   113
  # be regenerated. This test is required to ensure consistency with custom source.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   116
  if test $conf_open_configure_timestamp -gt $conf_custom_configure_timestamp; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   117
    echo "Warning: The generated configure file contains changes not present in the custom generated file."
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   122
# Autoconf calls the configure script recursively sometimes.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   123
# Don't start logging twice in that case
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   124
if test "x$conf_debug_configure" = xtrue; then
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   125
  conf_debug_configure=recursive
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   126
fi
22716
cf32fe2eb254 8034199: Add 'reconfigure' target for re-creating a configuration
ihse
parents: 22714
diff changeset
   127
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   128
###
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   129
### Process command-line arguments
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   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
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   156
conf_openjdk_target=
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   157
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   158
for conf_option
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   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
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   162
  case $conf_option in
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   163
    --openjdk-target=*)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   164
      conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'`
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 20363
diff changeset
   165
      ;;
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   166
    --debug-configure)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   167
      if test "x$conf_debug_configure" != xrecursive; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   168
        conf_debug_configure=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   169
        export conf_debug_configure
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   170
      fi
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 20363
diff changeset
   171
      ;;
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   172
    *)
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 20363
diff changeset
   173
      conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option")
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 20363
diff changeset
   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
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   201
  case $conf_option in
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   202
    -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   203
      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   204
    -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   205
      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   206
    -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   207
      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   208
    -help | --help | --hel | --he | -h)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   209
      conf_print_help=true ;;
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   216
if test "x$conf_legacy_crosscompile" != "x"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   217
  if test "x$conf_openjdk_target" != "x"; then
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   218
    echo "Error: Specifying --openjdk-target together with autoconf"
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   219
    echo "legacy cross-compilation flags is not supported."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   220
    echo "You specified: --openjdk-target=$conf_openjdk_target and $conf_legacy_crosscompile."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   221
    echo "The recommended use is just --openjdk-target."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   222
    exit 1
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   223
  else
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   224
    echo "Warning: You are using legacy autoconf cross-compilation flags."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   225
    echo "It is recommended that you use --openjdk-target instead."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   230
if test "x$conf_openjdk_target" != "x"; then
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   231
  conf_build_platform=`sh $conf_script_dir/build-aux/config.guess`
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   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
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   235
# Make configure exit with error on invalid options as default.
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   236
# Can be overridden by --disable-option-checking, since we prepend our argument
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   237
# and later options override earlier.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   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
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   240
###
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   241
### Call the configure script
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   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
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   244
  # Custom source configure available; run that instead
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   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
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   248
  echo "Running generated-configure.sh"
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   249
  conf_script_to_run=$conf_script_dir/generated-configure.sh
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19759
diff changeset
   250
fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   251
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   252
if test "x$conf_debug_configure" != x; then
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   253
  # Turn on shell debug output if requested (initial or recursive)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   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
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 30417
diff changeset
   259
RCDIR=`mktemp -dt jdk-build-configure.tmp.XXXXXX` || exit $?
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 30417
diff changeset
   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
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 30417
diff changeset
   262
(exec 3>&1 ; ((. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) \
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 30417
diff changeset
   263
    ; echo $? > "$RCDIR/rc" ) \
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 30417
diff changeset
   264
    | tee -a $conf_logfile 1>&2 ; exec 3>&-) | tee -a $conf_logfile
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   265
34491
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 30417
diff changeset
   266
conf_result_code=`cat "$RCDIR/rc"`
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   267
###
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   268
### Post-processing
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   269
###
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   270
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   271
if test $conf_result_code -eq 0; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   272
  if test "x$conf_print_help" = xtrue; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   273
    cat <<EOT
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   274
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   275
Additional (non-autoconf) OpenJDK Options:
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   276
  --openjdk-target=TARGET cross-compile with TARGET as target platform
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   277
                          (i.e. the one you will run the resulting binary on).
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   278
                          Equivalent to --host=TARGET --target=TARGET
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   279
                          --build=<current platform>
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   280
  --debug-configure       Run the configure script with additional debug
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   281
                          logging enabled.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   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
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   285
    # Print additional help, e.g. a list of toolchains and JVM features.
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 34491
diff changeset
   286
    # This must be done by the autoconf script.
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 34491
diff changeset
   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
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   291
Please be aware that, when cross-compiling, the OpenJDK configure script will
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   292
generally use 'target' where autoconf traditionally uses 'host'.
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 20363
diff changeset
   293
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 20363
diff changeset
   294
Also note that variables must be passed on the command line. Variables in the
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 20363
diff changeset
   295
environment will generally be ignored, unlike traditional autoconf scripts.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   296
EOT
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   297
  fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   298
else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   299
  echo configure exiting with result code $conf_result_code
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   300
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   301
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   302
exit $conf_result_code