make/autoconf/basics.m4
author stuefe
Fri, 20 Oct 2017 13:10:35 +0200
changeset 47397 7236260e166c
parent 47346 ea082b202a23
child 47456 9c1e4b0a4761
permissions -rw-r--r--
8189619: [aix] OpenJDK local disk check not working on AIX Reviewed-by: erikj Contributed-by: sxa@uk.ibm.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     1
#
43046
717ce6d4eaa1 8171409: Create a smoother configure experience on macosx
ihse
parents: 42136
diff changeset
     2
# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     4
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    10
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    15
# accompanied this code).
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    16
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    20
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    23
# questions.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    24
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    25
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    26
# Create a function/macro that takes a series of named arguments. The call is
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    27
# similar to AC_DEFUN, but the setup of the function looks like this:
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    28
# BASIC_DEFUN_NAMED([MYFUNC], [FOO *BAR], [$@], [
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    29
# ... do something
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    30
#   AC_MSG_NOTICE([Value of BAR is ARG_BAR])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    31
# ])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    32
# A star (*) in front of a named argument means that it is required and it's
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    33
# presence will be verified. To pass e.g. the first value as a normal indexed
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    34
# argument, use [m4_shift($@)] as the third argument instead of [$@]. These
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    35
# arguments are referenced in the function by their name prefixed by ARG_, e.g.
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    36
# "ARG_FOO".
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    37
#
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    38
# The generated function can be called like this:
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35444
diff changeset
    39
# MYFUNC(FOO: [foo-val],
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35444
diff changeset
    40
#     BAR: [
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    41
#         $ECHO hello world
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    42
#     ])
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35444
diff changeset
    43
# Note that the argument value must start on the same line as the argument name.
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    44
#
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    45
# Argument 1: Name of the function to define
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    46
# Argument 2: List of legal named arguments, with a * prefix for required arguments
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    47
# Argument 3: Argument array to treat as named, typically $@
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    48
# Argument 4: The main function body
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    49
AC_DEFUN([BASIC_DEFUN_NAMED],
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    50
[
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    51
  AC_DEFUN($1, [
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    52
    m4_foreach(arg, m4_split($2), [
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    53
      m4_if(m4_bregexp(arg, [^\*]), -1,
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    54
        [
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    55
          m4_set_add(legal_named_args, arg)
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    56
        ],
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    57
        [
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    58
          m4_set_add(legal_named_args, m4_substr(arg, 1))
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    59
          m4_set_add(required_named_args, m4_substr(arg, 1))
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    60
        ]
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    61
      )
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    62
    ])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    63
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    64
    m4_foreach([arg], [$3], [
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    65
      m4_define(arg_name, m4_substr(arg, 0, m4_bregexp(arg, [: ])))
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    66
      m4_set_contains(legal_named_args, arg_name, [],[AC_MSG_ERROR([Internal error: arg_name is not a valid named argument to [$1]. Valid arguments are 'm4_set_contents(legal_named_args, [ ])'.])])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    67
      m4_set_remove(required_named_args, arg_name)
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    68
      m4_set_remove(legal_named_args, arg_name)
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    69
      m4_pushdef([ARG_][]arg_name, m4_substr(arg, m4_incr(m4_incr(m4_bregexp(arg, [: ])))))
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    70
      m4_set_add(defined_args, arg_name)
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    71
      m4_undefine([arg_name])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    72
    ])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    73
    m4_set_empty(required_named_args, [], [
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    74
      AC_MSG_ERROR([Internal error: Required named arguments are missing for [$1]. Missing arguments: 'm4_set_contents(required_named_args, [ ])'])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    75
    ])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    76
    m4_foreach([arg], m4_indir([m4_dquote]m4_set_listc([legal_named_args])), [
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    77
      m4_pushdef([ARG_][]arg, [])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    78
      m4_set_add(defined_args, arg)
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    79
    ])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    80
    m4_set_delete(legal_named_args)
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    81
    m4_set_delete(required_named_args)
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    82
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    83
    # Execute function body
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    84
    $4
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    85
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    86
    m4_foreach([arg], m4_indir([m4_dquote]m4_set_listc([defined_args])), [
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    87
      m4_popdef([ARG_][]arg)
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    88
    ])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    89
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    90
    m4_set_delete(defined_args)
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    91
  ])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    92
])
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34493
diff changeset
    93
17592
06b7538d17ef 8014514: Fix jvm args for sjavac
erikj
parents: 16580
diff changeset
    94
# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    95
# If so, then append $1 to $2 \
17592
06b7538d17ef 8014514: Fix jvm args for sjavac
erikj
parents: 16580
diff changeset
    96
