--- a/common/autoconf/generated-configure.sh Fri Nov 21 11:24:55 2014 -0800
+++ b/common/autoconf/generated-configure.sh Fri Nov 21 14:55:59 2014 -0800
@@ -908,7 +908,6 @@
DEFINE_CROSS_COMPILE_ARCH
LP64
OPENJDK_TARGET_OS_EXPORT_DIR
-OPENJDK_TARGET_OS_API_DIR
OPENJDK_TARGET_CPU_JLI_CFLAGS
OPENJDK_TARGET_CPU_OSARCH
OPENJDK_TARGET_CPU_ISADIR
@@ -923,14 +922,14 @@
OPENJDK_TARGET_CPU_ARCH
OPENJDK_TARGET_CPU
OPENJDK_TARGET_OS_ENV
-OPENJDK_TARGET_OS_API
+OPENJDK_TARGET_OS_TYPE
OPENJDK_TARGET_OS
OPENJDK_BUILD_CPU_ENDIAN
OPENJDK_BUILD_CPU_BITS
OPENJDK_BUILD_CPU_ARCH
OPENJDK_BUILD_CPU
OPENJDK_BUILD_OS_ENV
-OPENJDK_BUILD_OS_API
+OPENJDK_BUILD_OS_TYPE
OPENJDK_BUILD_OS
OPENJDK_BUILD_AUTOCONF_NAME
OPENJDK_TARGET_AUTOCONF_NAME
@@ -1065,6 +1064,7 @@
with_update_version
with_user_release_suffix
with_build_number
+with_copyright_year
with_boot_jdk
with_add_source_root
with_override_source_root
@@ -1906,6 +1906,7 @@
Add a custom string to the version string if build
number is not set.[username_builddateb00]
--with-build-number Set build number value for build [b00]
+ --with-copyright-year Set copyright year value for build [current year]
--with-boot-jdk path to Boot JDK (used to bootstrap build) [probed]
--with-add-source-root for each and every source directory, look in this
additional source root for the same directory; if it
@@ -3412,7 +3413,7 @@
# This will make sure the given variable points to a full and proper
# path. This means:
-# 1) There will be no spaces in the path. On posix platforms,
+# 1) There will be no spaces in the path. On unix platforms,
# spaces in the path will result in an error. On Windows,
# the path will be rewritten using short-style to be space-free.
# 2) The path will be absolute, and it will be in unix-style (on
@@ -3422,7 +3423,7 @@
# This will make sure the given variable points to a executable
# with a full and proper path. This means:
-# 1) There will be no spaces in the path. On posix platforms,
+# 1) There will be no spaces in the path. On unix platforms,
# spaces in the path will result in an error. On Windows,
# the path will be rewritten using short-style to be space-free.
# 2) The path will be absolute, and it will be in unix-style (on
@@ -3970,6 +3971,8 @@
+
+
#
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -4099,7 +4102,7 @@
# Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
# Converts autoconf style OS name to OpenJDK style, into
-# VAR_OS and VAR_OS_API.
+# VAR_OS, VAR_OS_TYPE and VAR_OS_ENV.
# Expects $host_os $host_cpu $build_os and $build_cpu
@@ -4328,7 +4331,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1416597741
+DATE_WHEN_GENERATED=1416610519
###############################################################################
#
@@ -13525,38 +13528,31 @@
case "$build_os" in
*linux*)
VAR_OS=linux
- VAR_OS_API=posix
- VAR_OS_ENV=linux
+ VAR_OS_TYPE=unix
;;
*solaris*)
VAR_OS=solaris
- VAR_OS_API=posix
- VAR_OS_ENV=solaris
+ VAR_OS_TYPE=unix
;;
*darwin*)
VAR_OS=macosx
- VAR_OS_API=posix
- VAR_OS_ENV=macosx
+ VAR_OS_TYPE=unix
;;
*bsd*)
VAR_OS=bsd
- VAR_OS_API=posix
- VAR_OS_ENV=bsd
+ VAR_OS_TYPE=unix
;;
*cygwin*)
VAR_OS=windows
- VAR_OS_API=winapi
VAR_OS_ENV=windows.cygwin
;;
*mingw*)
VAR_OS=windows
- VAR_OS_API=winapi
VAR_OS_ENV=windows.msys
;;
*aix*)
VAR_OS=aix
- VAR_OS_API=posix
- VAR_OS_ENV=aix
+ VAR_OS_TYPE=unix
;;
*)
as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5
@@ -13639,8 +13635,16 @@
# ..and setup our own variables. (Do this explicitely to facilitate searching)
OPENJDK_BUILD_OS="$VAR_OS"
- OPENJDK_BUILD_OS_API="$VAR_OS_API"
- OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
+ if test "x$VAR_OS_TYPE" != x; then
+ OPENJDK_BUILD_OS_TYPE="$VAR_OS_TYPE"
+ else
+ OPENJDK_BUILD_OS_TYPE="$VAR_OS"
+ fi
+ if test "x$VAR_OS_ENV" != x; then
+ OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
+ else
+ OPENJDK_BUILD_OS_ENV="$VAR_OS"
+ fi
OPENJDK_BUILD_CPU="$VAR_CPU"
OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
@@ -13663,38 +13667,31 @@
case "$host_os" in
*linux*)
VAR_OS=linux
- VAR_OS_API=posix
- VAR_OS_ENV=linux
+ VAR_OS_TYPE=unix
;;
*solaris*)
VAR_OS=solaris
- VAR_OS_API=posix
- VAR_OS_ENV=solaris
+ VAR_OS_TYPE=unix
;;
*darwin*)
VAR_OS=macosx
- VAR_OS_API=posix
- VAR_OS_ENV=macosx
+ VAR_OS_TYPE=unix
;;
*bsd*)
VAR_OS=bsd
- VAR_OS_API=posix
- VAR_OS_ENV=bsd
+ VAR_OS_TYPE=unix
;;
*cygwin*)
VAR_OS=windows
- VAR_OS_API=winapi
VAR_OS_ENV=windows.cygwin
;;
*mingw*)
VAR_OS=windows
- VAR_OS_API=winapi
VAR_OS_ENV=windows.msys
;;
*aix*)
VAR_OS=aix
- VAR_OS_API=posix
- VAR_OS_ENV=aix
+ VAR_OS_TYPE=unix
;;
*)
as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5
@@ -13777,8 +13774,16 @@
# ... and setup our own variables. (Do this explicitely to facilitate searching)
OPENJDK_TARGET_OS="$VAR_OS"
- OPENJDK_TARGET_OS_API="$VAR_OS_API"
- OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
+ if test "x$VAR_OS_TYPE" != x; then
+ OPENJDK_TARGET_OS_TYPE="$VAR_OS_TYPE"
+ else
+ OPENJDK_TARGET_OS_TYPE="$VAR_OS"
+ fi
+ if test "x$VAR_OS_ENV" != x; then
+ OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
+ else
+ OPENJDK_TARGET_OS_ENV="$VAR_OS"
+ fi
OPENJDK_TARGET_CPU="$VAR_CPU"
OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
@@ -13946,19 +13951,10 @@
fi
- # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
- if test "x$OPENJDK_TARGET_OS_API" = xposix; then
- OPENJDK_TARGET_OS_API_DIR="unix"
- fi
- if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
- OPENJDK_TARGET_OS_API_DIR="windows"
- fi
-
-
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
OPENJDK_TARGET_OS_EXPORT_DIR=macosx
else
- OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR}
+ OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_TYPE}
fi
@@ -14208,7 +14204,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$CURDIR"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -14330,7 +14326,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$TOPDIR"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -14853,7 +14849,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$with_devkit"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -15327,7 +15323,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$OUTPUT_ROOT"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -15694,7 +15690,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$FOUND_MAKE"
@@ -16067,7 +16063,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$FOUND_MAKE"
@@ -16437,7 +16433,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$FOUND_MAKE"
@@ -16812,7 +16808,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$FOUND_MAKE"
@@ -17181,7 +17177,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$FOUND_MAKE"
@@ -20149,7 +20145,19 @@
- COPYRIGHT_YEAR=`date +'%Y'`
+
+# Check whether --with-copyright-year was given.
+if test "${with_copyright_year+set}" = set; then :
+ withval=$with_copyright_year;
+fi
+
+ if test "x$with_copyright_year" = xyes; then
+ as_fn_error $? "Copyright year must have a value" "$LINENO" 5
+ elif test "x$with_copyright_year" != x; then
+ COPYRIGHT_YEAR="$with_copyright_year"
+ else
+ COPYRIGHT_YEAR=`date +'%Y'`
+ fi
if test "x$JDK_UPDATE_VERSION" != x; then
@@ -20336,7 +20344,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -20668,7 +20676,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -20862,7 +20870,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -21049,7 +21057,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -21235,7 +21243,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -21421,7 +21429,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -21598,7 +21606,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -21744,7 +21752,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$JAVA_HOME_PROCESSED"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -21916,7 +21924,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -22244,7 +22252,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -22459,7 +22467,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -22639,7 +22647,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -22847,7 +22855,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -23027,7 +23035,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -23235,7 +23243,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -23415,7 +23423,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -23623,7 +23631,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -23803,7 +23811,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -23998,7 +24006,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -24176,7 +24184,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -24372,7 +24380,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -24550,7 +24558,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -24745,7 +24753,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -24923,7 +24931,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -25119,7 +25127,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -25297,7 +25305,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -25474,7 +25482,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$BOOT_JDK"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -27515,7 +27523,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$VS_ENV_CMD"
@@ -28175,7 +28183,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$CC"
@@ -28632,7 +28640,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$PROPER_COMPILER_CC"
@@ -29915,7 +29923,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$CXX"
@@ -30372,7 +30380,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$PROPER_COMPILER_CXX"
@@ -31234,7 +31242,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$CPP"
@@ -31649,7 +31657,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$CXXCPP"
@@ -31993,7 +32001,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$LD"
@@ -32488,7 +32496,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$AS"
@@ -33116,7 +33124,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$AR"
@@ -33652,7 +33660,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$OBJC"
@@ -34120,7 +34128,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$LIPO"
@@ -34461,7 +34469,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$MT"
@@ -34798,7 +34806,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$RC"
@@ -35117,7 +35125,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$DUMPBIN"
@@ -35632,7 +35640,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$STRIP"
@@ -36100,7 +36108,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$NM"
@@ -36568,7 +36576,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$GNM"
@@ -37037,7 +37045,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$MCS"
@@ -37617,7 +37625,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$STRIP"
@@ -38195,7 +38203,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$NM"
@@ -38782,7 +38790,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$OBJCOPY"
@@ -39366,7 +39374,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$OBJDUMP"
@@ -39859,7 +39867,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$BUILD_CC"
@@ -40327,7 +40335,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$BUILD_CXX"
@@ -40795,7 +40803,7 @@
fi
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
# First separate the path from the arguments. This will split at the first
# space.
complete="$BUILD_LD"
@@ -41347,7 +41355,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$JT_HOME"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -41875,8 +41883,8 @@
LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
elif test "x$COMPILE_TYPE" = xreduced; then
- if test "x$OPENJDK_TARGET_OS" != xwindows; then
- # Specify -m if running reduced on other Posix platforms
+ if test "x$OPENJDK_TARGET_OS_TYPE" = xunix; then
+ # Specify -m if running reduced on unix platforms
# When we add flags to the "official" CFLAGS etc, we need to
# keep track of these additions in ADDED_CFLAGS etc. These
@@ -42768,7 +42776,7 @@
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
-I${JDK_TOPDIR}/src/java.base/share/native/include \
-I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
- -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_API_DIR/native/include"
+ -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/include"
# The shared libraries are compiled using the picflag.
CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
@@ -44754,7 +44762,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -44876,7 +44884,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -45107,7 +45115,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -45229,7 +45237,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -45721,7 +45729,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -45843,7 +45851,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -46049,7 +46057,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -46171,7 +46179,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -46368,7 +46376,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -46490,7 +46498,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -46687,7 +46695,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -46809,7 +46817,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -47007,7 +47015,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -47129,7 +47137,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -47328,7 +47336,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -47450,7 +47458,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -47645,7 +47653,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -47767,7 +47775,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -47962,7 +47970,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -48084,7 +48092,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$POTENTIAL_FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -48262,7 +48270,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -48392,7 +48400,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$FREETYPE_LIB_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -50291,7 +50299,7 @@
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
else
- # We're on a posix platform. Hooray! :)
+ # We're on a unix platform. Hooray! :)
path="$MSVCR_DLL"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
@@ -52436,15 +52444,15 @@
printf "====================================================\n"
if test "x$no_create" != "xyes"; then
if test "x$IS_RECONFIGURE" != "xyes"; then
- printf "A new configuration has been successfully created in\n %s\n" "$OUTPUT_ROOT"
- else
- printf "The existing configuration has been successfully updated in\n %s\n" "$OUTPUT_ROOT"
+ printf "A new configuration has been successfully created in\n%s\n" "$OUTPUT_ROOT"
+ else
+ printf "The existing configuration has been successfully updated in\n%s\n" "$OUTPUT_ROOT"
fi
else
if test "x$IS_RECONFIGURE" != "xyes"; then
printf "A configuration has been successfully checked but not created\n"
else
- printf "The existing configuration has been successfully checked in\n %s\n" "$OUTPUT_ROOT"
+ printf "The existing configuration has been successfully checked in\n%s\n" "$OUTPUT_ROOT"
fi
fi
if test "x$CONFIGURE_COMMAND_LINE" != x; then
@@ -52516,3 +52524,15 @@
fi
+
+if test -e "$OUTPUT_ROOT/config.log"; then
+ $GREP '^configure:.*: WARNING:' "$OUTPUT_ROOT/config.log" > /dev/null 2>&1
+ if test $? -eq 0; then
+ printf "The following warnings were produced. Repeated here for convenience:\n"
+ # We must quote sed expression (using []) to stop m4 from eating the [].
+ $GREP '^configure:.*: WARNING:' "$OUTPUT_ROOT/config.log" | $SED -e 's/^configure:[0-9]*: //'
+ printf "\n"
+ fi
+fi
+
+