Print this page
rev 1274 : 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
Summary: Build system tweaks to allow building on OS X 10.9 and later
Reviewed-by: erikj
| Split |
Split |
Close |
| Expand all |
| Collapse all |
--- old/./common/autoconf/basics.m4
+++ new/./common/autoconf/basics.m4
1 1 #
2 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
2 +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 #
5 5 # This code is free software; you can redistribute it and/or modify it
6 6 # under the terms of the GNU General Public License version 2 only, as
7 7 # published by the Free Software Foundation. Oracle designates this
8 8 # particular file as subject to the "Classpath" exception as provided
9 9 # by Oracle in the LICENSE file that accompanied this code.
10 10 #
11 11 # This code is distributed in the hope that it will be useful, but WITHOUT
12 12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 13 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14 14 # version 2 for more details (a copy is included in the LICENSE file that
15 15 # accompanied this code).
16 16 #
17 17 # You should have received a copy of the GNU General Public License version
18 18 # 2 along with this work; if not, write to the Free Software Foundation,
19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20 20 #
21 21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22 22 # or visit www.oracle.com if you need additional information or have any
23 23 # questions.
24 24 #
25 25
26 26 # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
27 27 # If so, then append $1 to $2 \
28 28 # Also set JVM_ARG_OK to true/false depending on outcome.
29 29 AC_DEFUN([ADD_JVM_ARG_IF_OK],
30 30 [
31 31 $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD
32 32 $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD
33 33 OUTPUT=`$3 $1 -version 2>&1`
34 34 FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
35 35 FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
36 36 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
37 37 $2="[$]$2 $1"
38 38 JVM_ARG_OK=true
39 39 else
40 40 $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD
41 41 $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD
42 42 JVM_ARG_OK=false
43 43 fi
44 44 ])
45 45
46 46 # Appends a string to a path variable, only adding the : when needed.
47 47 AC_DEFUN([BASIC_APPEND_TO_PATH],
48 48 [
49 49 if test "x[$]$1" = x; then
50 50 $1="$2"
51 51 else
52 52 $1="[$]$1:$2"
53 53 fi
54 54 ])
55 55
56 56 # This will make sure the given variable points to a full and proper
57 57 # path. This means:
58 58 # 1) There will be no spaces in the path. On posix platforms,
59 59 # spaces in the path will result in an error. On Windows,
60 60 # the path will be rewritten using short-style to be space-free.
61 61 # 2) The path will be absolute, and it will be in unix-style (on
62 62 # cygwin).
63 63 # $1: The name of the variable to fix
64 64 AC_DEFUN([BASIC_FIXUP_PATH],
65 65 [
66 66 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
67 67 BASIC_FIXUP_PATH_CYGWIN($1)
68 68 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
69 69 BASIC_FIXUP_PATH_MSYS($1)
70 70 else
71 71 # We're on a posix platform. Hooray! :)
72 72 path="[$]$1"
73 73 has_space=`$ECHO "$path" | $GREP " "`
74 74 if test "x$has_space" != x; then
75 75 AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
76 76 AC_MSG_ERROR([Spaces are not allowed in this path.])
77 77 fi
78 78
79 79 # Use eval to expand a potential ~
80 80 eval path="$path"
81 81 if test ! -f "$path" && test ! -d "$path"; then
82 82 AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
83 83 fi
84 84
85 85 $1="`cd "$path"; $THEPWDCMD -L`"
86 86 fi
87 87 ])
88 88
89 89 # This will make sure the given variable points to a executable
90 90 # with a full and proper path. This means:
91 91 # 1) There will be no spaces in the path. On posix platforms,
92 92 # spaces in the path will result in an error. On Windows,
93 93 # the path will be rewritten using short-style to be space-free.
94 94 # 2) The path will be absolute, and it will be in unix-style (on
95 95 # cygwin).
96 96 # Any arguments given to the executable is preserved.
97 97 # If the input variable does not have a directory specification, then
98 98 # it need to be in the PATH.
99 99 # $1: The name of the variable to fix
100 100 AC_DEFUN([BASIC_FIXUP_EXECUTABLE],
101 101 [
102 102 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
103 103 BASIC_FIXUP_EXECUTABLE_CYGWIN($1)
104 104 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
105 105 BASIC_FIXUP_EXECUTABLE_MSYS($1)
106 106 else
107 107 # We're on a posix platform. Hooray! :)
108 108 # First separate the path from the arguments. This will split at the first
109 109 # space.
110 110 complete="[$]$1"
111 111 path="${complete%% *}"
112 112 tmp="$complete EOL"
113 113 arguments="${tmp#* }"
114 114
115 115 # Cannot rely on the command "which" here since it doesn't always work.
116 116 is_absolute_path=`$ECHO "$path" | $GREP ^/`
117 117 if test -z "$is_absolute_path"; then
118 118 # Path to executable is not absolute. Find it.
119 119 IFS_save="$IFS"
120 120 IFS=:
121 121 for p in $PATH; do
122 122 if test -f "$p/$path" && test -x "$p/$path"; then
123 123 new_path="$p/$path"
124 124 break
125 125 fi
126 126 done
127 127 IFS="$IFS_save"
128 128 else
129 129 AC_MSG_NOTICE([Resolving $1 (as $path) failed, using $path directly.])
130 130 new_path="$path"
131 131 fi
132 132
133 133 if test "x$new_path" = x; then
134 134 AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
135 135 has_space=`$ECHO "$complete" | $GREP " "`
136 136 if test "x$has_space" != x; then
137 137 AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
138 138 fi
139 139 AC_MSG_ERROR([Cannot locate the the path of $1])
140 140 fi
141 141 fi
142 142
143 143 # Now join together the path and the arguments once again
144 144 if test "x$arguments" != xEOL; then
145 145 new_complete="$new_path ${arguments% *}"
146 146 else
147 147 new_complete="$new_path"
148 148 fi
149 149
150 150 if test "x$complete" != "x$new_complete"; then
151 151 $1="$new_complete"
152 152 AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
153 153 fi
154 154 ])
155 155
156 156 AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
157 157 [
158 158 if test "x$OPENJDK_BUILD_OS" != xwindows; then
159 159 # Follow a chain of symbolic links. Use readlink
160 160 # where it exists, else fall back to horribly
161 161 # complicated shell code.
162 162 if test "x$READLINK_TESTED" != yes; then
163 163 # On MacOSX there is a readlink tool with a different
164 164 # purpose than the GNU readlink tool. Check the found readlink.
165 165 ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
166 166 if test "x$ISGNU" = x; then
167 167 # A readlink that we do not know how to use.
168 168 # Are there other non-GNU readlinks out there?
169 169 READLINK_TESTED=yes
170 170 READLINK=
171 171 fi
172 172 fi
173 173
174 174 if test "x$READLINK" != x; then
175 175 $1=`$READLINK -f [$]$1`
176 176 else
177 177 # Save the current directory for restoring afterwards
178 178 STARTDIR=$PWD
179 179 COUNTER=0
180 180 sym_link_dir=`$DIRNAME [$]$1`
181 181 sym_link_file=`$BASENAME [$]$1`
182 182 cd $sym_link_dir
183 183 # Use -P flag to resolve symlinks in directories.
184 184 cd `$THEPWDCMD -P`
185 185 sym_link_dir=`$THEPWDCMD -P`
186 186 # Resolve file symlinks
187 187 while test $COUNTER -lt 20; do
188 188 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
189 189 if test "x$ISLINK" == x; then
190 190 # This is not a symbolic link! We are done!
191 191 break
192 192 fi
193 193 # Again resolve directory symlinks since the target of the just found
194 194 # link could be in a different directory
195 195 cd `$DIRNAME $ISLINK`
196 196 sym_link_dir=`$THEPWDCMD -P`
197 197 sym_link_file=`$BASENAME $ISLINK`
198 198 let COUNTER=COUNTER+1
199 199 done
200 200 cd $STARTDIR
201 201 $1=$sym_link_dir/$sym_link_file
202 202 fi
203 203 fi
204 204 ])
205 205
206 206 # Register a --with argument but mark it as deprecated
207 207 # $1: The name of the with argument to deprecate, not including --with-
208 208 AC_DEFUN([BASIC_DEPRECATED_ARG_WITH],
209 209 [
210 210 AC_ARG_WITH($1, [AS_HELP_STRING([--with-$1],
211 211 [Deprecated. Option is kept for backwards compatibility and is ignored])],
212 212 [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
213 213 ])
214 214
215 215 # Register a --enable argument but mark it as deprecated
216 216 # $1: The name of the with argument to deprecate, not including --enable-
217 217 # $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
218 218 AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
219 219 [
220 220 AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
221 221 [Deprecated. Option is kept for backwards compatibility and is ignored])])
222 222 if test "x$enable_$2" != x; then
223 223 AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
224 224 fi
225 225 ])
226 226
227 227 AC_DEFUN_ONCE([BASIC_INIT],
228 228 [
229 229 # Save the original command line. This is passed to us by the wrapper configure script.
230 230 AC_SUBST(CONFIGURE_COMMAND_LINE)
231 231 DATE_WHEN_CONFIGURED=`LANG=C date`
232 232 AC_SUBST(DATE_WHEN_CONFIGURED)
233 233 AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
234 234 AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.])
235 235 ])
236 236
237 237 # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
238 238 # $1: variable to check
239 239 # $2: executable name to print in warning (optional)
240 240 AC_DEFUN([BASIC_CHECK_NONEMPTY],
241 241 [
242 242 if test "x[$]$1" = x; then
243 243 if test "x$2" = x; then
244 244 PROG_NAME=translit($1,A-Z,a-z)
245 245 else
246 246 PROG_NAME=$2
247 247 fi
248 248 AC_MSG_NOTICE([Could not find $PROG_NAME!])
249 249 AC_MSG_ERROR([Cannot continue])
250 250 fi
251 251 ])
252 252
253 253 # Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
254 254 # Arguments as AC_PATH_PROG:
255 255 # $1: variable to set
256 256 # $2: executable name to look for
257 257 AC_DEFUN([BASIC_REQUIRE_PROG],
258 258 [
259 259 AC_PATH_PROGS($1, $2)
260 260 BASIC_CHECK_NONEMPTY($1, $2)
261 261 ])
262 262
263 263 # Setup the most fundamental tools that relies on not much else to set up,
264 264 # but is used by much of the early bootstrap code.
265 265 AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
266 266 [
267 267
268 268 # Start with tools that do not need have cross compilation support
269 269 # and can be expected to be found in the default PATH. These tools are
270 270 # used by configure. Nor are these tools expected to be found in the
271 271 # devkit from the builddeps server either, since they are
272 272 # needed to download the devkit.
273 273
274 274 # First are all the simple required tools.
275 275 BASIC_REQUIRE_PROG(BASENAME, basename)
276 276 BASIC_REQUIRE_PROG(BASH, bash)
277 277 BASIC_REQUIRE_PROG(CAT, cat)
278 278 BASIC_REQUIRE_PROG(CHMOD, chmod)
279 279 BASIC_REQUIRE_PROG(CMP, cmp)
280 280 BASIC_REQUIRE_PROG(COMM, comm)
281 281 BASIC_REQUIRE_PROG(CP, cp)
282 282 BASIC_REQUIRE_PROG(CPIO, cpio)
283 283 BASIC_REQUIRE_PROG(CUT, cut)
284 284 BASIC_REQUIRE_PROG(DATE, date)
285 285 BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
286 286 BASIC_REQUIRE_PROG(DIRNAME, dirname)
287 287 BASIC_REQUIRE_PROG(ECHO, echo)
288 288 BASIC_REQUIRE_PROG(EXPR, expr)
289 289 BASIC_REQUIRE_PROG(FILE, file)
290 290 BASIC_REQUIRE_PROG(FIND, find)
291 291 BASIC_REQUIRE_PROG(HEAD, head)
292 292 BASIC_REQUIRE_PROG(LN, ln)
293 293 BASIC_REQUIRE_PROG(LS, ls)
294 294 BASIC_REQUIRE_PROG(MKDIR, mkdir)
295 295 BASIC_REQUIRE_PROG(MKTEMP, mktemp)
296 296 BASIC_REQUIRE_PROG(MV, mv)
297 297 BASIC_REQUIRE_PROG(PRINTF, printf)
298 298 BASIC_REQUIRE_PROG(RM, rm)
299 299 BASIC_REQUIRE_PROG(SH, sh)
300 300 BASIC_REQUIRE_PROG(SORT, sort)
301 301 BASIC_REQUIRE_PROG(TAIL, tail)
302 302 BASIC_REQUIRE_PROG(TAR, tar)
303 303 BASIC_REQUIRE_PROG(TEE, tee)
304 304 BASIC_REQUIRE_PROG(TOUCH, touch)
305 305 BASIC_REQUIRE_PROG(TR, tr)
306 306 BASIC_REQUIRE_PROG(UNAME, uname)
307 307 BASIC_REQUIRE_PROG(UNIQ, uniq)
308 308 BASIC_REQUIRE_PROG(WC, wc)
309 309 BASIC_REQUIRE_PROG(WHICH, which)
310 310 BASIC_REQUIRE_PROG(XARGS, xargs)
311 311
312 312 # Then required tools that require some special treatment.
313 313 AC_PROG_AWK
314 314 BASIC_CHECK_NONEMPTY(AWK)
315 315 AC_PROG_GREP
316 316 BASIC_CHECK_NONEMPTY(GREP)
317 317 AC_PROG_EGREP
318 318 BASIC_CHECK_NONEMPTY(EGREP)
319 319 AC_PROG_FGREP
320 320 BASIC_CHECK_NONEMPTY(FGREP)
321 321 AC_PROG_SED
322 322 BASIC_CHECK_NONEMPTY(SED)
323 323
324 324 AC_PATH_PROGS(NAWK, [nawk gawk awk])
325 325 BASIC_CHECK_NONEMPTY(NAWK)
326 326
327 327 # Always force rm.
328 328 RM="$RM -f"
329 329
330 330 # pwd behaves differently on various platforms and some don't support the -L flag.
331 331 # Always use the bash builtin pwd to get uniform behavior.
332 332 THEPWDCMD=pwd
333 333
334 334 # These are not required on all platforms
335 335 AC_PATH_PROG(CYGPATH, cygpath)
336 336 AC_PATH_PROG(READLINK, readlink)
337 337 AC_PATH_PROG(DF, df)
338 338 AC_PATH_PROG(SETFILE, SetFile)
339 339 ])
340 340
341 341 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
342 342 AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
343 343 [
344 344 # Locate the directory of this script.
345 345 SCRIPT="[$]0"
346 346 AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
347 347
348 348 # Where is the source? It is located two levels above the configure script.
349 349 CURDIR="$PWD"
350 350 cd "$AUTOCONF_DIR/../.."
351 351 SRC_ROOT="`$THEPWDCMD -L`"
352 352
353 353 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
354 354 PATH_SEP=";"
355 355 BASIC_CHECK_PATHS_WINDOWS
356 356 else
357 357 PATH_SEP=":"
358 358 fi
359 359
360 360 AC_SUBST(SRC_ROOT)
361 361 AC_SUBST(PATH_SEP)
362 362 cd "$CURDIR"
363 363
364 364 BASIC_FIXUP_PATH(SRC_ROOT)
365 365 BASIC_FIXUP_PATH(CURDIR)
366 366
367 367 if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
368 368 # Add extra search paths on solaris for utilities like ar and as etc...
369 369 PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
370 370 fi
371 371
372 372 # You can force the sys-root if the sys-root encoded into the cross compiler tools
373 373 # is not correct.
374 374 AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
375 375 [pass this sys-root to the compilers and tools (for cross-compiling)])])
376 376
377 377 if test "x$with_sys_root" != x; then
378 378 SYS_ROOT=$with_sys_root
|
↓ open down ↓ |
366 lines elided |
↑ open up ↑ |
379 379 else
380 380 SYS_ROOT=/
381 381 fi
382 382 AC_SUBST(SYS_ROOT)
383 383
384 384 AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
385 385 [search this directory for compilers and tools (for cross-compiling)])],
386 386 [TOOLS_DIR=$with_tools_dir]
387 387 )
388 388
389 + # Xcode version will be validated later
390 + AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path],
391 + [explicit path to Xcode 4 (generally for building on 10.9 and later)])],
392 + [XCODE_PATH=$with_xcode_path]
393 + )
394 +
389 395 AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
390 396 [use this directory as base for tools-dir and sys-root (for cross-compiling)])],
391 397 [
392 398 if test "x$with_sys_root" != x; then
393 399 AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time])
394 400 fi
395 401 BASIC_FIXUP_PATH([with_devkit])
396 402 BASIC_APPEND_TO_PATH([TOOLS_DIR],$with_devkit/bin)
397 403 if test -d "$with_devkit/$host_alias/libc"; then
398 404 SYS_ROOT=$with_devkit/$host_alias/libc
399 405 elif test -d "$with_devkit/$host/sys-root"; then
400 406 SYS_ROOT=$with_devkit/$host/sys-root
401 407 fi
402 408 ])
403 409 ])
404 410
405 411 AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
406 412 [
407 413
408 414 AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
409 415 [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
410 416 [ CONF_NAME=${with_conf_name} ])
411 417
412 418 # Test from where we are running configure, in or outside of src root.
413 419 if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
414 420 || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
415 421 || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
416 422 # We are running configure from the src root.
417 423 # Create a default ./build/target-variant-debuglevel output root.
418 424 if test "x${CONF_NAME}" = x; then
419 425 CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
420 426 fi
421 427 OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
422 428 $MKDIR -p "$OUTPUT_ROOT"
423 429 if test ! -d "$OUTPUT_ROOT"; then
424 430 AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
425 431 fi
426 432 else
427 433 # We are running configure from outside of the src dir.
428 434 # Then use the current directory as output dir!
429 435 # If configuration is situated in normal build directory, just use the build
430 436 # directory name as configuration name, otherwise use the complete path.
431 437 if test "x${CONF_NAME}" = x; then
432 438 CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
433 439 fi
434 440 OUTPUT_ROOT="$CURDIR"
435 441
436 442 # WARNING: This might be a bad thing to do. You need to be sure you want to
437 443 # have a configuration in this directory. Do some sanity checks!
438 444
439 445 if test ! -e "$OUTPUT_ROOT/spec.gmk"; then
440 446 # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
441 447 # other files
442 448 files_present=`$LS $OUTPUT_ROOT`
443 449 # Configure has already touched config.log and confdefs.h in the current dir when this check
444 450 # is performed.
445 451 filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \
446 452 | $TR -d '\n'`
447 453 if test "x$filtered_files" != x; then
448 454 AC_MSG_NOTICE([Current directory is $CURDIR.])
449 455 AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
450 456 AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).])
451 457 AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could])
452 458 AC_MSG_NOTICE([seriously mess up just about everything.])
453 459 AC_MSG_NOTICE([Try 'cd $SRC_ROOT' and restart configure])
454 460 AC_MSG_NOTICE([(or create a new empty directory and cd to it).])
455 461 AC_MSG_ERROR([Will not continue creating configuration in $CURDIR])
456 462 fi
457 463 fi
458 464 fi
459 465 AC_MSG_CHECKING([what configuration name to use])
460 466 AC_MSG_RESULT([$CONF_NAME])
461 467
462 468 BASIC_FIXUP_PATH(OUTPUT_ROOT)
463 469
464 470 AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
465 471 AC_SUBST(CONF_NAME, $CONF_NAME)
466 472 AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
467 473
468 474 # Most of the probed defines are put into config.h
469 475 AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in])
470 476 # The spec.gmk file contains all variables for the make system.
471 477 AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
472 478 # The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
473 479 AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in])
474 480 # The bootcycle-spec.gmk file contains support for boot cycle builds.
475 481 AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in])
476 482 # The compare.sh is used to compare the build output to other builds.
477 483 AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in])
478 484 # Spec.sh is currently used by compare-objects.sh
479 485 AC_CONFIG_FILES([$OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in])
480 486 # The generated Makefile knows where the spec.gmk is and where the source is.
481 487 # You can run make from the OUTPUT_ROOT, or from the top-level Makefile
482 488 # which will look for generated configurations
483 489 AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in])
484 490
485 491 # Save the arguments given to us
486 492 echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
487 493 ])
488 494
489 495 AC_DEFUN_ONCE([BASIC_SETUP_LOGGING],
490 496 [
491 497 # Setup default logging of stdout and stderr to build.log in the output root.
492 498 BUILD_LOG='$(OUTPUT_ROOT)/build.log'
493 499 BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
494 500 BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
495 501 AC_SUBST(BUILD_LOG)
496 502 AC_SUBST(BUILD_LOG_PREVIOUS)
497 503 AC_SUBST(BUILD_LOG_WRAPPER)
498 504 ])
499 505
500 506
501 507 #%%% Simple tools %%%
502 508
503 509 # Check if we have found a usable version of make
504 510 # $1: the path to a potential make binary (or empty)
505 511 # $2: the description on how we found this
506 512 AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
507 513 [
508 514 MAKE_CANDIDATE="$1"
509 515 DESCRIPTION="$2"
510 516 if test "x$MAKE_CANDIDATE" != x; then
511 517 AC_MSG_NOTICE([Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION])
512 518 MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
513 519 IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
514 520 if test "x$IS_GNU_MAKE" = x; then
515 521 AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
516 522 else
517 523 IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[[12]]' -e '4\.'`
518 524 if test "x$IS_MODERN_MAKE" = x; then
519 525 AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
520 526 else
521 527 if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
522 528 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
523 529 MAKE_EXPECTED_ENV='cygwin'
524 530 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
525 531 MAKE_EXPECTED_ENV='msys'
526 532 else
527 533 AC_MSG_ERROR([Unknown Windows environment])
528 534 fi
529 535 MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
530 536 IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
531 537 else
532 538 # Not relevant for non-Windows
533 539 IS_MAKE_CORRECT_ENV=true
534 540 fi
535 541 if test "x$IS_MAKE_CORRECT_ENV" = x; then
536 542 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.])
537 543 else
538 544 FOUND_MAKE=$MAKE_CANDIDATE
539 545 BASIC_FIXUP_EXECUTABLE(FOUND_MAKE)
540 546 fi
541 547 fi
542 548 fi
543 549 fi
544 550 ])
545 551
546 552 # Goes looking for a usable version of GNU make.
547 553 AC_DEFUN([BASIC_CHECK_GNU_MAKE],
548 554 [
549 555 # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
550 556 if test "x$MAKE" != x; then
551 557 # User has supplied a make, test it.
552 558 if test ! -f "$MAKE"; then
553 559 AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not found.])
554 560 fi
555 561 BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE])
556 562 if test "x$FOUND_MAKE" = x; then
557 563 AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.])
558 564 fi
559 565 else
560 566 # Try our hardest to locate a correct version of GNU make
561 567 AC_PATH_PROGS(CHECK_GMAKE, gmake)
562 568 BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH])
563 569
564 570 if test "x$FOUND_MAKE" = x; then
565 571 AC_PATH_PROGS(CHECK_MAKE, make)
566 572 BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [make in PATH])
567 573 fi
568 574
569 575 if test "x$FOUND_MAKE" = x; then
570 576 if test "x$TOOLS_DIR" != x; then
571 577 # We have a tools-dir, check that as well before giving up.
572 578 OLD_PATH=$PATH
573 579 PATH=$TOOLS_DIR:$PATH
574 580 AC_PATH_PROGS(CHECK_TOOLSDIR_GMAKE, gmake)
575 581 BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_GMAKE", [gmake in tools-dir])
576 582 if test "x$FOUND_MAKE" = x; then
577 583 AC_PATH_PROGS(CHECK_TOOLSDIR_MAKE, make)
578 584 BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_MAKE", [make in tools-dir])
579 585 fi
580 586 PATH=$OLD_PATH
581 587 fi
582 588 fi
583 589
584 590 if test "x$FOUND_MAKE" = x; then
585 591 AC_MSG_ERROR([Cannot find GNU make 3.81 or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure.])
586 592 fi
587 593 fi
588 594
589 595 MAKE=$FOUND_MAKE
590 596 AC_SUBST(MAKE)
591 597 AC_MSG_NOTICE([Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)])
592 598 ])
593 599
594 600 AC_DEFUN([BASIC_CHECK_FIND_DELETE],
595 601 [
596 602 # Test if find supports -delete
597 603 AC_MSG_CHECKING([if find supports -delete])
598 604 FIND_DELETE="-delete"
599 605
600 606 DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
601 607
602 608 echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
603 609
604 610 TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
605 611 if test -f $DELETEDIR/TestIfFindSupportsDelete; then
606 612 # No, it does not.
607 613 rm $DELETEDIR/TestIfFindSupportsDelete
608 614 FIND_DELETE="-exec rm \{\} \+"
609 615 AC_MSG_RESULT([no])
610 616 else
611 617 AC_MSG_RESULT([yes])
612 618 fi
613 619 rmdir $DELETEDIR
614 620 AC_SUBST(FIND_DELETE)
615 621 ])
616 622
617 623 AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
618 624 [
619 625 BASIC_CHECK_GNU_MAKE
620 626
621 627 BASIC_CHECK_FIND_DELETE
622 628
623 629 # These tools might not be installed by default,
624 630 # need hint on how to install them.
625 631 BASIC_REQUIRE_PROG(UNZIP, unzip)
626 632 BASIC_REQUIRE_PROG(ZIP, zip)
|
↓ open down ↓ |
228 lines elided |
↑ open up ↑ |
627 633
628 634 # Non-required basic tools
629 635
630 636 AC_PATH_PROG(LDD, ldd)
631 637 if test "x$LDD" = "x"; then
632 638 # List shared lib dependencies is used for
633 639 # debug output and checking for forbidden dependencies.
634 640 # We can build without it.
635 641 LDD="true"
636 642 fi
637 - AC_PATH_PROG(OTOOL, otool)
638 - if test "x$OTOOL" = "x"; then
639 - OTOOL="true"
640 - fi
641 643 AC_PATH_PROGS(READELF, [readelf greadelf])
642 644 AC_PATH_PROG(HG, hg)
643 645 AC_PATH_PROG(STAT, stat)
644 646 AC_PATH_PROG(TIME, time)
645 647 # Check if it's GNU time
646 648 IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
647 649 if test "x$IS_GNU_TIME" != x; then
648 650 IS_GNU_TIME=yes
649 651 else
650 652 IS_GNU_TIME=no
651 653 fi
652 654 AC_SUBST(IS_GNU_TIME)
653 655
654 656 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
655 657 BASIC_REQUIRE_PROG(COMM, comm)
656 658 fi
657 659
658 660 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
659 661 BASIC_REQUIRE_PROG(DSYMUTIL, dsymutil)
660 662 BASIC_REQUIRE_PROG(XATTR, xattr)
661 663 AC_PATH_PROG(CODESIGN, codesign)
662 664 if test "x$CODESIGN" != "x"; then
663 665 # Verify that the openjdk_codesign certificate is present
664 666 AC_MSG_CHECKING([if openjdk_codesign certificate is present])
665 667 rm -f codesign-testfile
666 668 touch codesign-testfile
667 669 codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
668 670 rm -f codesign-testfile
669 671 if test "x$CODESIGN" = x; then
670 672 AC_MSG_RESULT([no])
671 673 else
672 674 AC_MSG_RESULT([yes])
673 675 fi
674 676 fi
675 677 fi
676 678 ])
677 679
678 680 # Check if build directory is on local disk. If not possible to determine,
679 681 # we prefer to claim it's local.
680 682 # Argument 1: directory to test
681 683 # Argument 2: what to do if it is on local disk
682 684 # Argument 3: what to do otherwise (remote disk or failure)
683 685 AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
684 686 [
685 687 # df -l lists only local disks; if the given directory is not found then
686 688 # a non-zero exit code is given
687 689 if test "x$DF" = x; then
688 690 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
689 691 # msys does not have df; use Windows "net use" instead.
690 692 IS_NETWORK_DISK=`net use | grep \`pwd -W | cut -d ":" -f 1 | tr a-z A-Z\`:`
691 693 if test "x$IS_NETWORK_DISK" = x; then
692 694 $2
693 695 else
694 696 $3
695 697 fi
696 698 else
697 699 # No df here, say it's local
698 700 $2
699 701 fi
700 702 else
701 703 if $DF -l $1 > /dev/null 2>&1; then
702 704 $2
703 705 else
704 706 $3
705 707 fi
706 708 fi
707 709 ])
708 710
709 711 # Check that source files have basic read permissions set. This might
710 712 # not be the case in cygwin in certain conditions.
711 713 AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
712 714 [
713 715 if test x"$OPENJDK_BUILD_OS" = xwindows; then
714 716 file_to_test="$SRC_ROOT/LICENSE"
715 717 if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
716 718 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.])
717 719 fi
718 720 fi
719 721 ])
720 722
721 723 AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
722 724 [
723 725 AC_MSG_CHECKING([if build directory is on local disk])
724 726 BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT,
725 727 [OUTPUT_DIR_IS_LOCAL="yes"],
726 728 [OUTPUT_DIR_IS_LOCAL="no"])
727 729 AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL)
728 730
729 731 BASIC_CHECK_SRC_PERMS
730 732
731 733 # Check if the user has any old-style ALT_ variables set.
732 734 FOUND_ALT_VARIABLES=`env | grep ^ALT_`
733 735
734 736 # Before generating output files, test if they exist. If they do, this is a reconfigure.
735 737 # Since we can't properly handle the dependencies for this, warn the user about the situation
736 738 if test -e $OUTPUT_ROOT/spec.gmk; then
737 739 IS_RECONFIGURE=yes
738 740 else
739 741 IS_RECONFIGURE=no
740 742 fi
741 743
742 744 if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
743 745 HIDE_PERFORMANCE_HINTS=yes
744 746 else
745 747 HIDE_PERFORMANCE_HINTS=no
746 748 # Hide it the next time around...
747 749 $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
748 750 fi
749 751 ])
|
↓ open down ↓ |
99 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX