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