# Also set JVM_ARG_OK to true/false depending on outcome.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    97
AC_DEFUN([ADD_JVM_ARG_IF_OK],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    98
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    99
  $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   100
  $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   101
  OUTPUT=`$3 $1 -version 2>&1`
38843
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
   102
  FOUND_WARN=`$ECHO "$OUTPUT" | $GREP -i warn`
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
   103
  FOUND_VERSION=`$ECHO $OUTPUT | $GREP " version \""`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   104
  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   105
    $2="[$]$2 $1"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   106
    JVM_ARG_OK=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   107
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   108
    $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   109
    $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   110
    JVM_ARG_OK=false
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   111
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   112
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   113
18421
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
   114
# Appends a string to a path variable, only adding the : when needed.
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
   115
AC_DEFUN([BASIC_APPEND_TO_PATH],
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
   116
[
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   117
  if test "x$2" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   118
    if test "x[$]$1" = x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   119
      $1="$2"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   120
    else
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   121
      $1="[$]$1:$2"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   122
    fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   123
  fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   124
])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   125
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   126
# Prepends a string to a path variable, only adding the : when needed.
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   127
AC_DEFUN([BASIC_PREPEND_TO_PATH],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   128
[
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   129
  if test "x$2" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   130
    if test "x[$]$1" = x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   131
      $1="$2"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   132
    else
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   133
      $1="$2:[$]$1"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   134
    fi
18421
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
   135
  fi
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
   136
])
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
   137
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   138
# This will make sure the given variable points to a full and proper
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   139
# path. This means:
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 27329
diff changeset
   140
# 1) There will be no spaces in the path. On unix platforms,
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   141
#    spaces in the path will result in an error. On Windows,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   142
#    the path will be rewritten using short-style to be space-free.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   143
# 2) The path will be absolute, and it will be in unix-style (on
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   144
#     cygwin).
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   145
# $1: The name of the variable to fix
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   146
AC_DEFUN([BASIC_FIXUP_PATH],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   147
[
29064
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   148
  # Only process if variable expands to non-empty
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29064
diff changeset
   149
29064
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   150
  if test "x[$]$1" != x; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   151
    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   152
      BASIC_FIXUP_PATH_CYGWIN($1)
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   153
    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   154
      BASIC_FIXUP_PATH_MSYS($1)
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   155
    else
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   156
      # We're on a unix platform. Hooray! :)
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   157
      path="[$]$1"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   158
      has_space=`$ECHO "$path" | $GREP " "`
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   159
      if test "x$has_space" != x; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   160
        AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   161
        AC_MSG_ERROR([Spaces are not allowed in this path.])
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   162
      fi
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   163
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   164
      # Use eval to expand a potential ~
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   165
      eval path="$path"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   166
      if test ! -f "$path" && test ! -d "$path"; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   167
        AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   168
      fi
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   169
34491
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
   170
      if test -d "$path"; then
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
   171
        $1="`cd "$path"; $THEPWDCMD -L`"
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
   172
      else
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
   173
        dir="`$DIRNAME "$path"`"
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
   174
        base="`$BASENAME "$path"`"
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
   175
        $1="`cd "$dir"; $THEPWDCMD -L`/$base"
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
   176
      fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   177
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   178
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   179
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   180
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   181
# This will make sure the given variable points to a executable
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   182
# with a full and proper path. This means:
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 27329
diff changeset
   183
# 1) There will be no spaces in the path. On unix platforms,
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   184
#    spaces in the path will result in an error. On Windows,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   185
#    the path will be rewritten using short-style to be space-free.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   186
# 2) The path will be absolute, and it will be in unix-style (on
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   187
#     cygwin).
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   188
# Any arguments given to the executable is preserved.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   189
# If the input variable does not have a directory specification, then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   190
# it need to be in the PATH.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   191
# $1: The name of the variable to fix
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   192
AC_DEFUN([BASIC_FIXUP_EXECUTABLE],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   193
[
29064
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   194
  # Only process if variable expands to non-empty
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29064
diff changeset
   195
29064
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   196
  if test "x[$]$1" != x; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   197
    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   198
      BASIC_FIXUP_EXECUTABLE_CYGWIN($1)
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   199
    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   200
      BASIC_FIXUP_EXECUTABLE_MSYS($1)
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   201
    else
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   202
      # We're on a unix platform. Hooray! :)
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   203
      # First separate the path from the arguments. This will split at the first
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   204
      # space.
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   205
      complete="[$]$1"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   206
      path="${complete%% *}"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   207
      tmp="$complete EOL"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   208
      arguments="${tmp#* }"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   209
29064
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   210
      # Cannot rely on the command "which" here since it doesn't always work.
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   211
      is_absolute_path=`$ECHO "$path" | $GREP ^/`
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   212
      if test -z "$is_absolute_path"; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   213
        # Path to executable is not absolute. Find it.
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   214
        IFS_save="$IFS"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   215
        IFS=:
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   216
        for p in $PATH; do
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   217
          if test -f "$p/$path" && test -x "$p/$path"; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   218
            new_path="$p/$path"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   219
            break
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   220
          fi
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   221
        done
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   222
        IFS="$IFS_save"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   223
      else
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   224
        # This is an absolute path, we can use it without further modifications.
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   225
        new_path="$path"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   226
      fi
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   227
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   228
      if test "x$new_path" = x; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   229
        AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   230
        has_space=`$ECHO "$complete" | $GREP " "`
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   231
        if test "x$has_space" != x; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   232
          AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
14736
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   233
        fi
29064
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   234
        AC_MSG_ERROR([Cannot locate the the path of $1])
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   235
      fi
14736
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   236
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   237
29064
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   238
    # Now join together the path and the arguments once again
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   239
    if test "x$arguments" != xEOL; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   240
      new_complete="$new_path ${arguments% *}"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   241
    else
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   242
      new_complete="$new_path"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   243
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   244
29064
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   245
    if test "x$complete" != "x$new_complete"; then
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   246
      $1="$new_complete"
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   247
      AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
d5e775680e97 8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents: 28908
diff changeset
   248
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   249
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   250
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   251
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   252
AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   253
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   254
  if test "x$OPENJDK_BUILD_OS" != xwindows; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   255
    # Follow a chain of symbolic links. Use readlink
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   256
    # where it exists, else fall back to horribly
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   257
    # complicated shell code.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   258
    if test "x$READLINK_TESTED" != yes; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   259
      # On MacOSX there is a readlink tool with a different
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   260
      # purpose than the GNU readlink tool. Check the found readlink.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   261
      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   262
      if test "x$ISGNU" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   263
        # A readlink that we do not know how to use.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   264
        # Are there other non-GNU readlinks out there?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   265
        READLINK_TESTED=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   266
        READLINK=
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   267
      fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   268
    fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   269
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   270
    if test "x$READLINK" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   271
      $1=`$READLINK -f [$]$1`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   272
    else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   273
      # Save the current directory for restoring afterwards
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   274
      STARTDIR=$PWD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   275
      COUNTER=0
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   276
      sym_link_dir=`$DIRNAME [$]$1`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   277
      sym_link_file=`$BASENAME [$]$1`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   278
      cd $sym_link_dir
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   279
      # Use -P flag to resolve symlinks in directories.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   280
      cd `$THEPWDCMD -P`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   281
      sym_link_dir=`$THEPWDCMD -P`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   282
      # Resolve file symlinks
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   283
      while test $COUNTER -lt 20; do
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   284
        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   285
        if test "x$ISLINK" == x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   286
          # This is not a symbolic link! We are done!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   287
          break
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   288
        fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   289
        # Again resolve directory symlinks since the target of the just found
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   290
        # link could be in a different directory
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   291
        cd `$DIRNAME $ISLINK`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   292
        sym_link_dir=`$THEPWDCMD -P`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   293
        sym_link_file=`$BASENAME $ISLINK`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   294
        let COUNTER=COUNTER+1
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   295
      done
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   296
      cd $STARTDIR
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   297
      $1=$sym_link_dir/$sym_link_file
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   298
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   299
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   300
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   301
19763
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   302
# Register a --with argument but mark it as deprecated
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   303
# $1: The name of the with argument to deprecate, not including --with-
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   304
AC_DEFUN([BASIC_DEPRECATED_ARG_WITH],
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   305
[
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   306
  AC_ARG_WITH($1, [AS_HELP_STRING([--with-$1],
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   307
      [Deprecated. Option is kept for backwards compatibility and is ignored])],
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   308
      [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   309
])
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   310
20649
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   311
# Register a --enable argument but mark it as deprecated
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   312
# $1: The name of the with argument to deprecate, not including --enable-
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   313
# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
34493
c68e0ab807d8 8036003: Add --with-debug-symbols=[none|internal|external|zipped]
ysuenaga
parents: 34491
diff changeset
   314
# $3: Messages to user.
20649
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   315
AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   316
[
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   317
  AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   318
      [Deprecated. Option is kept for backwards compatibility and is ignored])])
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   319
  if test "x$enable_$2" != x; then
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   320
    AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
34493
c68e0ab807d8 8036003: Add --with-debug-symbols=[none|internal|external|zipped]
ysuenaga
parents: 34491
diff changeset
   321
c68e0ab807d8 8036003: Add --with-debug-symbols=[none|internal|external|zipped]
ysuenaga
parents: 34491
diff changeset
   322
    if test "x$3" != x; then
c68e0ab807d8 8036003: Add --with-debug-symbols=[none|internal|external|zipped]
ysuenaga
parents: 34491
diff changeset
   323
      AC_MSG_WARN([$3])
c68e0ab807d8 8036003: Add --with-debug-symbols=[none|internal|external|zipped]
ysuenaga
parents: 34491
diff changeset
   324
    fi
c68e0ab807d8 8036003: Add --with-debug-symbols=[none|internal|external|zipped]
ysuenaga
parents: 34491
diff changeset
   325
20649
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   326
  fi
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   327
])
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   328
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   329
AC_DEFUN_ONCE([BASIC_INIT],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   330
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   331
  # Save the original command line. This is passed to us by the wrapper configure script.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   332
  AC_SUBST(CONFIGURE_COMMAND_LINE)
28809
6481e27e00ee 8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents: 28602
diff changeset
   333
  # Save the path variable before it gets changed
6481e27e00ee 8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents: 28602
diff changeset
   334
  ORIGINAL_PATH="$PATH"
6481e27e00ee 8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents: 28602
diff changeset
   335
  AC_SUBST(ORIGINAL_PATH)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   336
  DATE_WHEN_CONFIGURED=`LANG=C date`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   337
  AC_SUBST(DATE_WHEN_CONFIGURED)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   338
  AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   339
  AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   340
])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   341
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   342
# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   343
# $1: variable to check
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   344
AC_DEFUN([BASIC_CHECK_NONEMPTY],
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   345
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   346
  if test "x[$]$1" = x; then
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   347
    AC_MSG_ERROR([Could not find required tool for $1])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   348
  fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   349
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   350
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   351
# Check that there are no unprocessed overridden variables left.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   352
# If so, they are an incorrect argument and we will exit with an error.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   353
AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   354
[
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   355
  if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   356
    # Replace the separating ! with spaces before presenting for end user.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   357
    unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ }
22478
5ca2b792a5fd 8033292: only warn, not fail, on unknown variables in configure
ihse
parents: 22475
diff changeset
   358
    AC_MSG_WARN([The following variables might be unknown to configure: $unknown_variables])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   359
  fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   360
])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   361
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27586
diff changeset
   362
# Setup a tool for the given variable. If correctly specified by the user,
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   363
# use that value, otherwise search for the tool using the supplied code snippet.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   364
# $1: variable to set
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   365
# $2: code snippet to call to look for the tool
33396
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   366
# $3: code snippet to call if variable was used to find tool
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   367
AC_DEFUN([BASIC_SETUP_TOOL],
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   368
[
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   369
  # Publish this variable in the help.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   370
  AC_ARG_VAR($1, [Override default value for $1])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   371
32920
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   372
  if [[ -z "${$1+x}" ]]; then
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   373
    # The variable is not set by user, try to locate tool using the code snippet
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   374
    $2
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   375
  else
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   376
    # The variable is set, but is it from the command line or the environment?
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   377
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   378
    # Try to remove the string !$1! from our list.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   379
    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!$1!/}
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   380
    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   381
      # If it failed, the variable was not from the command line. Ignore it,
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   382
      # but warn the user (except for BASH, which is always set by the calling BASH).
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   383
      if test "x$1" != xBASH; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   384
        AC_MSG_WARN([Ignoring value of $1 from the environment. Use command line variables instead.])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   385
      fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   386
      # Try to locate tool using the code snippet
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   387
      $2
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   388
    else
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   389
      # If it succeeded, then it was overridden by the user. We will use it
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   390
      # for the tool.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   391
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   392
      # First remove it from the list of overridden variables, so we can test
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   393
      # for unknown variables in the end.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   394
      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   395
32920
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   396
      # Check if we try to supply an empty value
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   397
      if test "x[$]$1" = x; then
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   398
        AC_MSG_NOTICE([Setting user supplied tool $1= (no value)])
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   399
        AC_MSG_CHECKING([for $1])
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   400
        AC_MSG_RESULT([disabled])
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   401
      else
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   402
        # Check if the provided tool contains a complete path.
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   403
        tool_specified="[$]$1"
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   404
        tool_basename="${tool_specified##*/}"
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   405
        if test "x$tool_basename" = "x$tool_specified"; then
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   406
          # A command without a complete path is provided, search $PATH.
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   407
          AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename])
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   408
          AC_PATH_PROG($1, $tool_basename)
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   409
          if test "x[$]$1" = x; then
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   410
            AC_MSG_ERROR([User supplied tool $tool_basename could not be found])
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   411
          fi
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   412
        else
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   413
          # Otherwise we believe it is a complete path. Use it as it is.
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   414
          AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified])
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   415
          AC_MSG_CHECKING([for $1])
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   416
          if test ! -x "$tool_specified"; then
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   417
            AC_MSG_RESULT([not found])
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   418
            AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable])
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   419
          fi
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   420
          AC_MSG_RESULT([$tool_specified])
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   421
        fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   422
      fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   423
    fi
33396
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   424
    $3
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   425
  fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   426
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   427
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   428
# Call BASIC_SETUP_TOOL with AC_PATH_PROGS to locate the tool
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   429
# $1: variable to set
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   430
# $2: executable name (or list of names) to look for
41462
a4f7ec34a58f 8166937: [Solaris] Missing libjvm_db.so and libjvm_dtrace.so from JDK 9 b138
erikj
parents: 41040
diff changeset
   431
# $3: [path]
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   432
AC_DEFUN([BASIC_PATH_PROGS],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   433
[
41462
a4f7ec34a58f 8166937: [Solaris] Missing libjvm_db.so and libjvm_dtrace.so from JDK 9 b138
erikj
parents: 41040
diff changeset
   434
  BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)])
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   435
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   436
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   437
# Call BASIC_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   438
# $1: variable to set
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   439
# $2: executable name (or list of names) to look for
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   440
AC_DEFUN([BASIC_CHECK_TOOLS],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   441
[
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   442
  BASIC_SETUP_TOOL($1, [AC_CHECK_TOOLS($1, $2)])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   443
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   444
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   445
# Like BASIC_PATH_PROGS but fails if no tool was found.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   446
# $1: variable to set
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   447
# $2: executable name (or list of names) to look for
41462
a4f7ec34a58f 8166937: [Solaris] Missing libjvm_db.so and libjvm_dtrace.so from JDK 9 b138
erikj
parents: 41040
diff changeset
   448
# $3: [path]
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   449
AC_DEFUN([BASIC_REQUIRE_PROGS],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   450
[
41462
a4f7ec34a58f 8166937: [Solaris] Missing libjvm_db.so and libjvm_dtrace.so from JDK 9 b138
erikj
parents: 41040
diff changeset
   451
  BASIC_PATH_PROGS($1, $2, , $3)
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   452
  BASIC_CHECK_NONEMPTY($1)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   453
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   454
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   455
# Like BASIC_SETUP_TOOL but fails if no tool was found.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   456
# $1: variable to set
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   457
# $2: autoconf macro to call to look for the special tool
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   458
AC_DEFUN([BASIC_REQUIRE_SPECIAL],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   459
[
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   460
  BASIC_SETUP_TOOL($1, [$2])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   461
  BASIC_CHECK_NONEMPTY($1)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   462
])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   463
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   464
# Setup the most fundamental tools that relies on not much else to set up,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   465
# but is used by much of the early bootstrap code.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   466
AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   467
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   468
  # Start with tools that do not need have cross compilation support
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   469
  # and can be expected to be found in the default PATH. These tools are
32921
8e0250dfa145 8138761: Improved handling of libffi, and cleanup of libraries.m4
ihse
parents: 32920
diff changeset
   470
  # used by configure.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   471
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   472
  # First are all the simple required tools.
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   473
  BASIC_REQUIRE_PROGS(BASENAME, basename)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   474
  BASIC_REQUIRE_PROGS(BASH, bash)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   475
  BASIC_REQUIRE_PROGS(CAT, cat)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   476
  BASIC_REQUIRE_PROGS(CHMOD, chmod)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   477
  BASIC_REQUIRE_PROGS(CMP, cmp)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   478
  BASIC_REQUIRE_PROGS(COMM, comm)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   479
  BASIC_REQUIRE_PROGS(CP, cp)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   480
  BASIC_REQUIRE_PROGS(CUT, cut)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   481
  BASIC_REQUIRE_PROGS(DATE, date)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   482
  BASIC_REQUIRE_PROGS(DIFF, [gdiff diff])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   483
  BASIC_REQUIRE_PROGS(DIRNAME, dirname)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   484
  BASIC_REQUIRE_PROGS(ECHO, echo)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   485
  BASIC_REQUIRE_PROGS(EXPR, expr)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   486
  BASIC_REQUIRE_PROGS(FILE, file)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   487
  BASIC_REQUIRE_PROGS(FIND, find)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   488
  BASIC_REQUIRE_PROGS(HEAD, head)
37972
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
   489
  BASIC_REQUIRE_PROGS(GUNZIP, gunzip)
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
   490
  BASIC_REQUIRE_PROGS(GZIP, pigz gzip)
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   491
  BASIC_REQUIRE_PROGS(LN, ln)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   492
  BASIC_REQUIRE_PROGS(LS, ls)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   493
  BASIC_REQUIRE_PROGS(MKDIR, mkdir)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   494
  BASIC_REQUIRE_PROGS(MKTEMP, mktemp)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   495
  BASIC_REQUIRE_PROGS(MV, mv)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   496
  BASIC_REQUIRE_PROGS(NAWK, [nawk gawk awk])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   497
  BASIC_REQUIRE_PROGS(PRINTF, printf)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   498
  BASIC_REQUIRE_PROGS(RM, rm)
33052
4da63d511320 8140282: Remove test directories on clean-test-*
ihse
parents: 32921
diff changeset
   499
  BASIC_REQUIRE_PROGS(RMDIR, rmdir)
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   500
  BASIC_REQUIRE_PROGS(SH, sh)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   501
  BASIC_REQUIRE_PROGS(SORT, sort)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   502
  BASIC_REQUIRE_PROGS(TAIL, tail)
37972
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
   503
  BASIC_REQUIRE_PROGS(TAR, gtar tar)
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   504
  BASIC_REQUIRE_PROGS(TEE, tee)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   505
  BASIC_REQUIRE_PROGS(TOUCH, touch)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   506
  BASIC_REQUIRE_PROGS(TR, tr)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   507
  BASIC_REQUIRE_PROGS(UNAME, uname)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   508
  BASIC_REQUIRE_PROGS(UNIQ, uniq)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   509
  BASIC_REQUIRE_PROGS(WC, wc)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   510
  BASIC_REQUIRE_PROGS(WHICH, which)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   511
  BASIC_REQUIRE_PROGS(XARGS, xargs)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   512
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   513
  # Then required tools that require some special treatment.
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   514
  BASIC_REQUIRE_SPECIAL(AWK, [AC_PROG_AWK])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   515
  BASIC_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   516
  BASIC_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   517
  BASIC_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   518
  BASIC_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   519
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   520
  # Always force rm.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   521
  RM="$RM -f"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   522
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   523
  # pwd behaves differently on various platforms and some don't support the -L flag.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   524
  # Always use the bash builtin pwd to get uniform behavior.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   525
  THEPWDCMD=pwd
17662
8cae100e6f14 8014003: New build does not handle symlinks in workspace path
erikj
parents: 17661
diff changeset
   526
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   527
  # These are not required on all platforms
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   528
  BASIC_PATH_PROGS(CYGPATH, cygpath)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   529
  BASIC_PATH_PROGS(READLINK, [greadlink readlink])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   530
  BASIC_PATH_PROGS(DF, df)
25882
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
   531
  BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
32920
5bea8a04f0a5 8138864: Build with nice to lower UI impact
ihse
parents: 32716
diff changeset
   532
  BASIC_PATH_PROGS(NICE, nice)
44078
673240c54c2e 8176509: Use pandoc for converting build readme to html
ihse
parents: 43654
diff changeset
   533
  BASIC_PATH_PROGS(PANDOC, pandoc)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   534
])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   535
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   536
# Setup basic configuration paths, and platform-specific stuff related to PATHs.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   537
AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   538
[
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   539
  # Save the current directory this script was started from
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   540
  CURDIR="$PWD"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   541
32716
d3203fd9e447 8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents: 32715
diff changeset
   542
  # We might need to rewrite ORIGINAL_PATH, if it includes "#", to quote them
d3203fd9e447 8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents: 32715
diff changeset
   543
  # for make. We couldn't do this when we retrieved ORIGINAL_PATH, since SED
d3203fd9e447 8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents: 32715
diff changeset
   544
  # was not available at that time.
d3203fd9e447 8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents: 32715
diff changeset
   545
  REWRITTEN_PATH=`$ECHO "$ORIGINAL_PATH" | $SED -e 's/#/\\\\#/g'`
d3203fd9e447 8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents: 32715
diff changeset
   546
  if test "x$REWRITTEN_PATH" != "x$ORIGINAL_PATH"; then
d3203fd9e447 8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents: 32715
diff changeset
   547
    ORIGINAL_PATH="$REWRITTEN_PATH"
d3203fd9e447 8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents: 32715
diff changeset
   548
    AC_MSG_NOTICE([Rewriting ORIGINAL_PATH to $REWRITTEN_PATH])
d3203fd9e447 8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents: 32715
diff changeset
   549
  fi
d3203fd9e447 8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents: 32715
diff changeset
   550
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   551
  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   552
    PATH_SEP=";"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   553
    BASIC_CHECK_PATHS_WINDOWS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   554
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   555
    PATH_SEP=":"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   556
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   557
  AC_SUBST(PATH_SEP)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   558
22726
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   559
  # We get the top-level directory from the supporting wrappers.
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   560
  AC_MSG_CHECKING([for top-level directory])
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   561
  AC_MSG_RESULT([$TOPDIR])
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   562
  AC_SUBST(TOPDIR)
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   563
29663
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   564
  # Save the original version of TOPDIR for string comparisons
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   565
  ORIGINAL_TOPDIR="$TOPDIR"
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   566
  AC_SUBST(ORIGINAL_TOPDIR)
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   567
22726
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   568
  # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   569
  BASIC_FIXUP_PATH(CURDIR)
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   570
  BASIC_FIXUP_PATH(TOPDIR)
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   571
29663
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   572
  # Calculate a canonical version of TOPDIR for string comparisons
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   573
  CANONICAL_TOPDIR=$TOPDIR
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   574
  BASIC_REMOVE_SYMBOLIC_LINKS([CANONICAL_TOPDIR])
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   575
  AC_SUBST(CANONICAL_TOPDIR)
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   576
22726
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   577
  # Locate the directory of this script.
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   578
  AUTOCONF_DIR=$TOPDIR/make/autoconf
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 34925
diff changeset
   579
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 34925
diff changeset
   580
  # Setup username (for use in adhoc version strings etc)
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 34925
diff changeset
   581
  # Outer [ ] to quote m4.
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 34925
diff changeset
   582
  [ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 34925
diff changeset
   583
  AC_SUBST(USERNAME)
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   584
])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   585
30022
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   586
# Evaluates platform specific overrides for devkit variables.
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   587
# $1: Name of variable
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   588
AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   589
[
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   590
  if test "x[$]$1" = x; then
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   591
    eval $1="\${$1_${OPENJDK_TARGET_CPU}}"
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   592
  fi
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   593
])
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   594
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   595
AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   596
[
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   597
  AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   598
      [use this devkit for compilers, tools and resources])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   599
      [
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   600
        BASIC_FIXUP_PATH([with_devkit])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   601
        DEVKIT_ROOT="$with_devkit"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   602
        # Check for a meta data info file in the root of the devkit
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   603
        if test -f "$DEVKIT_ROOT/devkit.info"; then
30022
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   604
          . $DEVKIT_ROOT/devkit.info
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   605
          # This potentially sets the following:
30022
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   606
          # A descriptive name of the devkit
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   607
          BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_NAME])
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   608
          # Corresponds to --with-extra-path
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   609
          BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_EXTRA_PATH])
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   610
          # Corresponds to --with-toolchain-path
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   611
          BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_TOOLCHAIN_PATH])
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   612
          # Corresponds to --with-sysroot
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   613
          BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_SYSROOT])
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   614
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   615
          # Identifies the Visual Studio version in the devkit
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   616
          BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_VERSION])
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   617
          # The Visual Studio include environment variable
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   618
          BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_INCLUDE])
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   619
          # The Visual Studio lib environment variable
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   620
          BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_LIB])
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   621
          # Corresponds to --with-msvcr-dll
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   622
          BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCR_DLL])
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   623
          # Corresponds to --with-msvcp-dll
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   624
          BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCP_DLL])
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   625
        fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   626
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   627
        AC_MSG_CHECKING([for devkit])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   628
        if test "x$DEVKIT_NAME" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   629
          AC_MSG_RESULT([$DEVKIT_NAME in $DEVKIT_ROOT])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   630
        else
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   631
          AC_MSG_RESULT([$DEVKIT_ROOT])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   632
        fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   633
30022
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   634
        BASIC_PREPEND_TO_PATH([EXTRA_PATH],$DEVKIT_EXTRA_PATH)
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   635
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   636
        # Fallback default of just /bin if DEVKIT_PATH is not defined
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   637
        if test "x$DEVKIT_TOOLCHAIN_PATH" = x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   638
          DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/bin"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   639
        fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   640
        BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$DEVKIT_TOOLCHAIN_PATH)
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   641
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   642
        # If DEVKIT_SYSROOT is set, use that, otherwise try a couple of known
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   643
        # places for backwards compatiblity.
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   644
        if test "x$DEVKIT_SYSROOT" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   645
          SYSROOT="$DEVKIT_SYSROOT"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   646
        elif test -d "$DEVKIT_ROOT/$host_alias/libc"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   647
          SYSROOT="$DEVKIT_ROOT/$host_alias/libc"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   648
        elif test -d "$DEVKIT_ROOT/$host/sys-root"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   649
          SYSROOT="$DEVKIT_ROOT/$host/sys-root"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   650
        fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   651
      ]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   652
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   653
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   654
  # You can force the sysroot if the sysroot encoded into the compiler tools
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   655
  # is not correct.
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   656
  AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   657
      [alias for --with-sysroot for backwards compatability])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   658
      [SYSROOT=$with_sys_root]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   659
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   660
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   661
  AC_ARG_WITH(sysroot, [AS_HELP_STRING([--with-sysroot],
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   662
      [use this directory as sysroot])],
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   663
      [SYSROOT=$with_sysroot]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   664
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   665
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   666
  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   667
      [alias for --with-toolchain-path for backwards compatibility])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   668
      [BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_tools_dir)]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   669
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   670
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   671
  AC_ARG_WITH([toolchain-path], [AS_HELP_STRING([--with-toolchain-path],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   672
      [prepend these directories when searching for toolchain binaries (compilers etc)])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   673
      [BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_toolchain_path)]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   674
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   675
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   676
  AC_ARG_WITH([extra-path], [AS_HELP_STRING([--with-extra-path],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   677
      [prepend these directories to the default path])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   678
      [BASIC_PREPEND_TO_PATH([EXTRA_PATH],$with_extra_path)]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   679
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   680
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   681
  if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
31123
2c85f4a793d1 8087193: Support building with devkits on Macosx
erikj
parents: 30419
diff changeset
   682
    # If a devkit has been supplied, find xcodebuild in the toolchain_path.
2c85f4a793d1 8087193: Support building with devkits on Macosx
erikj
parents: 30419
diff changeset
   683
    # If not, detect if Xcode is installed by running xcodebuild -version
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   684
    # if no Xcode installed, xcodebuild exits with 1
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   685
    # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
31123
2c85f4a793d1 8087193: Support building with devkits on Macosx
erikj
parents: 30419
diff changeset
   686
    if test "x$DEVKIT_ROOT" != x || /usr/bin/xcodebuild -version >/dev/null 2>&1; then
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   687
      # We need to use xcodebuild in the toolchain dir provided by the user, this will
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   688
      # fall back on the stub binary in /usr/bin/xcodebuild
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   689
      AC_PATH_PROG([XCODEBUILD], [xcodebuild], [/usr/bin/xcodebuild], [$TOOLCHAIN_PATH])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   690
    else
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   691
      # this should result in SYSROOT being empty, unless --with-sysroot is provided
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   692
      # when only the command line tools are installed there are no SDKs, so headers
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   693
      # are copied into the system frameworks
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   694
      XCODEBUILD=
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   695
      AC_SUBST(XCODEBUILD)
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   696
    fi
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27586
diff changeset
   697
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   698
    AC_MSG_CHECKING([for sdk name])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   699
    AC_ARG_WITH([sdk-name], [AS_HELP_STRING([--with-sdk-name],
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   700
        [use the platform SDK of the given name. @<:@macosx@:>@])],
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   701
        [SDKNAME=$with_sdk_name]
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   702
    )
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   703
    AC_MSG_RESULT([$SDKNAME])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   704
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   705
    # if toolchain path is specified then don't rely on system headers, they may not compile
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   706
    HAVE_SYSTEM_FRAMEWORK_HEADERS=0
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   707
    test -z "$TOOLCHAIN_PATH" && \
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   708
      HAVE_SYSTEM_FRAMEWORK_HEADERS=`test ! -f /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h; echo $?`
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   709
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   710
    if test -z "$SYSROOT"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   711
      if test -n "$XCODEBUILD"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   712
        # if we don't have system headers, use default SDK name (last resort)
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   713
        if test -z "$SDKNAME" -a $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   714
          SDKNAME=${SDKNAME:-macosx}
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   715
        fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   716
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   717
        if test -n "$SDKNAME"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   718
          # Call xcodebuild to determine SYSROOT
38843
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
   719
          SYSROOT=`"$XCODEBUILD" -sdk $SDKNAME -version | $GREP '^Path: ' | $SED 's/Path: //'`
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   720
        fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   721
      else
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   722
        if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   723
          AC_MSG_ERROR([No xcodebuild tool and no system framework headers found, use --with-sysroot or --with-sdk-name to provide a path to a valid SDK])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   724
        fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   725
      fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   726
    else
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   727
      # warn user if --with-sdk-name was also set
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   728
      if test -n "$with_sdk_name"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   729
        AC_MSG_WARN([Both SYSROOT and --with-sdk-name are set, only SYSROOT will be used])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   730
      fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   731
    fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   732
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   733
    if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0 -a -z "$SYSROOT"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   734
      # If no system framework headers, then SYSROOT must be set, or we won't build
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   735
      AC_MSG_ERROR([Unable to determine SYSROOT and no headers found in /System/Library/Frameworks. Check Xcode configuration, --with-sysroot or --with-sdk-name arguments.])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   736
    fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   737
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   738
    # Perform a basic sanity test
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   739
    if test ! -f "$SYSROOT/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   740
      if test -z "$SYSROOT"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   741
        AC_MSG_ERROR([Unable to find required framework headers, provide a path to an SDK via --with-sysroot or --with-sdk-name and be sure Xcode is installed properly])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   742
      else
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   743
        AC_MSG_ERROR([Invalid SDK or SYSROOT path, dependent framework headers not found])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   744
      fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   745
    fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   746
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   747
    # set SDKROOT too, Xcode tools will pick it up
43383
5e74f3dd4656 8173107: Fix autoconf/spec.gmk mismatches
ihse
parents: 43050
diff changeset
   748
    SDKROOT="$SYSROOT"
5e74f3dd4656 8173107: Fix autoconf/spec.gmk mismatches
ihse
parents: 43050
diff changeset
   749
    AC_SUBST(SDKROOT)
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   750
  fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   751
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   752
  # Prepend the extra path to the global path
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   753
  BASIC_PREPEND_TO_PATH([PATH],$EXTRA_PATH)
22726
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   754
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   755
  AC_MSG_CHECKING([for sysroot])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   756
  AC_MSG_RESULT([$SYSROOT])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   757
  AC_MSG_CHECKING([for toolchain path])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   758
  AC_MSG_RESULT([$TOOLCHAIN_PATH])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   759
  AC_MSG_CHECKING([for extra path])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   760
  AC_MSG_RESULT([$EXTRA_PATH])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   761
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   762
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   763
AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   764
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   765
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   766
  AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   767
      [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   768
      [ CONF_NAME=${with_conf_name} ])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   769
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   770
  # Test from where we are running configure, in or outside of src root.
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   771
  AC_MSG_CHECKING([where to store configuration])
47346
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47253
diff changeset
   772
  if test "x$CURDIR" = "x$TOPDIR" || test "x$CURDIR" = "x$CUSTOM_ROOT" \
47252
fdac20095dff 8187543: Replace SRC_ROOT with TOPDIR
ihse
parents: 47217
diff changeset
   773
      || test "x$CURDIR" = "x$TOPDIR/make/autoconf" \
fdac20095dff 8187543: Replace SRC_ROOT with TOPDIR
ihse
parents: 47217
diff changeset
   774
      || test "x$CURDIR" = "x$TOPDIR/make" ; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   775
    # We are running configure from the src root.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   776
    # Create a default ./build/target-variant-debuglevel output root.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   777
    if test "x${CONF_NAME}" = x; then
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   778
      AC_MSG_RESULT([in default location])
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   779
      CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${JVM_VARIANTS_WITH_AND}-${DEBUG_LEVEL}"
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   780
    else
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   781
      AC_MSG_RESULT([in build directory with custom name])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   782
    fi
47346
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47253
diff changeset
   783
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47253
diff changeset
   784
    if test "x$CUSTOM_ROOT" != x; then
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47253
diff changeset
   785
      OUTPUTDIR="${CUSTOM_ROOT}/build/${CONF_NAME}"
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47253
diff changeset
   786
    else
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47253
diff changeset
   787
      OUTPUTDIR="${TOPDIR}/build/${CONF_NAME}"
ea082b202a23 8189263: Introduce CUSTOM_ROOT
ihse
parents: 47253
diff changeset
   788
    fi
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   789
    $MKDIR -p "$OUTPUTDIR"
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   790
    if test ! -d "$OUTPUTDIR"; then
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   791
      AC_MSG_ERROR([Could not create build directory $OUTPUTDIR])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   792
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   793
  else
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   794
    # We are running configure from outside of the src dir.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   795
    # Then use the current directory as output dir!
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   796
    # If configuration is situated in normal build directory, just use the build
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   797
    # directory name as configuration name, otherwise use the complete path.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   798
    if test "x${CONF_NAME}" = x; then
47252
fdac20095dff 8187543: Replace SRC_ROOT with TOPDIR
ihse
parents: 47217
diff changeset
   799
      CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${TOPDIR}/build/!!"`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   800
    fi
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   801
    OUTPUTDIR="$CURDIR"
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   802
    AC_MSG_RESULT([in current directory])
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   803
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   804
    # WARNING: This might be a bad thing to do. You need to be sure you want to
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   805
    # have a configuration in this directory. Do some sanity checks!
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   806
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   807
    if test ! -e "$OUTPUTDIR/spec.gmk"; then
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   808
      # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   809
      # other files
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   810
      files_present=`$LS $OUTPUTDIR`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   811
      # Configure has already touched config.log and confdefs.h in the current dir when this check
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14112
diff changeset
   812
      # is performed.
30022
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   813
      filtered_files=`$ECHO "$files_present" \
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   814
          | $SED -e 's/config.log//g' \
30419
8fb7370e2d33 8080082: configure fails if you create an empty directory and then run configure from it
ihse
parents: 30417
diff changeset
   815
              -e 's/configure.log//g' \
8fb7370e2d33 8080082: configure fails if you create an empty directory and then run configure from it
ihse
parents: 30417
diff changeset
   816
              -e 's/confdefs.h//g' \
8fb7370e2d33 8080082: configure fails if you create an empty directory and then run configure from it
ihse
parents: 30417
diff changeset
   817
              -e 's/ //g' \
30022
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29865
diff changeset
   818
          | $TR -d '\n'`
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14112
diff changeset
   819
      if test "x$filtered_files" != x; then
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   820
        AC_MSG_NOTICE([Current directory is $CURDIR.])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   821
        AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   822
        AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   823
        AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   824
        AC_MSG_NOTICE([seriously mess up just about everything.])
47252
fdac20095dff 8187543: Replace SRC_ROOT with TOPDIR
ihse
parents: 47217
diff changeset
   825
        AC_MSG_NOTICE([Try 'cd $TOPDIR' and restart configure])
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   826
        AC_MSG_NOTICE([(or create a new empty directory and cd to it).])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   827
        AC_MSG_ERROR([Will not continue creating configuration in $CURDIR])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   828
      fi
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   829
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   830
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   831
  AC_MSG_CHECKING([what configuration name to use])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   832
  AC_MSG_RESULT([$CONF_NAME])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   833
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   834
  BASIC_FIXUP_PATH(OUTPUTDIR)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   835
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   836
  CONFIGURESUPPORT_OUTPUTDIR="$OUTPUTDIR/configure-support"
29848
13db4da8a496 8077563: 9-dev 1-prebuild fail: "configure: error: write failure creating /config.status"
erikj
parents: 29790
diff changeset
   837
  $MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR"
13db4da8a496 8077563: 9-dev 1-prebuild fail: "configure: error: write failure creating /config.status"
erikj
parents: 29790
diff changeset
   838
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   839
  SPEC="$OUTPUTDIR/spec.gmk"
43383
5e74f3dd4656 8173107: Fix autoconf/spec.gmk mismatches
ihse
parents: 43050
diff changeset
   840
  AC_SUBST(SPEC)
5e74f3dd4656 8173107: Fix autoconf/spec.gmk mismatches
ihse
parents: 43050
diff changeset
   841
  AC_SUBST(CONF_NAME)
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   842
  AC_SUBST(OUTPUTDIR)
29790
79641c886929 8073634: Improve clean targets
erikj
parents: 29663
diff changeset
   843
  AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   844
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   845
  # The spec.gmk file contains all variables for the make system.
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   846
  AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   847
  # The bootcycle-spec.gmk file contains support for boot cycle builds.
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   848
  AC_CONFIG_FILES([$OUTPUTDIR/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in])
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35747
diff changeset
   849
  # The buildjdk-spec.gmk file contains support for building a buildjdk when cross compiling.
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   850
  AC_CONFIG_FILES([$OUTPUTDIR/buildjdk-spec.gmk:$AUTOCONF_DIR/buildjdk-spec.gmk.in])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   851
  # The compare.sh is used to compare the build output to other builds.
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   852
  AC_CONFIG_FILES([$OUTPUTDIR/compare.sh:$AUTOCONF_DIR/compare.sh.in])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   853
  # The generated Makefile knows where the spec.gmk is and where the source is.
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   854
  # You can run make from the OUTPUTDIR, or from the top-level Makefile
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   855
  # which will look for generated configurations
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
   856
  AC_CONFIG_FILES([$OUTPUTDIR/Makefile:$AUTOCONF_DIR/Makefile.in])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   857
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   858
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   859
#%%% Simple tools %%%
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   860
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   861
# Check if we have found a usable version of make
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   862
# $1: the path to a potential make binary (or empty)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   863
# $2: the description on how we found this
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   864
AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   865
[
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   866
  MAKE_CANDIDATE="$1"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   867
  DESCRIPTION="$2"
29865
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   868
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   869
  # On Cygwin, we require a newer version of make than on other platforms
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   870
  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   871
    MAKE_VERSION_EXPR="-e 4\."
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   872
    MAKE_REQUIRED_VERSION="4.0"
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   873
   else
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   874
    MAKE_VERSION_EXPR="-e 3\.8[[12]] -e 4\."
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   875
    MAKE_REQUIRED_VERSION="3.81"
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   876
  fi
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   877
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   878
  if test "x$MAKE_CANDIDATE" != x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   879
    AC_MSG_NOTICE([Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   880
    MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   881
    IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   882
    if test "x$IS_GNU_MAKE" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   883
      AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   884
    else
29865
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   885
      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP $MAKE_VERSION_EXPR`
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   886
      if test "x$IS_MODERN_MAKE" = x; then
29865
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   887
        AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version $MAKE_REQUIRED_VERSION or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   888
      else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   889
        if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   890
          if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   891
            MAKE_EXPECTED_ENV='cygwin'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   892
          elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   893
            MAKE_EXPECTED_ENV='msys'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   894
          else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   895
            AC_MSG_ERROR([Unknown Windows environment])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   896
          fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   897
          MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   898
          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   899
        else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   900
          # Not relevant for non-Windows
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   901
          IS_MAKE_CORRECT_ENV=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   902
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   903
        if test "x$IS_MAKE_CORRECT_ENV" = x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   904
          AC_MSG_NOTICE([Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring.])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   905
        else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   906
          FOUND_MAKE=$MAKE_CANDIDATE
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   907
          BASIC_FIXUP_EXECUTABLE(FOUND_MAKE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   908
        fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   909
      fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   910
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   911
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   912
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   913
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   914
AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   915
[
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   916
  # Check if make supports the output sync option and if so, setup using it.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   917
  AC_MSG_CHECKING([if make --output-sync is supported])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   918
  if $MAKE --version -O > /dev/null 2>&1; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   919
    OUTPUT_SYNC_SUPPORTED=true
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   920
    AC_MSG_RESULT([yes])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   921
    AC_MSG_CHECKING([for output-sync value])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   922
    AC_ARG_WITH([output-sync], [AS_HELP_STRING([--with-output-sync],
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   923
      [set make output sync type if supported by make. @<:@recurse@:>@])],
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   924
      [OUTPUT_SYNC=$with_output_sync])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   925
    if test "x$OUTPUT_SYNC" = "x"; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   926
      OUTPUT_SYNC=none
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   927
    fi
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   928
    AC_MSG_RESULT([$OUTPUT_SYNC])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   929
    if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   930
      AC_MSG_ERROR([Make did not the support the value $OUTPUT_SYNC as output sync type.])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   931
    fi
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   932
  else
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   933
    OUTPUT_SYNC_SUPPORTED=false
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   934
    AC_MSG_RESULT([no])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   935
  fi
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   936
  AC_SUBST(OUTPUT_SYNC_SUPPORTED)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   937
  AC_SUBST(OUTPUT_SYNC)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   938
])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   939
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   940
# Goes looking for a usable version of GNU make.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   941
AC_DEFUN([BASIC_CHECK_GNU_MAKE],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   942
[
33396
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   943
  BASIC_SETUP_TOOL([MAKE],
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   944
  [
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   945
    # Try our hardest to locate a correct version of GNU make
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   946
    AC_PATH_PROGS(CHECK_GMAKE, gmake)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   947
    BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   948
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   949
    if test "x$FOUND_MAKE" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   950
      AC_PATH_PROGS(CHECK_MAKE, make)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   951
      BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [make in PATH])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   952
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   953
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   954
    if test "x$FOUND_MAKE" = x; then
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   955
      if test "x$TOOLCHAIN_PATH" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   956
        # We have a toolchain path, check that as well before giving up.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   957
        OLD_PATH=$PATH
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   958
        PATH=$TOOLCHAIN_PATH:$PATH
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   959
        AC_PATH_PROGS(CHECK_TOOLSDIR_GMAKE, gmake)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   960
        BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_GMAKE", [gmake in tools-dir])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   961
        if test "x$FOUND_MAKE" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   962
          AC_PATH_PROGS(CHECK_TOOLSDIR_MAKE, make)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   963
          BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_MAKE", [make in tools-dir])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   964
        fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   965
        PATH=$OLD_PATH
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   966
      fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   967
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   968
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   969
    if test "x$FOUND_MAKE" = x; then
29865
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   970
      AC_MSG_ERROR([Cannot find GNU make $MAKE_REQUIRED_VERSION or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure.])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   971
    fi
33396
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   972
  ],[
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   973
    # If MAKE was set by user, verify the version
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   974
    BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE])
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   975
    if test "x$FOUND_MAKE" = x; then
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   976
      AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make $MAKE_REQUIRED_VERSION or newer.])
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   977
    fi
19196d07fa98 8140591: Add configure argument specifying make executable in JPRT
erikj
parents: 33052
diff changeset
   978
  ])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   979
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   980
  MAKE=$FOUND_MAKE
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   981
  AC_SUBST(MAKE)
29865
60e4eefce6e4 8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents: 29848
diff changeset
   982
  AC_MSG_NOTICE([Using GNU make at $FOUND_MAKE (version: $MAKE_VERSION_STRING)])
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   983
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   984
  BASIC_CHECK_MAKE_OUTPUT_SYNC
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   985
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   986
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   987
AC_DEFUN([BASIC_CHECK_FIND_DELETE],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   988
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   989
  # Test if find supports -delete
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   990
  AC_MSG_CHECKING([if find supports -delete])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   991
  FIND_DELETE="-delete"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   992
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   993
  DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   994
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   995
  echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   996
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   997
  TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   998
  if test -f $DELETEDIR/TestIfFindSupportsDelete; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   999
    # No, it does not.
38843
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
  1000
    $RM $DELETEDIR/TestIfFindSupportsDelete
26130
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
  1001
    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
  1002
      # AIX 'find' is buggy if called with '-exec {} \+' and an empty file list
38843
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
  1003
      FIND_DELETE="-print | $XARGS $RM"
26130
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
  1004
    else
38843
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
  1005
      FIND_DELETE="-exec $RM \{\} \+"
26130
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
  1006
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1007
    AC_MSG_RESULT([no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1008
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1009
    AC_MSG_RESULT([yes])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1010
  fi
38843
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
  1011
  $RMDIR $DELETEDIR
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1012
  AC_SUBST(FIND_DELETE)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1013
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1014
37972
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1015
AC_DEFUN([BASIC_CHECK_TAR],
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1016
[
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1017
  # Test which kind of tar was found
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1018
  if test "x$($TAR --version | $GREP "GNU tar")" != "x"; then
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1019
    TAR_TYPE="gnu"
43046
717ce6d4eaa1 8171409: Create a smoother configure experience on macosx
ihse
parents: 42136
diff changeset
  1020
  elif test "x$($TAR --version | $GREP "bsdtar")" != "x"; then
717ce6d4eaa1 8171409: Create a smoother configure experience on macosx
ihse
parents: 42136
diff changeset
  1021
    TAR_TYPE="bsd"
37972
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1022
  elif test "x$($TAR -v | $GREP "bsdtar")" != "x"; then
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1023
    TAR_TYPE="bsd"
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1024
  elif test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1025
    TAR_TYPE="solaris"
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1026
  fi
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1027
  AC_MSG_CHECKING([what type of tar was found])
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1028
  AC_MSG_RESULT([$TAR_TYPE])
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1029
38924
55921b080a8e 8157479: jdk-9_solaris-x64_bin-debug.tar.gz error - typeflag 'L' not recognized
erikj
parents: 37972
diff changeset
  1030
  TAR_CREATE_FILE_PARAM=""
55921b080a8e 8157479: jdk-9_solaris-x64_bin-debug.tar.gz error - typeflag 'L' not recognized
erikj
parents: 37972
diff changeset
  1031
37972
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1032
  if test "x$TAR_TYPE" = "xgnu"; then
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1033
    TAR_INCLUDE_PARAM="T"
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1034
    TAR_SUPPORTS_TRANSFORM="true"
38924
55921b080a8e 8157479: jdk-9_solaris-x64_bin-debug.tar.gz error - typeflag 'L' not recognized
erikj
parents: 37972
diff changeset
  1035
    if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
55921b080a8e 8157479: jdk-9_solaris-x64_bin-debug.tar.gz error - typeflag 'L' not recognized
erikj
parents: 37972
diff changeset
  1036
      # When using gnu tar for Solaris targets, need to use compatibility mode
55921b080a8e 8157479: jdk-9_solaris-x64_bin-debug.tar.gz error - typeflag 'L' not recognized
erikj
parents: 37972
diff changeset
  1037
      TAR_CREATE_EXTRA_PARAM="--format=ustar"
55921b080a8e 8157479: jdk-9_solaris-x64_bin-debug.tar.gz error - typeflag 'L' not recognized
erikj
parents: 37972
diff changeset
  1038
    fi
37972
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1039
  else
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1040
    TAR_INCLUDE_PARAM="I"
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1041
    TAR_SUPPORTS_TRANSFORM="false"
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1042
  fi
38924
55921b080a8e 8157479: jdk-9_solaris-x64_bin-debug.tar.gz error - typeflag 'L' not recognized
erikj
parents: 37972
diff changeset
  1043
  AC_SUBST(TAR_TYPE)
55921b080a8e 8157479: jdk-9_solaris-x64_bin-debug.tar.gz error - typeflag 'L' not recognized
erikj
parents: 37972
diff changeset
  1044
  AC_SUBST(TAR_CREATE_EXTRA_PARAM)
37972
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1045
  AC_SUBST(TAR_INCLUDE_PARAM)
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1046
  AC_SUBST(TAR_SUPPORTS_TRANSFORM)
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1047
])
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1048
43050
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1049
AC_DEFUN([BASIC_CHECK_GREP],
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1050
[
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1051
  # Test that grep supports -Fx with a list of pattern which includes null pattern.
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1052
  # This is a problem for the grep resident on AIX.
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1053
  AC_MSG_CHECKING([that grep ($GREP) -Fx handles empty lines in the pattern list correctly])
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1054
  # Multiple subsequent spaces..
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1055
  STACK_SPACES='aaa   bbb   ccc'
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1056
  # ..converted to subsequent newlines, causes STACK_LIST to be a list with some empty
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1057
  # patterns in it.
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1058
  STACK_LIST=${STACK_SPACES// /$'\n'}
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1059
  NEEDLE_SPACES='ccc bbb aaa'
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1060
  NEEDLE_LIST=${NEEDLE_SPACES// /$'\n'}
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1061
  RESULT="$($GREP -Fvx "$STACK_LIST" <<< "$NEEDLE_LIST")"
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1062
  if test "x$RESULT" == "x"; then
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1063
    AC_MSG_RESULT([yes])
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1064
  else
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1065
    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1066
      ADDINFO="Please make sure you use GNU grep, usually found at /opt/freeware/bin."
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1067
    fi
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1068
    AC_MSG_ERROR([grep does not handle -Fx correctly. ${ADDINFO}])
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1069
  fi
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1070
])
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1071
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1072
AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1073
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1074
  BASIC_CHECK_GNU_MAKE
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
  1075
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1076
  BASIC_CHECK_FIND_DELETE
37972
e1fa5c2e62a0 8136777: Introduce bundle targets
erikj
parents: 37960
diff changeset
  1077
  BASIC_CHECK_TAR
43050
318848ed8345 8172712: configure should check that grep handles empty pattern correctly
stuefe
parents: 43046
diff changeset
  1078
  BASIC_CHECK_GREP
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
  1079
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1080
  # These tools might not be installed by default,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1081
  # need hint on how to install them.
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1082
  BASIC_REQUIRE_PROGS(UNZIP, unzip)
42136
f872c8278074 8168037: Use ZIPEXE instead of ZIP to avoid clash with options for zip
ihse
parents: 41462
diff changeset
  1083
  # Since zip uses "ZIP" as a environment variable for passing options, we need
f872c8278074 8168037: Use ZIPEXE instead of ZIP to avoid clash with options for zip
ihse
parents: 41462
diff changeset
  1084
  # to name our variable differently, hence ZIPEXE.
f872c8278074 8168037: Use ZIPEXE instead of ZIP to avoid clash with options for zip
ihse
parents: 41462
diff changeset
  1085
  BASIC_REQUIRE_PROGS(ZIPEXE, zip)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1086
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1087
  # Non-required basic tools
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
  1088
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1089
  BASIC_PATH_PROGS(LDD, ldd)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1090
  if test "x$LDD" = "x"; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1091
    # List shared lib dependencies is used for
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1092
    # debug output and checking for forbidden dependencies.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1093
    # We can build without it.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1094
    LDD="true"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1095
  fi
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1096
  BASIC_PATH_PROGS(OTOOL, otool)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1097
  if test "x$OTOOL" = "x"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1098
    OTOOL="true"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1099
  fi
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1100
  BASIC_PATH_PROGS(READELF, [greadelf readelf])
44727
ca162fc20601 8178965: Second part of JDK-8176785
ihse
parents: 44078
diff changeset
  1101
  BASIC_PATH_PROGS(DOT, dot)
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1102
  BASIC_PATH_PROGS(HG, hg)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1103
  BASIC_PATH_PROGS(STAT, stat)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1104
  BASIC_PATH_PROGS(TIME, time)
44465
26fabd8abee9 8177770: Need more precise control on build system logging
asemenyuk
parents: 44078
diff changeset
  1105
  BASIC_PATH_PROGS(FLOCK, flock)
41462
a4f7ec34a58f 8166937: [Solaris] Missing libjvm_db.so and libjvm_dtrace.so from JDK 9 b138
erikj
parents: 41040
diff changeset
  1106
  # Dtrace is usually found in /usr/sbin on Solaris, but that directory may not
a4f7ec34a58f 8166937: [Solaris] Missing libjvm_db.so and libjvm_dtrace.so from JDK 9 b138
erikj
parents: 41040
diff changeset
  1107
  # be in the user path.
a4f7ec34a58f 8166937: [Solaris] Missing libjvm_db.so and libjvm_dtrace.so from JDK 9 b138
erikj
parents: 41040
diff changeset
  1108
  BASIC_PATH_PROGS(DTRACE, dtrace, $PATH:/usr/sbin)
32715
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 31123
diff changeset
  1109
  BASIC_PATH_PROGS(PATCH, [gpatch patch])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1110
  # Check if it's GNU time
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1111
  IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1112
  if test "x$IS_GNU_TIME" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1113
    IS_GNU_TIME=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1114
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1115
    IS_GNU_TIME=no
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1116
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1117
  AC_SUBST(IS_GNU_TIME)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1118
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1119
  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1120
    BASIC_REQUIRE_PROGS(DSYMUTIL, dsymutil)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1121
    BASIC_REQUIRE_PROGS(XATTR, xattr)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1122
    BASIC_PATH_PROGS(CODESIGN, codesign)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1123
    if test "x$CODESIGN" != "x"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1124
      # Verify that the openjdk_codesign certificate is present
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1125
      AC_MSG_CHECKING([if openjdk_codesign certificate is present])
38843
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
  1126
      $RM codesign-testfile
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
  1127
      $TOUCH codesign-testfile
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
  1128
      $CODESIGN -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
2b141e8e916f 8158535: Configure script uses basic tools directly in many places
erikj
parents: 37972
diff changeset
  1129
      $RM codesign-testfile
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1130
      if test "x$CODESIGN" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1131
        AC_MSG_RESULT([no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1132
      else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1133
        AC_MSG_RESULT([yes])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1134
      fi
17661
55c5e0f7b9cc 8013489: New build system does not run codesign on SA-related launchers on OS X
erikj
parents: 17593
diff changeset
  1135
    fi
31123
2c85f4a793d1 8087193: Support building with devkits on Macosx
erikj
parents: 30419
diff changeset
  1136
    BASIC_REQUIRE_PROGS(SETFILE, SetFile)
17661
55c5e0f7b9cc 8013489: New build system does not run codesign on SA-related launchers on OS X
erikj
parents: 17593
diff changeset
  1137
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1138
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1139
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1140
# Check if build directory is on local disk. If not possible to determine,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1141
# we prefer to claim it's local.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1142
# Argument 1: directory to test
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1143
# Argument 2: what to do if it is on local disk
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1144
# Argument 3: what to do otherwise (remote disk or failure)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1145
AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1146
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1147
  # df -l lists only local disks; if the given directory is not found then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1148
  # a non-zero exit code is given
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1149
  if test "x$DF" = x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1150
    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1151
      # msys does not have df; use Windows "net use" instead.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1152
      IS_NETWORK_DISK=`net use | grep \`pwd -W | cut -d ":" -f 1 | tr a-z A-Z\`:`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1153
      if test "x$IS_NETWORK_DISK" = x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1154
        $2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1155
      else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1156
        $3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1157
      fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1158
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1159
      # No df here, say it's local
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1160
      $2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1161
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1162
  else
47397
7236260e166c 8189619: [aix] OpenJDK local disk check not working on AIX
stuefe
parents: 47346
diff changeset
  1163
    # JDK-8189619
7236260e166c 8189619: [aix] OpenJDK local disk check not working on AIX
stuefe
parents: 47346
diff changeset
  1164
    # df on AIX does not understand -l. On modern AIXes it understands "-T local" which
7236260e166c 8189619: [aix] OpenJDK local disk check not working on AIX
stuefe
parents: 47346
diff changeset
  1165
    # is the same. On older AIXes we just continue to live with a "not local build" warning.
7236260e166c 8189619: [aix] OpenJDK local disk check not working on AIX
stuefe
parents: 47346
diff changeset
  1166
    if test "x$OPENJDK_TARGET_OS" = xaix; then
7236260e166c 8189619: [aix] OpenJDK local disk check not working on AIX
stuefe
parents: 47346
diff changeset
  1167
      DF_LOCAL_ONLY_OPTION='-T local'
7236260e166c 8189619: [aix] OpenJDK local disk check not working on AIX
stuefe
parents: 47346
diff changeset
  1168
    else
7236260e166c 8189619: [aix] OpenJDK local disk check not working on AIX
stuefe
parents: 47346
diff changeset
  1169
      DF_LOCAL_ONLY_OPTION='-l'
7236260e166c 8189619: [aix] OpenJDK local disk check not working on AIX
stuefe
parents: 47346
diff changeset
  1170
    fi
7236260e166c 8189619: [aix] OpenJDK local disk check not working on AIX
stuefe
parents: 47346
diff changeset
  1171
    if $DF $DF_LOCAL_ONLY_OPTION $1 > /dev/null 2>&1; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1172
      $2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1173
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1174
      $3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1175
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
  1176
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1177
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1178
15050
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1179
# Check that source files have basic read permissions set. This might
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1180
# not be the case in cygwin in certain conditions.
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1181
AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1182
[
25882
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
  1183
  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
47252
fdac20095dff 8187543: Replace SRC_ROOT with TOPDIR
ihse
parents: 47217
diff changeset
  1184
    file_to_test="$TOPDIR/LICENSE"
15050
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1185
    if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1186
      AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1187
    fi
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1188
  fi
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1189
])
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
  1190
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1191
AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1192
[
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1193
  # Did user specify any unknown variables?
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1194
  BASIC_CHECK_LEFTOVER_OVERRIDDEN
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
  1195
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1196
  AC_MSG_CHECKING([if build directory is on local disk])
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
  1197
  BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUTDIR,
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1198
      [OUTPUT_DIR_IS_LOCAL="yes"],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1199
      [OUTPUT_DIR_IS_LOCAL="no"])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1200
  AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1201
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1202
  BASIC_CHECK_SRC_PERMS
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1203
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1204
  # Check if the user has any old-style ALT_ variables set.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1205
  FOUND_ALT_VARIABLES=`env | grep ^ALT_`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1206
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1207
  # Before generating output files, test if they exist. If they do, this is a reconfigure.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1208
  # Since we can't properly handle the dependencies for this, warn the user about the situation
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
  1209
  if test -e $OUTPUTDIR/spec.gmk; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1210
    IS_RECONFIGURE=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1211
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1212
    IS_RECONFIGURE=no
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
  1213
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1214
])
28602
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1215
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1216
# Check for support for specific options in bash
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1217
AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS],
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1218
[
43654
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1219
  # Check bash version
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1220
  # Extra [ ] to stop m4 mangling
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1221
  [ BASH_VER=`$BASH --version | $SED -n  -e 's/^.*bash.*ersion *\([0-9.]*\).*$/\1/ p'` ]
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1222
  AC_MSG_CHECKING([bash version])
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1223
  AC_MSG_RESULT([$BASH_VER])
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1224
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1225
  BASH_MAJOR=`$ECHO $BASH_VER | $CUT -d . -f 1`
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1226
  BASH_MINOR=`$ECHO $BASH_VER | $CUT -d . -f 2`
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1227
  if test $BASH_MAJOR -lt 3 || (test $BASH_MAJOR -eq 3 && test $BASH_MINOR -lt 2); then
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1228
    AC_MSG_ERROR([bash version 3.2 or better is required])
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1229
  fi
32ee04ab8949 8174069: Verify that bash is at least version 3.2
ihse
parents: 43383
diff changeset
  1230
28602
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1231
  # Test if bash supports pipefail.
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1232
  AC_MSG_CHECKING([if bash supports pipefail])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1233
  if ${BASH} -c 'set -o pipefail'; then
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1234
    BASH_ARGS="$BASH_ARGS -o pipefail"
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1235
    AC_MSG_RESULT([yes])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1236
  else
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1237
    AC_MSG_RESULT([no])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1238
  fi
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1239
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1240
  AC_MSG_CHECKING([if bash supports errexit (-e)])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1241
  if ${BASH} -e -c 'true'; then
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1242
    BASH_ARGS="$BASH_ARGS -e"
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1243
    AC_MSG_RESULT([yes])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1244
  else
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1245
    AC_MSG_RESULT([no])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1246
  fi
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1247
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1248
  AC_SUBST(BASH_ARGS)
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1249
])
30417
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1250
34491
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1251
################################################################################
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1252
#
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1253
# Default make target
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1254
#
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1255
AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_MAKE_TARGET],
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1256
[
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1257
  AC_ARG_WITH(default-make-target, [AS_HELP_STRING([--with-default-make-target],
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1258
      [set the default make target @<:@exploded-image@:>@])])
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1259
  if test "x$with_default_make_target" = "x" \
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1260
      || test "x$with_default_make_target" = "xyes"; then
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1261
    DEFAULT_MAKE_TARGET="exploded-image"
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1262
  elif test "x$with_default_make_target" = "xno"; then
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1263
    AC_MSG_ERROR([--without-default-make-target is not a valid option])
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1264
  else
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1265
    DEFAULT_MAKE_TARGET="$with_default_make_target"
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1266
  fi
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1267
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1268
  AC_SUBST(DEFAULT_MAKE_TARGET)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1269
])
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 33396
diff changeset
  1270
30417
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1271
# Code to run after AC_OUTPUT
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1272
AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1273
[
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1274
  # Try to move config.log (generated by autoconf) to the configure-support directory.
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1275
  if test -e ./config.log; then
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1276
    $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1277
  fi
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1278
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1279
  # Rotate our log file (configure.log)
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
  1280
  if test -e "$OUTPUTDIR/configure.log.old"; then
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
  1281
    $RM -f "$OUTPUTDIR/configure.log.old"
30417
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1282
  fi
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
  1283
  if test -e "$OUTPUTDIR/configure.log"; then
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
  1284
    $MV -f "$OUTPUTDIR/configure.log" "$OUTPUTDIR/configure.log.old" 2> /dev/null
30417
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1285
  fi
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1286
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1287
  # Move configure.log from current directory to the build output root
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1288
  if test -e ./configure.log; then
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
  1289
    $MV -f ./configure.log "$OUTPUTDIR/configure.log" 2> /dev/null
30417
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1290
  fi
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1291
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1292
  # Make the compare script executable
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47252
diff changeset
  1293
  $CHMOD +x $OUTPUTDIR/compare.sh
30417
581a2762eef1 8079891: Store configure log in $BUILD/configure.log
ihse
parents: 30022
diff changeset
  1294
])