author | alanb |
Mon, 13 Jan 2014 16:17:43 +0000 | |
changeset 22422 | d78560f1057f |
parent 21057 | 6cfd8ccbfbbc |
child 22467 | b16a5ae55d50 |
child 22176 | 3dae78c445a6 |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
15056
6a7cbe3b0f08
8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents:
15055
diff
changeset
|
2 |
# Copyright (c) 2011, 2013, 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 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
26 |
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
27 |
[ |
20363 | 28 |
############################################################################### |
29 |
# |
|
30 |
# Check which variant of the JDK that we want to build. |
|
31 |
# Currently we have: |
|
32 |
# normal: standard edition |
|
33 |
# but the custom make system may add other variants |
|
34 |
# |
|
35 |
# Effectively the JDK variant gives a name to a specific set of |
|
36 |
# modules to compile into the JDK. In the future, these modules |
|
37 |
# might even be Jigsaw modules. |
|
38 |
# |
|
39 |
AC_MSG_CHECKING([which variant of the JDK to build]) |
|
40 |
AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant], |
|
41 |
[JDK variant to build (normal) @<:@normal@:>@])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
42 |
|
20363 | 43 |
if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
44 |
JDK_VARIANT="normal" |
20363 | 45 |
else |
13697 | 46 |
AC_MSG_ERROR([The available JDK variants are: normal]) |
20363 | 47 |
fi |
13697 | 48 |
|
20363 | 49 |
AC_SUBST(JDK_VARIANT) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
50 |
|
20363 | 51 |
AC_MSG_RESULT([$JDK_VARIANT]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
52 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
53 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
54 |
AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
55 |
[ |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
56 |
|
20363 | 57 |
############################################################################### |
58 |
# |
|
59 |
# Check which variants of the JVM that we want to build. |
|
60 |
# Currently we have: |
|
61 |
# server: normal interpreter and a tiered C1/C2 compiler |
|
62 |
# client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms) |
|
63 |
# minimal1: reduced form of client with optional VM services and features stripped out |
|
64 |
# kernel: kernel footprint JVM that passes the TCK without major performance problems, |
|
65 |
# ie normal interpreter and C1, only the serial GC, kernel jvmti etc |
|
66 |
# zero: no machine code interpreter, no compiler |
|
67 |
# zeroshark: zero interpreter and shark/llvm compiler backend |
|
68 |
AC_MSG_CHECKING([which variants of the JVM to build]) |
|
69 |
AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants], |
|
70 |
[JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark) @<:@server@:>@])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
71 |
|
20363 | 72 |
if test "x$with_jvm_variants" = x; then |
73 |
with_jvm_variants="server" |
|
74 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
75 |
|
20363 | 76 |
JVM_VARIANTS=",$with_jvm_variants," |
77 |
TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'` |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
78 |
|
20363 | 79 |
if test "x$TEST_VARIANTS" != "x,"; then |
80 |
AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark]) |
|
81 |
fi |
|
82 |
AC_MSG_RESULT([$with_jvm_variants]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
83 |
|
20363 | 84 |
JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'` |
85 |
JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` |
|
86 |
JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'` |
|
87 |
JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'` |
|
88 |
JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` |
|
89 |
JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
90 |
|
20363 | 91 |
if test "x$JVM_VARIANT_CLIENT" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
92 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
20363 | 93 |
AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
94 |
fi |
20363 | 95 |
fi |
96 |
if test "x$JVM_VARIANT_KERNEL" = xtrue; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
97 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
20363 | 98 |
AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
99 |
fi |
20363 | 100 |
fi |
101 |
if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then |
|
14810 | 102 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
20363 | 103 |
AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.]) |
14810 | 104 |
fi |
20363 | 105 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
106 |
|
20363 | 107 |
# Replace the commas with AND for use in the build directory name. |
108 |
ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` |
|
109 |
COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` |
|
110 |
if test "x$COUNT_VARIANTS" != "x,1"; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
111 |
BUILDING_MULTIPLE_JVM_VARIANTS=yes |
20363 | 112 |
else |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
113 |
BUILDING_MULTIPLE_JVM_VARIANTS=no |
20363 | 114 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
115 |
|
20363 | 116 |
AC_SUBST(JVM_VARIANTS) |
117 |
AC_SUBST(JVM_VARIANT_SERVER) |
|
118 |
AC_SUBST(JVM_VARIANT_CLIENT) |
|
119 |
AC_SUBST(JVM_VARIANT_MINIMAL1) |
|
120 |
AC_SUBST(JVM_VARIANT_KERNEL) |
|
121 |
AC_SUBST(JVM_VARIANT_ZERO) |
|
122 |
AC_SUBST(JVM_VARIANT_ZEROSHARK) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
123 |
|
20363 | 124 |
INCLUDE_SA=true |
125 |
if test "x$JVM_VARIANT_ZERO" = xtrue ; then |
|
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16423
diff
changeset
|
126 |
INCLUDE_SA=false |
20363 | 127 |
fi |
128 |
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then |
|
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16423
diff
changeset
|
129 |
INCLUDE_SA=false |
20363 | 130 |
fi |
131 |
AC_SUBST(INCLUDE_SA) |
|
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16423
diff
changeset
|
132 |
|
20363 | 133 |
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
134 |
MACOSX_UNIVERSAL="true" |
|
135 |
fi |
|
13697 | 136 |
|
20363 | 137 |
AC_SUBST(MACOSX_UNIVERSAL) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
138 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
139 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
140 |
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
141 |
[ |
20363 | 142 |
############################################################################### |
143 |
# |
|
144 |
# Set the debug level |
|
145 |
# release: no debug information, all optimizations, no asserts. |
|
146 |
# fastdebug: debug information (-g), all optimizations, all asserts |
|
147 |
# slowdebug: debug information (-g), no optimizations, all asserts |
|
148 |
# |
|
149 |
DEBUG_LEVEL="release" |
|
150 |
AC_MSG_CHECKING([which debug level to use]) |
|
151 |
AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], |
|
152 |
[set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])], |
|
153 |
[ |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
154 |
ENABLE_DEBUG="${enableval}" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
155 |
DEBUG_LEVEL="fastdebug" |
20363 | 156 |
], [ENABLE_DEBUG="no"]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
157 |
|
20363 | 158 |
AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level], |
159 |
[set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])], |
|
160 |
[ |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
161 |
DEBUG_LEVEL="${withval}" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
162 |
if test "x$ENABLE_DEBUG" = xyes; then |
20363 | 163 |
AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
164 |
fi |
20363 | 165 |
]) |
166 |
AC_MSG_RESULT([$DEBUG_LEVEL]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
167 |
|
20363 | 168 |
if test "x$DEBUG_LEVEL" != xrelease && \ |
169 |
test "x$DEBUG_LEVEL" != xfastdebug && \ |
|
170 |
test "x$DEBUG_LEVEL" != xslowdebug; then |
|
171 |
AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug]) |
|
172 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
173 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
174 |
|
20363 | 175 |
############################################################################### |
176 |
# |
|
177 |
# Setup legacy vars/targets and new vars to deal with different debug levels. |
|
178 |
# |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
179 |
|
20363 | 180 |
case $DEBUG_LEVEL in |
181 |
release ) |
|
182 |
VARIANT="OPT" |
|
183 |
FASTDEBUG="false" |
|
184 |
DEBUG_CLASSFILES="false" |
|
185 |
BUILD_VARIANT_RELEASE="" |
|
186 |
HOTSPOT_DEBUG_LEVEL="product" |
|
187 |
HOTSPOT_EXPORT="product" |
|
188 |
;; |
|
189 |
fastdebug ) |
|
190 |
VARIANT="DBG" |
|
191 |
FASTDEBUG="true" |
|
192 |
DEBUG_CLASSFILES="true" |
|
193 |
BUILD_VARIANT_RELEASE="-fastdebug" |
|
194 |
HOTSPOT_DEBUG_LEVEL="fastdebug" |
|
195 |
HOTSPOT_EXPORT="fastdebug" |
|
196 |
;; |
|
197 |
slowdebug ) |
|
198 |
VARIANT="DBG" |
|
199 |
FASTDEBUG="false" |
|
200 |
DEBUG_CLASSFILES="true" |
|
201 |
BUILD_VARIANT_RELEASE="-debug" |
|
202 |
HOTSPOT_DEBUG_LEVEL="jvmg" |
|
203 |
HOTSPOT_EXPORT="debug" |
|
204 |
;; |
|
205 |
esac |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
206 |
|
20363 | 207 |
##### |
208 |
# Generate the legacy makefile targets for hotspot. |
|
209 |
# The hotspot api for selecting the build artifacts, really, needs to be improved. |
|
210 |
# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to |
|
211 |
# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc |
|
212 |
# But until then ... |
|
213 |
HOTSPOT_TARGET="" |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
214 |
|
20363 | 215 |
if test "x$JVM_VARIANT_SERVER" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
216 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} " |
20363 | 217 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
218 |
|
20363 | 219 |
if test "x$JVM_VARIANT_CLIENT" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
220 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 " |
20363 | 221 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
222 |
|
20363 | 223 |
if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then |
14810 | 224 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 " |
20363 | 225 |
fi |
14810 | 226 |
|
20363 | 227 |
if test "x$JVM_VARIANT_KERNEL" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
228 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel " |
20363 | 229 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
230 |
|
20363 | 231 |
if test "x$JVM_VARIANT_ZERO" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
232 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero " |
20363 | 233 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
234 |
|
20363 | 235 |
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
236 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark " |
20363 | 237 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
238 |
|
20363 | 239 |
HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT" |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
240 |
|
20363 | 241 |
# On Macosx universal binaries are produced, but they only contain |
242 |
# 64 bit intel. This invalidates control of which jvms are built |
|
243 |
# from configure, but only server is valid anyway. Fix this |
|
244 |
# when hotspot makefiles are rewritten. |
|
245 |
if test "x$MACOSX_UNIVERSAL" = xtrue; then |
|
15054
e649ff651503
8004490: build-infra: mac: hotspot is always built in product, regardless of --with-debug-level setting
erikj
parents:
14810
diff
changeset
|
246 |
HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} |
20363 | 247 |
fi |
13697 | 248 |
|
20363 | 249 |
##### |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
250 |
|
20363 | 251 |
AC_SUBST(DEBUG_LEVEL) |
252 |
AC_SUBST(VARIANT) |
|
253 |
AC_SUBST(FASTDEBUG) |
|
254 |
AC_SUBST(DEBUG_CLASSFILES) |
|
255 |
AC_SUBST(BUILD_VARIANT_RELEASE) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
256 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
257 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
258 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
259 |
############################################################################### |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
260 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
261 |
# Should we build only OpenJDK even if closed sources are present? |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
262 |
# |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
263 |
AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM], |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
264 |
[ |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
265 |
AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only], |
20363 | 266 |
[suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"]) |
14111 | 267 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
268 |
AC_MSG_CHECKING([for presence of closed sources]) |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
269 |
if test -d "$SRC_ROOT/jdk/src/closed"; then |
14111 | 270 |
CLOSED_SOURCE_PRESENT=yes |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
271 |
else |
14111 | 272 |
CLOSED_SOURCE_PRESENT=no |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
273 |
fi |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
274 |
AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
275 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
276 |
AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)]) |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
277 |
SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only" |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
278 |
AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE]) |
14111 | 279 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
280 |
if test "x$CLOSED_SOURCE_PRESENT" = xno; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
281 |
OPENJDK=true |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
282 |
if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
283 |
AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense]) |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
284 |
fi |
14111 | 285 |
else |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
286 |
if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
287 |
OPENJDK=true |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
288 |
else |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
289 |
OPENJDK=false |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
290 |
fi |
14111 | 291 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
292 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
293 |
if test "x$OPENJDK" = "xtrue"; then |
14111 | 294 |
SET_OPENJDK="OPENJDK=true" |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
295 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
296 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
297 |
AC_SUBST(SET_OPENJDK) |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
298 |
]) |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
299 |
|
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
300 |
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
301 |
[ |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
302 |
|
20363 | 303 |
############################################################################### |
304 |
# |
|
305 |
# Should we build a JDK/JVM with headful support (ie a graphical ui)? |
|
306 |
# We always build headless support. |
|
307 |
# |
|
308 |
AC_MSG_CHECKING([headful support]) |
|
309 |
AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful], |
|
310 |
[disable building headful support (graphical UI support) @<:@enabled@:>@])], |
|
311 |
[SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
312 |
|
20363 | 313 |
SUPPORT_HEADLESS=yes |
314 |
BUILD_HEADLESS="BUILD_HEADLESS:=true" |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
315 |
|
20363 | 316 |
if test "x$SUPPORT_HEADFUL" = xyes; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
317 |
# We are building both headful and headless. |
20273 | 318 |
headful_msg="include support for both headful and headless" |
20363 | 319 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
320 |
|
20363 | 321 |
if test "x$SUPPORT_HEADFUL" = xno; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
322 |
# Thus we are building headless only. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
323 |
BUILD_HEADLESS="BUILD_HEADLESS:=true" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
324 |
headful_msg="headless only" |
20363 | 325 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
326 |
|
20363 | 327 |
AC_MSG_RESULT([$headful_msg]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
328 |
|
20363 | 329 |
AC_SUBST(SUPPORT_HEADLESS) |
330 |
AC_SUBST(SUPPORT_HEADFUL) |
|
331 |
AC_SUBST(BUILD_HEADLESS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
332 |
|
20363 | 333 |
# Control wether Hotspot runs Queens test after build. |
334 |
AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build], |
|
335 |
[run the Queens test after Hotspot build @<:@disabled@:>@])],, |
|
336 |
[enable_hotspot_test_in_build=no]) |
|
337 |
if test "x$enable_hotspot_test_in_build" = "xyes"; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
338 |
TEST_IN_BUILD=true |
20363 | 339 |
else |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
340 |
TEST_IN_BUILD=false |
20363 | 341 |
fi |
342 |
AC_SUBST(TEST_IN_BUILD) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
343 |
|
20363 | 344 |
############################################################################### |
345 |
# |
|
346 |
# Choose cacerts source file |
|
347 |
# |
|
348 |
AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file], |
|
349 |
[specify alternative cacerts file])]) |
|
350 |
if test "x$with_cacerts_file" != x; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
351 |
CACERTS_FILE=$with_cacerts_file |
20363 | 352 |
else |
17819
cd99349ffc0d
8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents:
17663
diff
changeset
|
353 |
CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts |
20363 | 354 |
fi |
355 |
AC_SUBST(CACERTS_FILE) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
356 |
|
20363 | 357 |
############################################################################### |
358 |
# |
|
359 |
# Enable or disable unlimited crypto |
|
360 |
# |
|
361 |
AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto], |
|
362 |
[Enable unlimited crypto policy @<:@disabled@:>@])],, |
|
363 |
[enable_unlimited_crypto=no]) |
|
364 |
if test "x$enable_unlimited_crypto" = "xyes"; then |
|
14112
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
365 |
UNLIMITED_CRYPTO=true |
20363 | 366 |
else |
14112
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
367 |
UNLIMITED_CRYPTO=false |
20363 | 368 |
fi |
369 |
AC_SUBST(UNLIMITED_CRYPTO) |
|
14112
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
370 |
|
20363 | 371 |
############################################################################### |
372 |
# |
|
373 |
# Enable or disable the elliptic curve crypto implementation |
|
374 |
# |
|
375 |
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], |
|
376 |
[ |
|
377 |
AC_MSG_CHECKING([if elliptic curve crypto implementation is present]) |
|
15914
1338d1e0e058
8010030: Allow configure to detect if EC implementation is present
omajid
parents:
15180
diff
changeset
|
378 |
|
20363 | 379 |
if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then |
380 |
ENABLE_INTREE_EC=yes |
|
381 |
AC_MSG_RESULT([yes]) |
|
382 |
else |
|
383 |
ENABLE_INTREE_EC=no |
|
384 |
AC_MSG_RESULT([no]) |
|
385 |
fi |
|
15914
1338d1e0e058
8010030: Allow configure to detect if EC implementation is present
omajid
parents:
15180
diff
changeset
|
386 |
|
20363 | 387 |
AC_SUBST(ENABLE_INTREE_EC) |
388 |
]) |
|
15914
1338d1e0e058
8010030: Allow configure to detect if EC implementation is present
omajid
parents:
15180
diff
changeset
|
389 |
|
20363 | 390 |
############################################################################### |
391 |
# |
|
392 |
# Compress jars |
|
393 |
# |
|
394 |
COMPRESS_JARS=false |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
395 |
|
20363 | 396 |
AC_SUBST(COMPRESS_JARS) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
397 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
398 |
|
15056
6a7cbe3b0f08
8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents:
15055
diff
changeset
|
399 |
############################################################################### |
6a7cbe3b0f08
8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents:
15055
diff
changeset
|
400 |
# |
6a7cbe3b0f08
8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents:
15055
diff
changeset
|
401 |
# Setup version numbers |
6a7cbe3b0f08
8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents:
15055
diff
changeset
|
402 |
# |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
403 |
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
404 |
[ |
20363 | 405 |
# Source the version numbers |
406 |
. $AUTOCONF_DIR/version-numbers |
|
15055
25fc052ccadd
8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents:
15054
diff
changeset
|
407 |
|
20363 | 408 |
# Get the settings from parameters |
409 |
AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], |
|
410 |
[Set milestone value for build @<:@internal@:>@])]) |
|
411 |
if test "x$with_milestone" = xyes; then |
|
412 |
AC_MSG_ERROR([Milestone must have a value]) |
|
413 |
elif test "x$with_milestone" != x; then |
|
15055
25fc052ccadd
8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents:
15054
diff
changeset
|
414 |
MILESTONE="$with_milestone" |
20363 | 415 |
fi |
416 |
if test "x$MILESTONE" = x; then |
|
417 |
MILESTONE=internal |
|
418 |
fi |
|
15055
25fc052ccadd
8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents:
15054
diff
changeset
|
419 |
|
20363 | 420 |
AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version], |
421 |
[Set update version value for build @<:@b00@:>@])]) |
|
422 |
if test "x$with_update_version" = xyes; then |
|
423 |
AC_MSG_ERROR([Update version must have a value]) |
|
424 |
elif test "x$with_update_version" != x; then |
|
425 |
JDK_UPDATE_VERSION="$with_update_version" |
|
426 |
fi |
|
17663
d2ae6f7a7e7b
8015784: Add configure parameter --with-update-version
erikj
parents:
16581
diff
changeset
|
427 |
|
20363 | 428 |
AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], |
429 |
[Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])]) |
|
430 |
if test "x$with_user_release_suffix" = xyes; then |
|
431 |
AC_MSG_ERROR([Release suffix must have a value]) |
|
432 |
elif test "x$with_user_release_suffix" != x; then |
|
433 |
USER_RELEASE_SUFFIX="$with_user_release_suffix" |
|
434 |
fi |
|
20275
bdf86ab49b78
8005924: Make it possible to set both --with-user-release-suffix and --with-build-number
erikj
parents:
20273
diff
changeset
|
435 |
|
20363 | 436 |
AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], |
437 |
[Set build number value for build @<:@b00@:>@])]) |
|
438 |
if test "x$with_build_number" = xyes; then |
|
439 |
AC_MSG_ERROR([Build number must have a value]) |
|
440 |
elif test "x$with_build_number" != x; then |
|
441 |
JDK_BUILD_NUMBER="$with_build_number" |
|
20275
bdf86ab49b78
8005924: Make it possible to set both --with-user-release-suffix and --with-build-number
erikj
parents:
20273
diff
changeset
|
442 |
fi |
20363 | 443 |
# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set |
444 |
if test "x$JDK_BUILD_NUMBER" = x; then |
|
445 |
JDK_BUILD_NUMBER=b00 |
|
446 |
if test "x$USER_RELEASE_SUFFIX" = x; then |
|
447 |
BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` |
|
448 |
# Avoid [:alnum:] since it depends on the locale. |
|
449 |
CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` |
|
450 |
USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
|
451 |
fi |
|
452 |
fi |
|
15055
25fc052ccadd
8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents:
15054
diff
changeset
|
453 |
|
20363 | 454 |
# Now set the JDK version, milestone, build number etc. |
455 |
AC_SUBST(USER_RELEASE_SUFFIX) |
|
456 |
AC_SUBST(JDK_MAJOR_VERSION) |
|
457 |
AC_SUBST(JDK_MINOR_VERSION) |
|
458 |
AC_SUBST(JDK_MICRO_VERSION) |
|
459 |
AC_SUBST(JDK_UPDATE_VERSION) |
|
460 |
AC_SUBST(JDK_BUILD_NUMBER) |
|
461 |
AC_SUBST(MILESTONE) |
|
462 |
AC_SUBST(LAUNCHER_NAME) |
|
463 |
AC_SUBST(PRODUCT_NAME) |
|
464 |
AC_SUBST(PRODUCT_SUFFIX) |
|
465 |
AC_SUBST(JDK_RC_PLATFORM_NAME) |
|
466 |
AC_SUBST(COMPANY_NAME) |
|
467 |
AC_SUBST(MACOSX_BUNDLE_NAME_BASE) |
|
468 |
AC_SUBST(MACOSX_BUNDLE_ID_BASE) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
469 |
|
20363 | 470 |
COPYRIGHT_YEAR=`date +'%Y'` |
471 |
AC_SUBST(COPYRIGHT_YEAR) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
472 |
|
20363 | 473 |
if test "x$JDK_UPDATE_VERSION" != x; then |
474 |
JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" |
|
475 |
else |
|
476 |
JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" |
|
477 |
fi |
|
478 |
AC_SUBST(JDK_VERSION) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
479 |
|
20363 | 480 |
COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` |
481 |
AC_SUBST(COOKED_BUILD_NUMBER) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
482 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
483 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
484 |
AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
485 |
[ |
20363 | 486 |
HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET" |
487 |
AC_SUBST(HOTSPOT_MAKE_ARGS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
488 |
|
20363 | 489 |
# The name of the Service Agent jar. |
490 |
SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}" |
|
491 |
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
|
492 |
SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" |
|
493 |
fi |
|
494 |
AC_SUBST(SALIB_NAME) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
495 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
496 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
497 |
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
498 |
[ |
20363 | 499 |
# |
500 |
# ENABLE_DEBUG_SYMBOLS |
|
501 |
# This must be done after the toolchain is setup, since we're looking at objcopy. |
|
502 |
# |
|
503 |
AC_ARG_ENABLE([debug-symbols], |
|
504 |
[AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
505 |
|
20363 | 506 |
AC_MSG_CHECKING([if we should generate debug symbols]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
507 |
|
20363 | 508 |
if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then |
509 |
# explicit enabling of enable-debug-symbols and can't find objcopy |
|
510 |
# this is an error |
|
511 |
AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols]) |
|
512 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
513 |
|
20363 | 514 |
if test "x$enable_debug_symbols" = "xyes"; then |
14615
2616975e69d3
8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents:
14112
diff
changeset
|
515 |
ENABLE_DEBUG_SYMBOLS=true |
20363 | 516 |
elif test "x$enable_debug_symbols" = "xno"; then |
517 |
ENABLE_DEBUG_SYMBOLS=false |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
518 |
else |
21057
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
519 |
# Default is on if objcopy is found |
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
520 |
if test "x$OBJCOPY" != x; then |
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
521 |
ENABLE_DEBUG_SYMBOLS=true |
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
522 |
# MacOS X and Windows don't use objcopy but default is on for those OSes |
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
523 |
elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then |
20363 | 524 |
ENABLE_DEBUG_SYMBOLS=true |
525 |
else |
|
526 |
ENABLE_DEBUG_SYMBOLS=false |
|
527 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
528 |
fi |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
529 |
|
20363 | 530 |
AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
531 |
|
20363 | 532 |
# |
533 |
# ZIP_DEBUGINFO_FILES |
|
534 |
# |
|
535 |
AC_MSG_CHECKING([if we should zip debug-info files]) |
|
536 |
AC_ARG_ENABLE([zip-debug-info], |
|
537 |
[AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])], |
|
538 |
[enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"]) |
|
539 |
AC_MSG_RESULT([${enable_zip_debug_info}]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
540 |
|
20363 | 541 |
if test "x${enable_zip_debug_info}" = "xno"; then |
542 |
ZIP_DEBUGINFO_FILES=false |
|
543 |
else |
|
544 |
ZIP_DEBUGINFO_FILES=true |
|
545 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
546 |
|
20363 | 547 |
AC_SUBST(ENABLE_DEBUG_SYMBOLS) |
548 |
AC_SUBST(ZIP_DEBUGINFO_FILES) |
|
549 |
AC_SUBST(CFLAGS_DEBUG_SYMBOLS) |
|
550 |
AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
551 |
]) |
13697 | 552 |
|
553 |
# Support for customization of the build process. Some build files |
|
554 |
# will include counterparts from this location, if they exist. This allows |
|
555 |
# for a degree of customization of the build targets and the rules/recipes |
|
556 |
# to create them |
|
557 |
AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir], |
|
20363 | 558 |
[use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir]) |
13697 | 559 |
AC_SUBST(CUSTOM_MAKE_DIR) |