author | lana |
Thu, 22 Oct 2015 08:47:53 -0700 | |
changeset 33329 | 15a50c5e0668 |
parent 32921 | 8e0250dfa145 |
child 33052 | 4da63d511320 |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
29064
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
2 |
# Copyright (c) 2011, 2015, 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 |
|
17592 | 26 |
# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3) |
20363 | 27 |
# If so, then append $1 to $2 \ |
17592 | 28 |
# 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
|
29 |
AC_DEFUN([ADD_JVM_ARG_IF_OK], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
30 |
[ |
20363 | 31 |
$ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD |
32 |
$ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD |
|
33 |
OUTPUT=`$3 $1 -version 2>&1` |
|
34 |
FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` |
|
35 |
FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` |
|
36 |
if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
|
37 |
$2="[$]$2 $1" |
|
38 |
JVM_ARG_OK=true |
|
39 |
else |
|
40 |
$ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD |
|
41 |
$ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD |
|
42 |
JVM_ARG_OK=false |
|
43 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
44 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
45 |
|
18421
0296625b6c1f
8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents:
18021
diff
changeset
|
46 |
# 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
|
47 |
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
|
48 |
[ |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
49 |
if test "x$2" != x; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
50 |
if test "x[$]$1" = x; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
51 |
$1="$2" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
52 |
else |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
53 |
$1="[$]$1:$2" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
54 |
fi |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
55 |
fi |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
56 |
]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
57 |
|
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
58 |
# 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
|
59 |
AC_DEFUN([BASIC_PREPEND_TO_PATH], |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
60 |
[ |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
61 |
if test "x$2" != x; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
62 |
if test "x[$]$1" = x; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
63 |
$1="$2" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
64 |
else |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
65 |
$1="$2:[$]$1" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
66 |
fi |
18421
0296625b6c1f
8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents:
18021
diff
changeset
|
67 |
fi |
0296625b6c1f
8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents:
18021
diff
changeset
|
68 |
]) |
0296625b6c1f
8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents:
18021
diff
changeset
|
69 |
|
14111 | 70 |
# This will make sure the given variable points to a full and proper |
71 |
# path. This means: |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27329
diff
changeset
|
72 |
# 1) There will be no spaces in the path. On unix platforms, |
14111 | 73 |
# spaces in the path will result in an error. On Windows, |
74 |
# the path will be rewritten using short-style to be space-free. |
|
75 |
# 2) The path will be absolute, and it will be in unix-style (on |
|
76 |
# cygwin). |
|
77 |
# $1: The name of the variable to fix |
|
78 |
AC_DEFUN([BASIC_FIXUP_PATH], |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
79 |
[ |
29064
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
80 |
# Only process if variable expands to non-empty |
29662 | 81 |
|
29064
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
82 |
if test "x[$]$1" != x; then |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
83 |
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
|
84 |
BASIC_FIXUP_PATH_CYGWIN($1) |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
85 |
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
|
86 |
BASIC_FIXUP_PATH_MSYS($1) |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
87 |
else |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
88 |
# We're on a unix platform. Hooray! :) |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
89 |
path="[$]$1" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
90 |
has_space=`$ECHO "$path" | $GREP " "` |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
91 |
if test "x$has_space" != x; then |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
92 |
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
|
93 |
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
|
94 |
fi |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
95 |
|
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
96 |
# Use eval to expand a potential ~ |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
97 |
eval path="$path" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
98 |
if test ! -f "$path" && test ! -d "$path"; then |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
99 |
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
|
100 |
fi |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
101 |
|
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
102 |
$1="`cd "$path"; $THEPWDCMD -L`" |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
103 |
fi |
14111 | 104 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
105 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
106 |
|
14111 | 107 |
# This will make sure the given variable points to a executable |
108 |
# 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
|
109 |
# 1) There will be no spaces in the path. On unix platforms, |
14111 | 110 |
# spaces in the path will result in an error. On Windows, |
111 |
# the path will be rewritten using short-style to be space-free. |
|
112 |
# 2) The path will be absolute, and it will be in unix-style (on |
|
113 |
# cygwin). |
|
114 |
# Any arguments given to the executable is preserved. |
|
115 |
# If the input variable does not have a directory specification, then |
|
116 |
# it need to be in the PATH. |
|
117 |
# $1: The name of the variable to fix |
|
118 |
AC_DEFUN([BASIC_FIXUP_EXECUTABLE], |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
119 |
[ |
29064
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
120 |
# Only process if variable expands to non-empty |
29662 | 121 |
|
29064
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
122 |
if test "x[$]$1" != x; then |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
123 |
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
|
124 |
BASIC_FIXUP_EXECUTABLE_CYGWIN($1) |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
125 |
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
|
126 |
BASIC_FIXUP_EXECUTABLE_MSYS($1) |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
127 |
else |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
128 |
# We're on a unix platform. Hooray! :) |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
129 |
# 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
|
130 |
# space. |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
131 |
complete="[$]$1" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
132 |
path="${complete%% *}" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
133 |
tmp="$complete EOL" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
134 |
arguments="${tmp#* }" |
14111 | 135 |
|
29064
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
136 |
# 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
|
137 |
is_absolute_path=`$ECHO "$path" | $GREP ^/` |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
138 |
if test -z "$is_absolute_path"; then |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
139 |
# Path to executable is not absolute. Find it. |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
140 |
IFS_save="$IFS" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
141 |
IFS=: |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
142 |
for p in $PATH; do |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
143 |
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
|
144 |
new_path="$p/$path" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
145 |
break |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
146 |
fi |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
147 |
done |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
148 |
IFS="$IFS_save" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
149 |
else |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
150 |
# 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
|
151 |
new_path="$path" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
152 |
fi |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
153 |
|
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
154 |
if test "x$new_path" = x; then |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
155 |
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
|
156 |
has_space=`$ECHO "$complete" | $GREP " "` |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
157 |
if test "x$has_space" != x; then |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
158 |
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
|
159 |
fi |
29064
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
160 |
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
|
161 |
fi |
14736
ee810661e3d1
8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents:
14563
diff
changeset
|
162 |
fi |
20363 | 163 |
|
29064
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
164 |
# 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
|
165 |
if test "x$arguments" != xEOL; then |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
166 |
new_complete="$new_path ${arguments% *}" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
167 |
else |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
168 |
new_complete="$new_path" |
20363 | 169 |
fi |
14111 | 170 |
|
29064
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
171 |
if test "x$complete" != "x$new_complete"; then |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
172 |
$1="$new_complete" |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
173 |
AC_MSG_NOTICE([Rewriting $1 to "$new_complete"]) |
d5e775680e97
8073862: BASIC_FIXUP_EXECUTABLE should not fail on empty path
ihse
parents:
28908
diff
changeset
|
174 |
fi |
20363 | 175 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
176 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
177 |
|
14111 | 178 |
AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
179 |
[ |
20363 | 180 |
if test "x$OPENJDK_BUILD_OS" != xwindows; then |
181 |
# Follow a chain of symbolic links. Use readlink |
|
182 |
# where it exists, else fall back to horribly |
|
183 |
# complicated shell code. |
|
184 |
if test "x$READLINK_TESTED" != yes; then |
|
185 |
# On MacOSX there is a readlink tool with a different |
|
186 |
# purpose than the GNU readlink tool. Check the found readlink. |
|
187 |
ISGNU=`$READLINK --version 2>&1 | $GREP GNU` |
|
188 |
if test "x$ISGNU" = x; then |
|
189 |
# A readlink that we do not know how to use. |
|
190 |
# Are there other non-GNU readlinks out there? |
|
191 |
READLINK_TESTED=yes |
|
192 |
READLINK= |
|
193 |
fi |
|
194 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
195 |
|
20363 | 196 |
if test "x$READLINK" != x; then |
197 |
$1=`$READLINK -f [$]$1` |
|
198 |
else |
|
199 |
# Save the current directory for restoring afterwards |
|
200 |
STARTDIR=$PWD |
|
201 |
COUNTER=0 |
|
202 |
sym_link_dir=`$DIRNAME [$]$1` |
|
203 |
sym_link_file=`$BASENAME [$]$1` |
|
204 |
cd $sym_link_dir |
|
205 |
# Use -P flag to resolve symlinks in directories. |
|
206 |
cd `$THEPWDCMD -P` |
|
207 |
sym_link_dir=`$THEPWDCMD -P` |
|
208 |
# Resolve file symlinks |
|
209 |
while test $COUNTER -lt 20; do |
|
210 |
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` |
|
211 |
if test "x$ISLINK" == x; then |
|
212 |
# This is not a symbolic link! We are done! |
|
213 |
break |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
214 |
fi |
20363 | 215 |
# Again resolve directory symlinks since the target of the just found |
216 |
# link could be in a different directory |
|
217 |
cd `$DIRNAME $ISLINK` |
|
218 |
sym_link_dir=`$THEPWDCMD -P` |
|
219 |
sym_link_file=`$BASENAME $ISLINK` |
|
220 |
let COUNTER=COUNTER+1 |
|
221 |
done |
|
222 |
cd $STARTDIR |
|
223 |
$1=$sym_link_dir/$sym_link_file |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
224 |
fi |
20363 | 225 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
226 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
227 |
|
19763 | 228 |
# Register a --with argument but mark it as deprecated |
229 |
# $1: The name of the with argument to deprecate, not including --with- |
|
230 |
AC_DEFUN([BASIC_DEPRECATED_ARG_WITH], |
|
231 |
[ |
|
232 |
AC_ARG_WITH($1, [AS_HELP_STRING([--with-$1], |
|
233 |
[Deprecated. Option is kept for backwards compatibility and is ignored])], |
|
234 |
[AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])]) |
|
235 |
]) |
|
236 |
||
20649
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
237 |
# Register a --enable argument but mark it as deprecated |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
238 |
# $1: The name of the with argument to deprecate, not including --enable- |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
239 |
# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -) |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
240 |
AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE], |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
241 |
[ |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
242 |
AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1], |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
243 |
[Deprecated. Option is kept for backwards compatibility and is ignored])]) |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
244 |
if test "x$enable_$2" != x; then |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
245 |
AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.]) |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
246 |
fi |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
247 |
]) |
47ddc69a25a7
8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents:
20647
diff
changeset
|
248 |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
249 |
AC_DEFUN_ONCE([BASIC_INIT], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
250 |
[ |
20363 | 251 |
# Save the original command line. This is passed to us by the wrapper configure script. |
252 |
AC_SUBST(CONFIGURE_COMMAND_LINE) |
|
28809
6481e27e00ee
8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents:
28602
diff
changeset
|
253 |
# Save the path variable before it gets changed |
6481e27e00ee
8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents:
28602
diff
changeset
|
254 |
ORIGINAL_PATH="$PATH" |
6481e27e00ee
8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents:
28602
diff
changeset
|
255 |
AC_SUBST(ORIGINAL_PATH) |
20363 | 256 |
DATE_WHEN_CONFIGURED=`LANG=C date` |
257 |
AC_SUBST(DATE_WHEN_CONFIGURED) |
|
258 |
AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.]) |
|
259 |
AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.]) |
|
14111 | 260 |
]) |
261 |
||
262 |
# Test that variable $1 denoting a program is not empty. If empty, exit with an error. |
|
263 |
# $1: variable to check |
|
264 |
AC_DEFUN([BASIC_CHECK_NONEMPTY], |
|
265 |
[ |
|
20363 | 266 |
if test "x[$]$1" = x; then |
22475 | 267 |
AC_MSG_ERROR([Could not find required tool for $1]) |
268 |
fi |
|
269 |
]) |
|
270 |
||
271 |
# Check that there are no unprocessed overridden variables left. |
|
272 |
# If so, they are an incorrect argument and we will exit with an error. |
|
273 |
AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN], |
|
274 |
[ |
|
275 |
if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then |
|
276 |
# Replace the separating ! with spaces before presenting for end user. |
|
277 |
unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ } |
|
22478
5ca2b792a5fd
8033292: only warn, not fail, on unknown variables in configure
ihse
parents:
22475
diff
changeset
|
278 |
AC_MSG_WARN([The following variables might be unknown to configure: $unknown_variables]) |
20363 | 279 |
fi |
14111 | 280 |
]) |
281 |
||
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27586
diff
changeset
|
282 |
# Setup a tool for the given variable. If correctly specified by the user, |
22475 | 283 |
# use that value, otherwise search for the tool using the supplied code snippet. |
14111 | 284 |
# $1: variable to set |
22475 | 285 |
# $2: code snippet to call to look for the tool |
286 |
AC_DEFUN([BASIC_SETUP_TOOL], |
|
14111 | 287 |
[ |
22475 | 288 |
# Publish this variable in the help. |
289 |
AC_ARG_VAR($1, [Override default value for $1]) |
|
290 |
||
32920 | 291 |
if [[ -z "${$1+x}" ]]; then |
22475 | 292 |
# The variable is not set by user, try to locate tool using the code snippet |
293 |
$2 |
|
294 |
else |
|
295 |
# The variable is set, but is it from the command line or the environment? |
|
296 |
||
297 |
# Try to remove the string !$1! from our list. |
|
298 |
try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!$1!/} |
|
299 |
if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then |
|
300 |
# If it failed, the variable was not from the command line. Ignore it, |
|
301 |
# but warn the user (except for BASH, which is always set by the calling BASH). |
|
302 |
if test "x$1" != xBASH; then |
|
303 |
AC_MSG_WARN([Ignoring value of $1 from the environment. Use command line variables instead.]) |
|
304 |
fi |
|
305 |
# Try to locate tool using the code snippet |
|
306 |
$2 |
|
307 |
else |
|
308 |
# If it succeeded, then it was overridden by the user. We will use it |
|
309 |
# for the tool. |
|
310 |
||
311 |
# First remove it from the list of overridden variables, so we can test |
|
312 |
# for unknown variables in the end. |
|
313 |
CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var" |
|
314 |
||
32920 | 315 |
# Check if we try to supply an empty value |
316 |
if test "x[$]$1" = x; then |
|
317 |
AC_MSG_NOTICE([Setting user supplied tool $1= (no value)]) |
|
318 |
AC_MSG_CHECKING([for $1]) |
|
319 |
AC_MSG_RESULT([disabled]) |
|
320 |
else |
|
321 |
# Check if the provided tool contains a complete path. |
|
322 |
tool_specified="[$]$1" |
|
323 |
tool_basename="${tool_specified##*/}" |
|
324 |
if test "x$tool_basename" = "x$tool_specified"; then |
|
325 |
# A command without a complete path is provided, search $PATH. |
|
326 |
AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename]) |
|
327 |
AC_PATH_PROG($1, $tool_basename) |
|
328 |
if test "x[$]$1" = x; then |
|
329 |
AC_MSG_ERROR([User supplied tool $tool_basename could not be found]) |
|
330 |
fi |
|
331 |
else |
|
332 |
# Otherwise we believe it is a complete path. Use it as it is. |
|
333 |
AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified]) |
|
334 |
AC_MSG_CHECKING([for $1]) |
|
335 |
if test ! -x "$tool_specified"; then |
|
336 |
AC_MSG_RESULT([not found]) |
|
337 |
AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable]) |
|
338 |
fi |
|
339 |
AC_MSG_RESULT([$tool_specified]) |
|
22475 | 340 |
fi |
341 |
fi |
|
342 |
fi |
|
343 |
fi |
|
344 |
]) |
|
345 |
||
346 |
# Call BASIC_SETUP_TOOL with AC_PATH_PROGS to locate the tool |
|
347 |
# $1: variable to set |
|
348 |
# $2: executable name (or list of names) to look for |
|
349 |
AC_DEFUN([BASIC_PATH_PROGS], |
|
350 |
[ |
|
351 |
BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2)]) |
|
352 |
]) |
|
353 |
||
354 |
# Call BASIC_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool |
|
355 |
# $1: variable to set |
|
356 |
# $2: executable name (or list of names) to look for |
|
357 |
AC_DEFUN([BASIC_CHECK_TOOLS], |
|
358 |
[ |
|
359 |
BASIC_SETUP_TOOL($1, [AC_CHECK_TOOLS($1, $2)]) |
|
360 |
]) |
|
361 |
||
362 |
# Like BASIC_PATH_PROGS but fails if no tool was found. |
|
363 |
# $1: variable to set |
|
364 |
# $2: executable name (or list of names) to look for |
|
365 |
AC_DEFUN([BASIC_REQUIRE_PROGS], |
|
366 |
[ |
|
367 |
BASIC_PATH_PROGS($1, $2) |
|
368 |
BASIC_CHECK_NONEMPTY($1) |
|
369 |
]) |
|
370 |
||
371 |
# Like BASIC_SETUP_TOOL but fails if no tool was found. |
|
372 |
# $1: variable to set |
|
373 |
# $2: autoconf macro to call to look for the special tool |
|
374 |
AC_DEFUN([BASIC_REQUIRE_SPECIAL], |
|
375 |
[ |
|
376 |
BASIC_SETUP_TOOL($1, [$2]) |
|
377 |
BASIC_CHECK_NONEMPTY($1) |
|
14111 | 378 |
]) |
379 |
||
380 |
# Setup the most fundamental tools that relies on not much else to set up, |
|
381 |
# but is used by much of the early bootstrap code. |
|
382 |
AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS], |
|
383 |
[ |
|
20363 | 384 |
# Start with tools that do not need have cross compilation support |
385 |
# 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
|
386 |
# used by configure. |
14111 | 387 |
|
20363 | 388 |
# First are all the simple required tools. |
22475 | 389 |
BASIC_REQUIRE_PROGS(BASENAME, basename) |
390 |
BASIC_REQUIRE_PROGS(BASH, bash) |
|
391 |
BASIC_REQUIRE_PROGS(CAT, cat) |
|
392 |
BASIC_REQUIRE_PROGS(CHMOD, chmod) |
|
393 |
BASIC_REQUIRE_PROGS(CMP, cmp) |
|
394 |
BASIC_REQUIRE_PROGS(COMM, comm) |
|
395 |
BASIC_REQUIRE_PROGS(CP, cp) |
|
396 |
BASIC_REQUIRE_PROGS(CUT, cut) |
|
397 |
BASIC_REQUIRE_PROGS(DATE, date) |
|
398 |
BASIC_REQUIRE_PROGS(DIFF, [gdiff diff]) |
|
399 |
BASIC_REQUIRE_PROGS(DIRNAME, dirname) |
|
400 |
BASIC_REQUIRE_PROGS(ECHO, echo) |
|
401 |
BASIC_REQUIRE_PROGS(EXPR, expr) |
|
402 |
BASIC_REQUIRE_PROGS(FILE, file) |
|
403 |
BASIC_REQUIRE_PROGS(FIND, find) |
|
404 |
BASIC_REQUIRE_PROGS(HEAD, head) |
|
405 |
BASIC_REQUIRE_PROGS(LN, ln) |
|
406 |
BASIC_REQUIRE_PROGS(LS, ls) |
|
407 |
BASIC_REQUIRE_PROGS(MKDIR, mkdir) |
|
408 |
BASIC_REQUIRE_PROGS(MKTEMP, mktemp) |
|
409 |
BASIC_REQUIRE_PROGS(MV, mv) |
|
410 |
BASIC_REQUIRE_PROGS(NAWK, [nawk gawk awk]) |
|
411 |
BASIC_REQUIRE_PROGS(PRINTF, printf) |
|
412 |
BASIC_REQUIRE_PROGS(RM, rm) |
|
413 |
BASIC_REQUIRE_PROGS(SH, sh) |
|
414 |
BASIC_REQUIRE_PROGS(SORT, sort) |
|
415 |
BASIC_REQUIRE_PROGS(TAIL, tail) |
|
416 |
BASIC_REQUIRE_PROGS(TAR, tar) |
|
417 |
BASIC_REQUIRE_PROGS(TEE, tee) |
|
418 |
BASIC_REQUIRE_PROGS(TOUCH, touch) |
|
419 |
BASIC_REQUIRE_PROGS(TR, tr) |
|
420 |
BASIC_REQUIRE_PROGS(UNAME, uname) |
|
421 |
BASIC_REQUIRE_PROGS(UNIQ, uniq) |
|
422 |
BASIC_REQUIRE_PROGS(WC, wc) |
|
423 |
BASIC_REQUIRE_PROGS(WHICH, which) |
|
424 |
BASIC_REQUIRE_PROGS(XARGS, xargs) |
|
14111 | 425 |
|
20363 | 426 |
# Then required tools that require some special treatment. |
22475 | 427 |
BASIC_REQUIRE_SPECIAL(AWK, [AC_PROG_AWK]) |
428 |
BASIC_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP]) |
|
429 |
BASIC_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP]) |
|
430 |
BASIC_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP]) |
|
431 |
BASIC_REQUIRE_SPECIAL(SED, [AC_PROG_SED]) |
|
14111 | 432 |
|
20363 | 433 |
# Always force rm. |
434 |
RM="$RM -f" |
|
14111 | 435 |
|
20363 | 436 |
# pwd behaves differently on various platforms and some don't support the -L flag. |
437 |
# Always use the bash builtin pwd to get uniform behavior. |
|
438 |
THEPWDCMD=pwd |
|
17662
8cae100e6f14
8014003: New build does not handle symlinks in workspace path
erikj
parents:
17661
diff
changeset
|
439 |
|
20363 | 440 |
# These are not required on all platforms |
22475 | 441 |
BASIC_PATH_PROGS(CYGPATH, cygpath) |
442 |
BASIC_PATH_PROGS(READLINK, [greadlink readlink]) |
|
443 |
BASIC_PATH_PROGS(DF, df) |
|
25882 | 444 |
BASIC_PATH_PROGS(CPIO, [cpio bsdcpio]) |
32920 | 445 |
BASIC_PATH_PROGS(NICE, nice) |
13697 | 446 |
]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
447 |
|
13697 | 448 |
# Setup basic configuration paths, and platform-specific stuff related to PATHs. |
449 |
AC_DEFUN_ONCE([BASIC_SETUP_PATHS], |
|
450 |
[ |
|
22722 | 451 |
# Save the current directory this script was started from |
20363 | 452 |
CURDIR="$PWD" |
14111 | 453 |
|
32716
d3203fd9e447
8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents:
32715
diff
changeset
|
454 |
# 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
|
455 |
# 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
|
456 |
# 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
|
457 |
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
|
458 |
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
|
459 |
ORIGINAL_PATH="$REWRITTEN_PATH" |
d3203fd9e447
8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents:
32715
diff
changeset
|
460 |
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
|
461 |
fi |
d3203fd9e447
8136764: ORIGINAL_PATH is broken if PATH contains directory with "#" in it's name
ihse
parents:
32715
diff
changeset
|
462 |
|
20363 | 463 |
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
464 |
PATH_SEP=";" |
|
465 |
BASIC_CHECK_PATHS_WINDOWS |
|
466 |
else |
|
467 |
PATH_SEP=":" |
|
468 |
fi |
|
469 |
AC_SUBST(PATH_SEP) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
470 |
|
22726
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
471 |
# 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
|
472 |
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
|
473 |
AC_MSG_RESULT([$TOPDIR]) |
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
474 |
AC_SUBST(TOPDIR) |
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
475 |
|
29663
74ff65003536
8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents:
29662
diff
changeset
|
476 |
# 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
|
477 |
ORIGINAL_TOPDIR="$TOPDIR" |
74ff65003536
8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents:
29662
diff
changeset
|
478 |
AC_SUBST(ORIGINAL_TOPDIR) |
74ff65003536
8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents:
29662
diff
changeset
|
479 |
|
22726
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
480 |
# 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
|
481 |
BASIC_FIXUP_PATH(CURDIR) |
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
482 |
BASIC_FIXUP_PATH(TOPDIR) |
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
483 |
# SRC_ROOT is a traditional alias for TOPDIR. |
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
484 |
SRC_ROOT=$TOPDIR |
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
485 |
|
29663
74ff65003536
8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents:
29662
diff
changeset
|
486 |
# 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
|
487 |
CANONICAL_TOPDIR=$TOPDIR |
74ff65003536
8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents:
29662
diff
changeset
|
488 |
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
|
489 |
AC_SUBST(CANONICAL_TOPDIR) |
74ff65003536
8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents:
29662
diff
changeset
|
490 |
|
22726
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
491 |
# Locate the directory of this script. |
d984085c5ff2
8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents:
22722
diff
changeset
|
492 |
AUTOCONF_DIR=$TOPDIR/common/autoconf |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
493 |
]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
494 |
|
30022 | 495 |
# Evaluates platform specific overrides for devkit variables. |
496 |
# $1: Name of variable |
|
497 |
AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE], |
|
498 |
[ |
|
499 |
if test "x[$]$1" = x; then |
|
500 |
eval $1="\${$1_${OPENJDK_TARGET_CPU}}" |
|
501 |
fi |
|
502 |
]) |
|
503 |
||
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
504 |
AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT], |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
505 |
[ |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
506 |
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
|
507 |
[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
|
508 |
[ |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
509 |
BASIC_FIXUP_PATH([with_devkit]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
510 |
DEVKIT_ROOT="$with_devkit" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
511 |
# 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
|
512 |
if test -f "$DEVKIT_ROOT/devkit.info"; then |
30022 | 513 |
. $DEVKIT_ROOT/devkit.info |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
514 |
# This potentially sets the following: |
30022 | 515 |
# A descriptive name of the devkit |
516 |
BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_NAME]) |
|
517 |
# Corresponds to --with-extra-path |
|
518 |
BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_EXTRA_PATH]) |
|
519 |
# Corresponds to --with-toolchain-path |
|
520 |
BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_TOOLCHAIN_PATH]) |
|
521 |
# Corresponds to --with-sysroot |
|
522 |
BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_SYSROOT]) |
|
523 |
||
524 |
# Identifies the Visual Studio version in the devkit |
|
525 |
BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_VERSION]) |
|
526 |
# The Visual Studio include environment variable |
|
527 |
BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_INCLUDE]) |
|
528 |
# The Visual Studio lib environment variable |
|
529 |
BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_LIB]) |
|
530 |
# Corresponds to --with-msvcr-dll |
|
531 |
BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCR_DLL]) |
|
532 |
# Corresponds to --with-msvcp-dll |
|
533 |
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
|
534 |
fi |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
535 |
|
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
536 |
AC_MSG_CHECKING([for devkit]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
537 |
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
|
538 |
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
|
539 |
else |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
540 |
AC_MSG_RESULT([$DEVKIT_ROOT]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
541 |
fi |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
542 |
|
30022 | 543 |
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
|
544 |
|
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
545 |
# 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
|
546 |
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
|
547 |
DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/bin" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
548 |
fi |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
549 |
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
|
550 |
|
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
551 |
# 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
|
552 |
# places for backwards compatiblity. |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
553 |
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
|
554 |
SYSROOT="$DEVKIT_SYSROOT" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
555 |
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
|
556 |
SYSROOT="$DEVKIT_ROOT/$host_alias/libc" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
557 |
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
|
558 |
SYSROOT="$DEVKIT_ROOT/$host/sys-root" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
559 |
fi |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
560 |
] |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
561 |
) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
562 |
|
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
563 |
# 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
|
564 |
# is not correct. |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
565 |
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
|
566 |
[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
|
567 |
[SYSROOT=$with_sys_root] |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
568 |
) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
569 |
|
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
570 |
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
|
571 |
[use this directory as sysroot])], |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
572 |
[SYSROOT=$with_sysroot] |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
573 |
) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
574 |
|
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
575 |
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
|
576 |
[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
|
577 |
[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
|
578 |
) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
579 |
|
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
580 |
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
|
581 |
[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
|
582 |
[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
|
583 |
) |
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 |
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
|
586 |
[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
|
587 |
[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
|
588 |
) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
589 |
|
25034
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
590 |
if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then |
31123 | 591 |
# If a devkit has been supplied, find xcodebuild in the toolchain_path. |
592 |
# 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
|
593 |
# if no Xcode installed, xcodebuild exits with 1 |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
594 |
# if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0 |
31123 | 595 |
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
|
596 |
# 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
|
597 |
# 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
|
598 |
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
|
599 |
else |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
600 |
# 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
|
601 |
# 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
|
602 |
# are copied into the system frameworks |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
603 |
XCODEBUILD= |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
604 |
AC_SUBST(XCODEBUILD) |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
605 |
fi |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27586
diff
changeset
|
606 |
|
25034
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
607 |
AC_MSG_CHECKING([for sdk name]) |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
608 |
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
|
609 |
[use the platform SDK of the given name. @<:@macosx@:>@])], |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
610 |
[SDKNAME=$with_sdk_name] |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
611 |
) |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
612 |
AC_MSG_RESULT([$SDKNAME]) |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
613 |
|
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
614 |
# 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
|
615 |
HAVE_SYSTEM_FRAMEWORK_HEADERS=0 |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
616 |
test -z "$TOOLCHAIN_PATH" && \ |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
617 |
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
|
618 |
|
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
619 |
if test -z "$SYSROOT"; then |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
620 |
if test -n "$XCODEBUILD"; then |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
621 |
# 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
|
622 |
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
|
623 |
SDKNAME=${SDKNAME:-macosx} |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
624 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
625 |
|
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
626 |
if test -n "$SDKNAME"; then |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
627 |
# Call xcodebuild to determine SYSROOT |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
628 |
SYSROOT=`"$XCODEBUILD" -sdk $SDKNAME -version | grep '^Path: ' | sed 's/Path: //'` |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
629 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
630 |
else |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
631 |
if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
632 |
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
|
633 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
634 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
635 |
else |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
636 |
# warn user if --with-sdk-name was also set |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
637 |
if test -n "$with_sdk_name"; then |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
638 |
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
|
639 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
640 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
641 |
|
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
642 |
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
|
643 |
# 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
|
644 |
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
|
645 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
646 |
|
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
647 |
# Perform a basic sanity test |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
648 |
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
|
649 |
if test -z "$SYSROOT"; then |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
650 |
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
|
651 |
else |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
652 |
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
|
653 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
654 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
655 |
|
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
656 |
# set SDKROOT too, Xcode tools will pick it up |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
657 |
AC_SUBST(SDKROOT,$SYSROOT) |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
658 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
23428
diff
changeset
|
659 |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
660 |
# 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
|
661 |
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
|
662 |
|
20363 | 663 |
if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
664 |
# Add extra search paths on solaris for utilities like ar and as etc... |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
665 |
PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin" |
20363 | 666 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
667 |
|
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
668 |
AC_MSG_CHECKING([for sysroot]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
669 |
AC_MSG_RESULT([$SYSROOT]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
670 |
AC_MSG_CHECKING([for toolchain path]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
671 |
AC_MSG_RESULT([$TOOLCHAIN_PATH]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
672 |
AC_MSG_CHECKING([for extra path]) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
673 |
AC_MSG_RESULT([$EXTRA_PATH]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
674 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
675 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
676 |
AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
677 |
[ |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
678 |
|
20363 | 679 |
AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name], |
680 |
[use this as the name of the configuration @<:@generated from important configuration options@:>@])], |
|
681 |
[ CONF_NAME=${with_conf_name} ]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
682 |
|
20363 | 683 |
# Test from where we are running configure, in or outside of src root. |
22722 | 684 |
AC_MSG_CHECKING([where to store configuration]) |
20363 | 685 |
if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ |
686 |
|| test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ |
|
21759 | 687 |
|| test "x$CURDIR" = "x$SRC_ROOT/make" ; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
688 |
# We are running configure from the src root. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
689 |
# Create a default ./build/target-variant-debuglevel output root. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
690 |
if test "x${CONF_NAME}" = x; then |
22722 | 691 |
AC_MSG_RESULT([in default location]) |
20363 | 692 |
CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" |
22722 | 693 |
else |
694 |
AC_MSG_RESULT([in build directory with custom name]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
695 |
fi |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
696 |
OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" |
14111 | 697 |
$MKDIR -p "$OUTPUT_ROOT" |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
698 |
if test ! -d "$OUTPUT_ROOT"; then |
20363 | 699 |
AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
700 |
fi |
20363 | 701 |
else |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
702 |
# We are running configure from outside of the src dir. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
703 |
# Then use the current directory as output dir! |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
704 |
# 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
|
705 |
# directory name as configuration name, otherwise use the complete path. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
706 |
if test "x${CONF_NAME}" = x; then |
20363 | 707 |
CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"` |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
708 |
fi |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
709 |
OUTPUT_ROOT="$CURDIR" |
22722 | 710 |
AC_MSG_RESULT([in current directory]) |
14112
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
711 |
|
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
712 |
# 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
|
713 |
# have a configuration in this directory. Do some sanity checks! |
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
714 |
|
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
715 |
if test ! -e "$OUTPUT_ROOT/spec.gmk"; then |
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
716 |
# 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
|
717 |
# other files |
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
718 |
files_present=`$LS $OUTPUT_ROOT` |
20363 | 719 |
# 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
|
720 |
# is performed. |
30022 | 721 |
filtered_files=`$ECHO "$files_present" \ |
722 |
| $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
|
723 |
-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
|
724 |
-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
|
725 |
-e 's/ //g' \ |
30022 | 726 |
| $TR -d '\n'` |
14280
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14112
diff
changeset
|
727 |
if test "x$filtered_files" != x; then |
14112
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
728 |
AC_MSG_NOTICE([Current directory is $CURDIR.]) |
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
729 |
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
|
730 |
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
|
731 |
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
|
732 |
AC_MSG_NOTICE([seriously mess up just about everything.]) |
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
733 |
AC_MSG_NOTICE([Try 'cd $SRC_ROOT' and restart configure]) |
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
734 |
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
|
735 |
AC_MSG_ERROR([Will not continue creating configuration in $CURDIR]) |
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
736 |
fi |
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
737 |
fi |
20363 | 738 |
fi |
739 |
AC_MSG_CHECKING([what configuration name to use]) |
|
740 |
AC_MSG_RESULT([$CONF_NAME]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
741 |
|
20363 | 742 |
BASIC_FIXUP_PATH(OUTPUT_ROOT) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
743 |
|
29848
13db4da8a496
8077563: 9-dev 1-prebuild fail: "configure: error: write failure creating /config.status"
erikj
parents:
29790
diff
changeset
|
744 |
CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support" |
13db4da8a496
8077563: 9-dev 1-prebuild fail: "configure: error: write failure creating /config.status"
erikj
parents:
29790
diff
changeset
|
745 |
$MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR" |
13db4da8a496
8077563: 9-dev 1-prebuild fail: "configure: error: write failure creating /config.status"
erikj
parents:
29790
diff
changeset
|
746 |
|
20363 | 747 |
AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk) |
748 |
AC_SUBST(CONF_NAME, $CONF_NAME) |
|
749 |
AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) |
|
29790 | 750 |
AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
751 |
|
20363 | 752 |
# The spec.gmk file contains all variables for the make system. |
753 |
AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) |
|
754 |
# The hotspot-spec.gmk file contains legacy variables for the hotspot make system. |
|
755 |
AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in]) |
|
756 |
# The bootcycle-spec.gmk file contains support for boot cycle builds. |
|
757 |
AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in]) |
|
758 |
# The compare.sh is used to compare the build output to other builds. |
|
759 |
AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in]) |
|
760 |
# The generated Makefile knows where the spec.gmk is and where the source is. |
|
761 |
# You can run make from the OUTPUT_ROOT, or from the top-level Makefile |
|
762 |
# which will look for generated configurations |
|
763 |
AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) |
|
13133
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 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
766 |
#%%% Simple tools %%% |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
767 |
|
13697 | 768 |
# Check if we have found a usable version of make |
769 |
# $1: the path to a potential make binary (or empty) |
|
770 |
# $2: the description on how we found this |
|
771 |
AC_DEFUN([BASIC_CHECK_MAKE_VERSION], |
|
772 |
[ |
|
773 |
MAKE_CANDIDATE="$1" |
|
774 |
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
|
775 |
|
60e4eefce6e4
8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents:
29848
diff
changeset
|
776 |
# 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
|
777 |
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
|
778 |
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
|
779 |
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
|
780 |
else |
60e4eefce6e4
8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents:
29848
diff
changeset
|
781 |
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
|
782 |
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
|
783 |
fi |
60e4eefce6e4
8072023: Investigate and upgrade the minimum supported gnumake for JDK 9, from 3.81 to 4.0
erikj
parents:
29848
diff
changeset
|
784 |
|
13697 | 785 |
if test "x$MAKE_CANDIDATE" != x; then |
786 |
AC_MSG_NOTICE([Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION]) |
|
787 |
MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1` |
|
788 |
IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'` |
|
789 |
if test "x$IS_GNU_MAKE" = x; then |
|
790 |
AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.]) |
|
791 |
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
|
792 |
IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP $MAKE_VERSION_EXPR` |
13697 | 793 |
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
|
794 |
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 | 795 |
else |
796 |
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then |
|
797 |
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
|
798 |
MAKE_EXPECTED_ENV='cygwin' |
|
799 |
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
|
800 |
MAKE_EXPECTED_ENV='msys' |
|
801 |
else |
|
802 |
AC_MSG_ERROR([Unknown Windows environment]) |
|
803 |
fi |
|
804 |
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'` |
|
805 |
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV` |
|
806 |
else |
|
807 |
# Not relevant for non-Windows |
|
808 |
IS_MAKE_CORRECT_ENV=true |
|
809 |
fi |
|
810 |
if test "x$IS_MAKE_CORRECT_ENV" = x; then |
|
811 |
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.]) |
|
812 |
else |
|
813 |
FOUND_MAKE=$MAKE_CANDIDATE |
|
814 |
BASIC_FIXUP_EXECUTABLE(FOUND_MAKE) |
|
815 |
fi |
|
13697 | 816 |
fi |
817 |
fi |
|
818 |
fi |
|
819 |
]) |
|
820 |
||
25854 | 821 |
AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC], |
822 |
[ |
|
823 |
# Check if make supports the output sync option and if so, setup using it. |
|
824 |
AC_MSG_CHECKING([if make --output-sync is supported]) |
|
825 |
if $MAKE --version -O > /dev/null 2>&1; then |
|
826 |
OUTPUT_SYNC_SUPPORTED=true |
|
827 |
AC_MSG_RESULT([yes]) |
|
828 |
AC_MSG_CHECKING([for output-sync value]) |
|
829 |
AC_ARG_WITH([output-sync], [AS_HELP_STRING([--with-output-sync], |
|
830 |
[set make output sync type if supported by make. @<:@recurse@:>@])], |
|
831 |
[OUTPUT_SYNC=$with_output_sync]) |
|
832 |
if test "x$OUTPUT_SYNC" = "x"; then |
|
833 |
OUTPUT_SYNC=none |
|
834 |
fi |
|
835 |
AC_MSG_RESULT([$OUTPUT_SYNC]) |
|
836 |
if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then |
|
837 |
AC_MSG_ERROR([Make did not the support the value $OUTPUT_SYNC as output sync type.]) |
|
838 |
fi |
|
839 |
else |
|
840 |
OUTPUT_SYNC_SUPPORTED=false |
|
841 |
AC_MSG_RESULT([no]) |
|
842 |
fi |
|
843 |
AC_SUBST(OUTPUT_SYNC_SUPPORTED) |
|
844 |
AC_SUBST(OUTPUT_SYNC) |
|
845 |
]) |
|
846 |
||
13697 | 847 |
# Goes looking for a usable version of GNU make. |
848 |
AC_DEFUN([BASIC_CHECK_GNU_MAKE], |
|
849 |
[ |
|
850 |
# We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. |
|
851 |
if test "x$MAKE" != x; then |
|
852 |
# User has supplied a make, test it. |
|
853 |
if test ! -f "$MAKE"; then |
|
854 |
AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not found.]) |
|
855 |
fi |
|
14111 | 856 |
BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE]) |
13697 | 857 |
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
|
858 |
AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make $MAKE_REQUIRED_VERSION or newer.]) |
13697 | 859 |
fi |
860 |
else |
|
861 |
# Try our hardest to locate a correct version of GNU make |
|
862 |
AC_PATH_PROGS(CHECK_GMAKE, gmake) |
|
863 |
BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH]) |
|
864 |
||
865 |
if test "x$FOUND_MAKE" = x; then |
|
866 |
AC_PATH_PROGS(CHECK_MAKE, make) |
|
867 |
BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [make in PATH]) |
|
868 |
fi |
|
869 |
||
870 |
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
|
871 |
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
|
872 |
# We have a toolchain path, check that as well before giving up. |
13697 | 873 |
OLD_PATH=$PATH |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22726
diff
changeset
|
874 |
PATH=$TOOLCHAIN_PATH:$PATH |
13697 | 875 |
AC_PATH_PROGS(CHECK_TOOLSDIR_GMAKE, gmake) |
876 |
BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_GMAKE", [gmake in tools-dir]) |
|
877 |
if test "x$FOUND_MAKE" = x; then |
|
878 |
AC_PATH_PROGS(CHECK_TOOLSDIR_MAKE, make) |
|
879 |
BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_MAKE", [make in tools-dir]) |
|
880 |
fi |
|
881 |
PATH=$OLD_PATH |
|
882 |
fi |
|
883 |
fi |
|
884 |
||
885 |
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
|
886 |
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 | 887 |
fi |
888 |
fi |
|
889 |
||
890 |
MAKE=$FOUND_MAKE |
|
891 |
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
|
892 |
AC_MSG_NOTICE([Using GNU make at $FOUND_MAKE (version: $MAKE_VERSION_STRING)]) |
25854 | 893 |
|
894 |
BASIC_CHECK_MAKE_OUTPUT_SYNC |
|
13697 | 895 |
]) |
896 |
||
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
897 |
AC_DEFUN([BASIC_CHECK_FIND_DELETE], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
898 |
[ |
20363 | 899 |
# Test if find supports -delete |
900 |
AC_MSG_CHECKING([if find supports -delete]) |
|
901 |
FIND_DELETE="-delete" |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
902 |
|
20363 | 903 |
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
|
904 |
|
20363 | 905 |
echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
906 |
|
20363 | 907 |
TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1` |
908 |
if test -f $DELETEDIR/TestIfFindSupportsDelete; then |
|
909 |
# No, it does not. |
|
910 |
rm $DELETEDIR/TestIfFindSupportsDelete |
|
26130
2ea1262921e0
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
25882
diff
changeset
|
911 |
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
|
912 |
# AIX 'find' is buggy if called with '-exec {} \+' and an empty file list |
2ea1262921e0
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
25882
diff
changeset
|
913 |
FIND_DELETE="-print | xargs rm" |
2ea1262921e0
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
25882
diff
changeset
|
914 |
else |
2ea1262921e0
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
25882
diff
changeset
|
915 |
FIND_DELETE="-exec rm \{\} \+" |
2ea1262921e0
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
25882
diff
changeset
|
916 |
fi |
20363 | 917 |
AC_MSG_RESULT([no]) |
918 |
else |
|
919 |
AC_MSG_RESULT([yes]) |
|
920 |
fi |
|
921 |
rmdir $DELETEDIR |
|
922 |
AC_SUBST(FIND_DELETE) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
923 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
924 |
|
14111 | 925 |
AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS], |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
926 |
[ |
20363 | 927 |
BASIC_CHECK_GNU_MAKE |
13697 | 928 |
|
20363 | 929 |
BASIC_CHECK_FIND_DELETE |
13697 | 930 |
|
20363 | 931 |
# These tools might not be installed by default, |
932 |
# need hint on how to install them. |
|
22475 | 933 |
BASIC_REQUIRE_PROGS(UNZIP, unzip) |
934 |
BASIC_REQUIRE_PROGS(ZIP, zip) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
935 |
|
20363 | 936 |
# Non-required basic tools |
13697 | 937 |
|
22475 | 938 |
BASIC_PATH_PROGS(LDD, ldd) |
20363 | 939 |
if test "x$LDD" = "x"; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
940 |
# List shared lib dependencies is used for |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
941 |
# debug output and checking for forbidden dependencies. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
942 |
# We can build without it. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
943 |
LDD="true" |
20363 | 944 |
fi |
22475 | 945 |
BASIC_PATH_PROGS(OTOOL, otool) |
20363 | 946 |
if test "x$OTOOL" = "x"; then |
947 |
OTOOL="true" |
|
948 |
fi |
|
22475 | 949 |
BASIC_PATH_PROGS(READELF, [greadelf readelf]) |
950 |
BASIC_PATH_PROGS(HG, hg) |
|
951 |
BASIC_PATH_PROGS(STAT, stat) |
|
952 |
BASIC_PATH_PROGS(TIME, time) |
|
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
31123
diff
changeset
|
953 |
BASIC_PATH_PROGS(PATCH, [gpatch patch]) |
20363 | 954 |
# Check if it's GNU time |
955 |
IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'` |
|
956 |
if test "x$IS_GNU_TIME" != x; then |
|
957 |
IS_GNU_TIME=yes |
|
958 |
else |
|
959 |
IS_GNU_TIME=no |
|
960 |
fi |
|
961 |
AC_SUBST(IS_GNU_TIME) |
|
14111 | 962 |
|
20363 | 963 |
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
22475 | 964 |
BASIC_REQUIRE_PROGS(DSYMUTIL, dsymutil) |
965 |
BASIC_REQUIRE_PROGS(XATTR, xattr) |
|
966 |
BASIC_PATH_PROGS(CODESIGN, codesign) |
|
20363 | 967 |
if test "x$CODESIGN" != "x"; then |
968 |
# Verify that the openjdk_codesign certificate is present |
|
969 |
AC_MSG_CHECKING([if openjdk_codesign certificate is present]) |
|
970 |
rm -f codesign-testfile |
|
971 |
touch codesign-testfile |
|
972 |
codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN= |
|
973 |
rm -f codesign-testfile |
|
974 |
if test "x$CODESIGN" = x; then |
|
975 |
AC_MSG_RESULT([no]) |
|
976 |
else |
|
977 |
AC_MSG_RESULT([yes]) |
|
978 |
fi |
|
17661
55c5e0f7b9cc
8013489: New build system does not run codesign on SA-related launchers on OS X
erikj
parents:
17593
diff
changeset
|
979 |
fi |
31123 | 980 |
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
|
981 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
982 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
983 |
|
14111 | 984 |
# Check if build directory is on local disk. If not possible to determine, |
985 |
# we prefer to claim it's local. |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
986 |
# Argument 1: directory to test |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
987 |
# 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
|
988 |
# Argument 3: what to do otherwise (remote disk or failure) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
989 |
AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
990 |
[ |
20363 | 991 |
# df -l lists only local disks; if the given directory is not found then |
992 |
# a non-zero exit code is given |
|
14111 | 993 |
if test "x$DF" = x; then |
994 |
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
|
995 |
# msys does not have df; use Windows "net use" instead. |
|
996 |
IS_NETWORK_DISK=`net use | grep \`pwd -W | cut -d ":" -f 1 | tr a-z A-Z\`:` |
|
997 |
if test "x$IS_NETWORK_DISK" = x; then |
|
998 |
$2 |
|
999 |
else |
|
1000 |
$3 |
|
1001 |
fi |
|
1002 |
else |
|
1003 |
# No df here, say it's local |
|
1004 |
$2 |
|
1005 |
fi |
|
1006 |
else |
|
1007 |
if $DF -l $1 > /dev/null 2>&1; then |
|
1008 |
$2 |
|
1009 |
else |
|
1010 |
$3 |
|
1011 |
fi |
|
1012 |
fi |
|
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 |
|
15050
98a901883580
8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents:
14736
diff
changeset
|
1015 |
# 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
|
1016 |
# not be the case in cygwin in certain conditions. |
98a901883580
8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents:
14736
diff
changeset
|
1017 |
AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS], |
98a901883580
8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents:
14736
diff
changeset
|
1018 |
[ |
25882 | 1019 |
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
15050
98a901883580
8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents:
14736
diff
changeset
|
1020 |
file_to_test="$SRC_ROOT/LICENSE" |
98a901883580
8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents:
14736
diff
changeset
|
1021 |
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
|
1022 |
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
|
1023 |
fi |
98a901883580
8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents:
14736
diff
changeset
|
1024 |
fi |
98a901883580
8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents:
14736
diff
changeset
|
1025 |
]) |
98a901883580
8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents:
14736
diff
changeset
|
1026 |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1027 |
AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1028 |
[ |
22475 | 1029 |
# Did user specify any unknown variables? |
1030 |
BASIC_CHECK_LEFTOVER_OVERRIDDEN |
|
1031 |
||
20363 | 1032 |
AC_MSG_CHECKING([if build directory is on local disk]) |
1033 |
BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT, |
|
1034 |
[OUTPUT_DIR_IS_LOCAL="yes"], |
|
1035 |
[OUTPUT_DIR_IS_LOCAL="no"]) |
|
1036 |
AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1037 |
|
20363 | 1038 |
BASIC_CHECK_SRC_PERMS |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1039 |
|
20363 | 1040 |
# Check if the user has any old-style ALT_ variables set. |
1041 |
FOUND_ALT_VARIABLES=`env | grep ^ALT_` |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1042 |
|
20363 | 1043 |
# Before generating output files, test if they exist. If they do, this is a reconfigure. |
1044 |
# Since we can't properly handle the dependencies for this, warn the user about the situation |
|
1045 |
if test -e $OUTPUT_ROOT/spec.gmk; then |
|
1046 |
IS_RECONFIGURE=yes |
|
1047 |
else |
|
1048 |
IS_RECONFIGURE=no |
|
1049 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1050 |
]) |
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1051 |
|
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1052 |
# 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
|
1053 |
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
|
1054 |
[ |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1055 |
# 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
|
1056 |
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
|
1057 |
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
|
1058 |
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
|
1059 |
AC_MSG_RESULT([yes]) |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1060 |
else |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1061 |
AC_MSG_RESULT([no]) |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1062 |
fi |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1063 |
|
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1064 |
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
|
1065 |
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
|
1066 |
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
|
1067 |
AC_MSG_RESULT([yes]) |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1068 |
else |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1069 |
AC_MSG_RESULT([no]) |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1070 |
fi |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1071 |
|
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1072 |
AC_SUBST(BASH_ARGS) |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27595
diff
changeset
|
1073 |
]) |
30417
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1074 |
|
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1075 |
# Code to run after AC_OUTPUT |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1076 |
AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT], |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1077 |
[ |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1078 |
# 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
|
1079 |
if test -e ./config.log; then |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1080 |
$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
|
1081 |
fi |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1082 |
|
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1083 |
# Rotate our log file (configure.log) |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1084 |
if test -e "$OUTPUT_ROOT/configure.log.old"; then |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1085 |
$RM -f "$OUTPUT_ROOT/configure.log.old" |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1086 |
fi |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1087 |
if test -e "$OUTPUT_ROOT/configure.log"; then |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1088 |
$MV -f "$OUTPUT_ROOT/configure.log" "$OUTPUT_ROOT/configure.log.old" 2> /dev/null |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1089 |
fi |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1090 |
|
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1091 |
# 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
|
1092 |
if test -e ./configure.log; then |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1093 |
echo found it |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1094 |
$MV -f ./configure.log "$OUTPUT_ROOT/configure.log" 2> /dev/null |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1095 |
fi |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1096 |
|
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1097 |
# Make the compare script executable |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1098 |
$CHMOD +x $OUTPUT_ROOT/compare.sh |
581a2762eef1
8079891: Store configure log in $BUILD/configure.log
ihse
parents:
30022
diff
changeset
|
1099 |
]) |