--- a/common/autoconf/jdk-options.m4 Thu Sep 12 12:29:17 2013 -0700
+++ b/common/autoconf/jdk-options.m4 Tue Nov 05 17:33:48 2013 -0800
@@ -25,30 +25,30 @@
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT],
[
-###############################################################################
-#
-# Check which variant of the JDK that we want to build.
-# Currently we have:
-# normal: standard edition
-# but the custom make system may add other variants
-#
-# Effectively the JDK variant gives a name to a specific set of
-# modules to compile into the JDK. In the future, these modules
-# might even be Jigsaw modules.
-#
-AC_MSG_CHECKING([which variant of the JDK to build])
-AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
- [JDK variant to build (normal) @<:@normal@:>@])])
+ ###############################################################################
+ #
+ # Check which variant of the JDK that we want to build.
+ # Currently we have:
+ # normal: standard edition
+ # but the custom make system may add other variants
+ #
+ # Effectively the JDK variant gives a name to a specific set of
+ # modules to compile into the JDK. In the future, these modules
+ # might even be Jigsaw modules.
+ #
+ AC_MSG_CHECKING([which variant of the JDK to build])
+ AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
+ [JDK variant to build (normal) @<:@normal@:>@])])
-if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
+ if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
JDK_VARIANT="normal"
-else
+ else
AC_MSG_ERROR([The available JDK variants are: normal])
-fi
+ fi
-AC_SUBST(JDK_VARIANT)
+ AC_SUBST(JDK_VARIANT)
-AC_MSG_RESULT([$JDK_VARIANT])
+ AC_MSG_RESULT([$JDK_VARIANT])
])
AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_INTERPRETER],
@@ -81,216 +81,215 @@
AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS],
[
-###############################################################################
-#
-# Check which variants of the JVM that we want to build.
-# Currently we have:
-# server: normal interpreter and a tiered C1/C2 compiler
-# client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
-# minimal1: reduced form of client with optional VM services and features stripped out
-# kernel: kernel footprint JVM that passes the TCK without major performance problems,
-# ie normal interpreter and C1, only the serial GC, kernel jvmti etc
-# zero: no machine code interpreter, no compiler
-# zeroshark: zero interpreter and shark/llvm compiler backend
+ ###############################################################################
+ #
+ # Check which variants of the JVM that we want to build.
+ # Currently we have:
+ # server: normal interpreter and a tiered C1/C2 compiler
+ # client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
+ # minimal1: reduced form of client with optional VM services and features stripped out
+ # kernel: kernel footprint JVM that passes the TCK without major performance problems,
+ # ie normal interpreter and C1, only the serial GC, kernel jvmti etc
+ # zero: no machine code interpreter, no compiler
+ # zeroshark: zero interpreter and shark/llvm compiler backend
# core: interpreter only, no compiler (only works on some platforms)
-AC_MSG_CHECKING([which variants of the JVM to build])
-AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
+ AC_MSG_CHECKING([which variants of the JVM to build])
+ AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
[JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])])
-if test "x$with_jvm_variants" = x; then
- with_jvm_variants="server"
-fi
+ if test "x$with_jvm_variants" = x; then
+ with_jvm_variants="server"
+ fi
-JVM_VARIANTS=",$with_jvm_variants,"
-TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'`
+ JVM_VARIANTS=",$with_jvm_variants,"
+ TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'`
-if test "x$TEST_VARIANTS" != "x,"; then
- AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core])
-fi
-AC_MSG_RESULT([$with_jvm_variants])
+ if test "x$TEST_VARIANTS" != "x,"; then
+ AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core])
+ fi
+ AC_MSG_RESULT([$with_jvm_variants])
-JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
-JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
-JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
-JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
-JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
-JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
-JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
+ JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
+ JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
+ JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
+ JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
+ JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
+ JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
+ JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
-if test "x$JVM_VARIANT_CLIENT" = xtrue; then
+ if test "x$JVM_VARIANT_CLIENT" = xtrue; then
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
+ AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
fi
-fi
-if test "x$JVM_VARIANT_KERNEL" = xtrue; then
+ fi
+ if test "x$JVM_VARIANT_KERNEL" = xtrue; then
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
+ AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
fi
-fi
-if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
+ fi
+ if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
+ AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
fi
-fi
+ fi
-# Replace the commas with AND for use in the build directory name.
-ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
-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/' -e 's/core,/1/'`
-if test "x$COUNT_VARIANTS" != "x,1"; then
+ # Replace the commas with AND for use in the build directory name.
+ ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
+ 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/' -e 's/core,/1/'`
+ if test "x$COUNT_VARIANTS" != "x,1"; then
BUILDING_MULTIPLE_JVM_VARIANTS=yes
-else
+ else
BUILDING_MULTIPLE_JVM_VARIANTS=no
-fi
+ fi
-AC_SUBST(JVM_VARIANTS)
-AC_SUBST(JVM_VARIANT_SERVER)
-AC_SUBST(JVM_VARIANT_CLIENT)
-AC_SUBST(JVM_VARIANT_MINIMAL1)
-AC_SUBST(JVM_VARIANT_KERNEL)
-AC_SUBST(JVM_VARIANT_ZERO)
-AC_SUBST(JVM_VARIANT_ZEROSHARK)
-AC_SUBST(JVM_VARIANT_CORE)
+ AC_SUBST(JVM_VARIANTS)
+ AC_SUBST(JVM_VARIANT_SERVER)
+ AC_SUBST(JVM_VARIANT_CLIENT)
+ AC_SUBST(JVM_VARIANT_MINIMAL1)
+ AC_SUBST(JVM_VARIANT_KERNEL)
+ AC_SUBST(JVM_VARIANT_ZERO)
+ AC_SUBST(JVM_VARIANT_ZEROSHARK)
+ AC_SUBST(JVM_VARIANT_CORE)
-INCLUDE_SA=true
-if test "x$JVM_VARIANT_ZERO" = xtrue ; then
+ INCLUDE_SA=true
+ if test "x$JVM_VARIANT_ZERO" = xtrue ; then
INCLUDE_SA=false
-fi
-if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
+ fi
+ if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
INCLUDE_SA=false
-fi
-if test "x$VAR_CPU" = xppc64 ; then
+ fi
+ if test "x$VAR_CPU" = xppc64 ; then
INCLUDE_SA=false
-fi
-AC_SUBST(INCLUDE_SA)
+ fi
+ AC_SUBST(INCLUDE_SA)
-if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
- MACOSX_UNIVERSAL="true"
-fi
+ if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+ MACOSX_UNIVERSAL="true"
+ fi
-AC_SUBST(MACOSX_UNIVERSAL)
-
+ AC_SUBST(MACOSX_UNIVERSAL)
])
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL],
[
-###############################################################################
-#
-# Set the debug level
-# release: no debug information, all optimizations, no asserts.
-# fastdebug: debug information (-g), all optimizations, all asserts
-# slowdebug: debug information (-g), no optimizations, all asserts
-#
-DEBUG_LEVEL="release"
-AC_MSG_CHECKING([which debug level to use])
-AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
- [set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])],
- [
+ ###############################################################################
+ #
+ # Set the debug level
+ # release: no debug information, all optimizations, no asserts.
+ # fastdebug: debug information (-g), all optimizations, all asserts
+ # slowdebug: debug information (-g), no optimizations, all asserts
+ #
+ DEBUG_LEVEL="release"
+ AC_MSG_CHECKING([which debug level to use])
+ AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
+ [set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])],
+ [
ENABLE_DEBUG="${enableval}"
DEBUG_LEVEL="fastdebug"
- ], [ENABLE_DEBUG="no"])
+ ], [ENABLE_DEBUG="no"])
-AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
- [set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])],
- [
+ AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
+ [set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])],
+ [
DEBUG_LEVEL="${withval}"
if test "x$ENABLE_DEBUG" = xyes; then
- AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
+ AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
fi
- ])
-AC_MSG_RESULT([$DEBUG_LEVEL])
+ ])
+ AC_MSG_RESULT([$DEBUG_LEVEL])
-if test "x$DEBUG_LEVEL" != xrelease && \
- test "x$DEBUG_LEVEL" != xfastdebug && \
- test "x$DEBUG_LEVEL" != xslowdebug; then
- AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
-fi
+ if test "x$DEBUG_LEVEL" != xrelease && \
+ test "x$DEBUG_LEVEL" != xfastdebug && \
+ test "x$DEBUG_LEVEL" != xslowdebug; then
+ AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
+ fi
-###############################################################################
-#
-# Setup legacy vars/targets and new vars to deal with different debug levels.
-#
+ ###############################################################################
+ #
+ # Setup legacy vars/targets and new vars to deal with different debug levels.
+ #
-case $DEBUG_LEVEL in
- release )
- VARIANT="OPT"
- FASTDEBUG="false"
- DEBUG_CLASSFILES="false"
- BUILD_VARIANT_RELEASE=""
- HOTSPOT_DEBUG_LEVEL="product"
- HOTSPOT_EXPORT="product"
- ;;
- fastdebug )
- VARIANT="DBG"
- FASTDEBUG="true"
- DEBUG_CLASSFILES="true"
- BUILD_VARIANT_RELEASE="-fastdebug"
- HOTSPOT_DEBUG_LEVEL="fastdebug"
- HOTSPOT_EXPORT="fastdebug"
- ;;
- slowdebug )
- VARIANT="DBG"
- FASTDEBUG="false"
- DEBUG_CLASSFILES="true"
- BUILD_VARIANT_RELEASE="-debug"
- HOTSPOT_DEBUG_LEVEL="jvmg"
- HOTSPOT_EXPORT="debug"
- ;;
-esac
+ case $DEBUG_LEVEL in
+ release )
+ VARIANT="OPT"
+ FASTDEBUG="false"
+ DEBUG_CLASSFILES="false"
+ BUILD_VARIANT_RELEASE=""
+ HOTSPOT_DEBUG_LEVEL="product"
+ HOTSPOT_EXPORT="product"
+ ;;
+ fastdebug )
+ VARIANT="DBG"
+ FASTDEBUG="true"
+ DEBUG_CLASSFILES="true"
+ BUILD_VARIANT_RELEASE="-fastdebug"
+ HOTSPOT_DEBUG_LEVEL="fastdebug"
+ HOTSPOT_EXPORT="fastdebug"
+ ;;
+ slowdebug )
+ VARIANT="DBG"
+ FASTDEBUG="false"
+ DEBUG_CLASSFILES="true"
+ BUILD_VARIANT_RELEASE="-debug"
+ HOTSPOT_DEBUG_LEVEL="jvmg"
+ HOTSPOT_EXPORT="debug"
+ ;;
+ esac
-#####
-# Generate the legacy makefile targets for hotspot.
-# The hotspot api for selecting the build artifacts, really, needs to be improved.
-# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
-# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
-# But until then ...
-HOTSPOT_TARGET=""
+ #####
+ # Generate the legacy makefile targets for hotspot.
+ # The hotspot api for selecting the build artifacts, really, needs to be improved.
+ # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
+ # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
+ # But until then ...
+ HOTSPOT_TARGET=""
-if test "x$JVM_VARIANT_SERVER" = xtrue; then
+ if test "x$JVM_VARIANT_SERVER" = xtrue; then
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
-fi
+ fi
-if test "x$JVM_VARIANT_CLIENT" = xtrue; then
+ if test "x$JVM_VARIANT_CLIENT" = xtrue; then
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
-fi
+ fi
-if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
+ if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
-fi
+ fi
-if test "x$JVM_VARIANT_KERNEL" = xtrue; then
+ if test "x$JVM_VARIANT_KERNEL" = xtrue; then
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
-fi
+ fi
-if test "x$JVM_VARIANT_ZERO" = xtrue; then
+ if test "x$JVM_VARIANT_ZERO" = xtrue; then
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
-fi
+ fi
-if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
+ if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
-fi
+ fi
-if test "x$JVM_VARIANT_CORE" = xtrue; then
+ if test "x$JVM_VARIANT_CORE" = xtrue; then
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
-fi
+ fi
-HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
+ HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
-# On Macosx universal binaries are produced, but they only contain
-# 64 bit intel. This invalidates control of which jvms are built
-# from configure, but only server is valid anyway. Fix this
-# when hotspot makefiles are rewritten.
-if test "x$MACOSX_UNIVERSAL" = xtrue; then
+ # On Macosx universal binaries are produced, but they only contain
+ # 64 bit intel. This invalidates control of which jvms are built
+ # from configure, but only server is valid anyway. Fix this
+ # when hotspot makefiles are rewritten.
+ if test "x$MACOSX_UNIVERSAL" = xtrue; then
HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
-fi
+ fi
-#####
+ #####
-AC_SUBST(DEBUG_LEVEL)
-AC_SUBST(VARIANT)
-AC_SUBST(FASTDEBUG)
-AC_SUBST(DEBUG_CLASSFILES)
-AC_SUBST(BUILD_VARIANT_RELEASE)
+ AC_SUBST(DEBUG_LEVEL)
+ AC_SUBST(VARIANT)
+ AC_SUBST(FASTDEBUG)
+ AC_SUBST(DEBUG_CLASSFILES)
+ AC_SUBST(BUILD_VARIANT_RELEASE)
])
@@ -301,7 +300,7 @@
AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
[
AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
- [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
+ [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
AC_MSG_CHECKING([for presence of closed sources])
if test -d "$SRC_ROOT/jdk/src/closed"; then
@@ -338,100 +337,100 @@
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
[
-###############################################################################
-#
-# Should we build a JDK/JVM with headful support (ie a graphical ui)?
-# We always build headless support.
-#
-AC_MSG_CHECKING([headful support])
-AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
- [disable building headful support (graphical UI support) @<:@enabled@:>@])],
- [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
+ ###############################################################################
+ #
+ # Should we build a JDK/JVM with headful support (ie a graphical ui)?
+ # We always build headless support.
+ #
+ AC_MSG_CHECKING([headful support])
+ AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
+ [disable building headful support (graphical UI support) @<:@enabled@:>@])],
+ [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
-SUPPORT_HEADLESS=yes
-BUILD_HEADLESS="BUILD_HEADLESS:=true"
+ SUPPORT_HEADLESS=yes
+ BUILD_HEADLESS="BUILD_HEADLESS:=true"
-if test "x$SUPPORT_HEADFUL" = xyes; then
+ if test "x$SUPPORT_HEADFUL" = xyes; then
# We are building both headful and headless.
- headful_msg="inlude support for both headful and headless"
-fi
+ headful_msg="include support for both headful and headless"
+ fi
-if test "x$SUPPORT_HEADFUL" = xno; then
+ if test "x$SUPPORT_HEADFUL" = xno; then
# Thus we are building headless only.
BUILD_HEADLESS="BUILD_HEADLESS:=true"
headful_msg="headless only"
-fi
+ fi
-AC_MSG_RESULT([$headful_msg])
+ AC_MSG_RESULT([$headful_msg])
-AC_SUBST(SUPPORT_HEADLESS)
-AC_SUBST(SUPPORT_HEADFUL)
-AC_SUBST(BUILD_HEADLESS)
+ AC_SUBST(SUPPORT_HEADLESS)
+ AC_SUBST(SUPPORT_HEADFUL)
+ AC_SUBST(BUILD_HEADLESS)
-# Control wether Hotspot runs Queens test after build.
-AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
- [run the Queens test after Hotspot build @<:@disabled@:>@])],,
- [enable_hotspot_test_in_build=no])
-if test "x$enable_hotspot_test_in_build" = "xyes"; then
+ # Control wether Hotspot runs Queens test after build.
+ AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
+ [run the Queens test after Hotspot build @<:@disabled@:>@])],,
+ [enable_hotspot_test_in_build=no])
+ if test "x$enable_hotspot_test_in_build" = "xyes"; then
TEST_IN_BUILD=true
-else
+ else
TEST_IN_BUILD=false
-fi
-AC_SUBST(TEST_IN_BUILD)
+ fi
+ AC_SUBST(TEST_IN_BUILD)
-###############################################################################
-#
-# Choose cacerts source file
-#
-AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
- [specify alternative cacerts file])])
-if test "x$with_cacerts_file" != x; then
+ ###############################################################################
+ #
+ # Choose cacerts source file
+ #
+ AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
+ [specify alternative cacerts file])])
+ if test "x$with_cacerts_file" != x; then
CACERTS_FILE=$with_cacerts_file
-else
+ else
CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
-fi
-AC_SUBST(CACERTS_FILE)
+ fi
+ AC_SUBST(CACERTS_FILE)
-###############################################################################
-#
-# Enable or disable unlimited crypto
-#
-AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
- [Enable unlimited crypto policy @<:@disabled@:>@])],,
- [enable_unlimited_crypto=no])
-if test "x$enable_unlimited_crypto" = "xyes"; then
+ ###############################################################################
+ #
+ # Enable or disable unlimited crypto
+ #
+ AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
+ [Enable unlimited crypto policy @<:@disabled@:>@])],,
+ [enable_unlimited_crypto=no])
+ if test "x$enable_unlimited_crypto" = "xyes"; then
UNLIMITED_CRYPTO=true
-else
+ else
UNLIMITED_CRYPTO=false
-fi
-AC_SUBST(UNLIMITED_CRYPTO)
+ fi
+ AC_SUBST(UNLIMITED_CRYPTO)
-###############################################################################
-#
-# Enable or disable the elliptic curve crypto implementation
-#
-AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
-[
-AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
+ ###############################################################################
+ #
+ # Enable or disable the elliptic curve crypto implementation
+ #
+ AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
+ [
+ AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
-if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
- ENABLE_INTREE_EC=yes
- AC_MSG_RESULT([yes])
-else
- ENABLE_INTREE_EC=no
- AC_MSG_RESULT([no])
-fi
+ if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+ ENABLE_INTREE_EC=yes
+ AC_MSG_RESULT([yes])
+ else
+ ENABLE_INTREE_EC=no
+ AC_MSG_RESULT([no])
+ fi
-AC_SUBST(ENABLE_INTREE_EC)
-])
+ AC_SUBST(ENABLE_INTREE_EC)
+ ])
-###############################################################################
-#
-# Compress jars
-#
-COMPRESS_JARS=false
+ ###############################################################################
+ #
+ # Compress jars
+ #
+ COMPRESS_JARS=false
-AC_SUBST(COMPRESS_JARS)
+ AC_SUBST(COMPRESS_JARS)
])
###############################################################################
@@ -440,151 +439,152 @@
#
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
[
-# Source the version numbers
-. $AUTOCONF_DIR/version-numbers
+ # Source the version numbers
+ . $AUTOCONF_DIR/version-numbers
-# Get the settings from parameters
-AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
- [Set milestone value for build @<:@internal@:>@])])
-if test "x$with_milestone" = xyes; then
- AC_MSG_ERROR([Milestone must have a value])
-elif test "x$with_milestone" != x; then
+ # Get the settings from parameters
+ AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
+ [Set milestone value for build @<:@internal@:>@])])
+ if test "x$with_milestone" = xyes; then
+ AC_MSG_ERROR([Milestone must have a value])
+ elif test "x$with_milestone" != x; then
MILESTONE="$with_milestone"
-fi
-if test "x$MILESTONE" = x; then
- MILESTONE=internal
-fi
+ fi
+ if test "x$MILESTONE" = x; then
+ MILESTONE=internal
+ fi
-AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version],
- [Set update version value for build @<:@b00@:>@])])
-if test "x$with_update_version" = xyes; then
- AC_MSG_ERROR([Update version must have a value])
-elif test "x$with_update_version" != x; then
- JDK_UPDATE_VERSION="$with_update_version"
-fi
+ AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version],
+ [Set update version value for build @<:@b00@:>@])])
+ if test "x$with_update_version" = xyes; then
+ AC_MSG_ERROR([Update version must have a value])
+ elif test "x$with_update_version" != x; then
+ JDK_UPDATE_VERSION="$with_update_version"
+ fi
-AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
- [Set build number value for build @<:@b00@:>@])])
-if test "x$with_build_number" = xyes; then
- AC_MSG_ERROR([Build number must have a value])
-elif test "x$with_build_number" != x; then
- JDK_BUILD_NUMBER="$with_build_number"
-fi
-if test "x$JDK_BUILD_NUMBER" = x; then
- JDK_BUILD_NUMBER=b00
-fi
+ AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
+ [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
+ if test "x$with_user_release_suffix" = xyes; then
+ AC_MSG_ERROR([Release suffix must have a value])
+ elif test "x$with_user_release_suffix" != x; then
+ USER_RELEASE_SUFFIX="$with_user_release_suffix"
+ fi
-AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
- [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
-if test "x$with_user_release_suffix" = xyes; then
- AC_MSG_ERROR([Release suffix must have a value])
-elif test "x$with_user_release_suffix" != x; then
- USER_RELEASE_SUFFIX="$with_user_release_suffix"
-else
- BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
- # Avoid [:alnum:] since it depends on the locale.
- CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
- USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-fi
-AC_SUBST(USER_RELEASE_SUFFIX)
+ AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
+ [Set build number value for build @<:@b00@:>@])])
+ if test "x$with_build_number" = xyes; then
+ AC_MSG_ERROR([Build number must have a value])
+ elif test "x$with_build_number" != x; then
+ JDK_BUILD_NUMBER="$with_build_number"
+ fi
+ # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
+ if test "x$JDK_BUILD_NUMBER" = x; then
+ JDK_BUILD_NUMBER=b00
+ if test "x$USER_RELEASE_SUFFIX" = x; then
+ BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
+ # Avoid [:alnum:] since it depends on the locale.
+ CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
+ USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+ fi
-# Now set the JDK version, milestone, build number etc.
-AC_SUBST(JDK_MAJOR_VERSION)
-AC_SUBST(JDK_MINOR_VERSION)
-AC_SUBST(JDK_MICRO_VERSION)
-AC_SUBST(JDK_UPDATE_VERSION)
-AC_SUBST(JDK_BUILD_NUMBER)
-AC_SUBST(MILESTONE)
-AC_SUBST(LAUNCHER_NAME)
-AC_SUBST(PRODUCT_NAME)
-AC_SUBST(PRODUCT_SUFFIX)
-AC_SUBST(JDK_RC_PLATFORM_NAME)
-AC_SUBST(COMPANY_NAME)
-AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
-AC_SUBST(MACOSX_BUNDLE_ID_BASE)
+ # Now set the JDK version, milestone, build number etc.
+ AC_SUBST(USER_RELEASE_SUFFIX)
+ AC_SUBST(JDK_MAJOR_VERSION)
+ AC_SUBST(JDK_MINOR_VERSION)
+ AC_SUBST(JDK_MICRO_VERSION)
+ AC_SUBST(JDK_UPDATE_VERSION)
+ AC_SUBST(JDK_BUILD_NUMBER)
+ AC_SUBST(MILESTONE)
+ AC_SUBST(LAUNCHER_NAME)
+ AC_SUBST(PRODUCT_NAME)
+ AC_SUBST(PRODUCT_SUFFIX)
+ AC_SUBST(JDK_RC_PLATFORM_NAME)
+ AC_SUBST(COMPANY_NAME)
+ AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
+ AC_SUBST(MACOSX_BUNDLE_ID_BASE)
-COPYRIGHT_YEAR=`date +'%Y'`
-AC_SUBST(COPYRIGHT_YEAR)
+ COPYRIGHT_YEAR=`date +'%Y'`
+ AC_SUBST(COPYRIGHT_YEAR)
-if test "x$JDK_UPDATE_VERSION" != x; then
- JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
-else
- JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
-fi
-AC_SUBST(JDK_VERSION)
+ if test "x$JDK_UPDATE_VERSION" != x; then
+ JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
+ else
+ JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
+ fi
+ AC_SUBST(JDK_VERSION)
-COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
-AC_SUBST(COOKED_BUILD_NUMBER)
+ COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
+ AC_SUBST(COOKED_BUILD_NUMBER)
])
AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],
[
-HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
-AC_SUBST(HOTSPOT_MAKE_ARGS)
+ HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
+ AC_SUBST(HOTSPOT_MAKE_ARGS)
-# The name of the Service Agent jar.
-SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
-if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
- SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
-fi
-AC_SUBST(SALIB_NAME)
-
+ # The name of the Service Agent jar.
+ SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
+ if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
+ fi
+ AC_SUBST(SALIB_NAME)
])
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
[
-#
-# ENABLE_DEBUG_SYMBOLS
-# This must be done after the toolchain is setup, since we're looking at objcopy.
-#
-AC_ARG_ENABLE([debug-symbols],
- [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
-
-AC_MSG_CHECKING([if we should generate debug symbols])
+ #
+ # ENABLE_DEBUG_SYMBOLS
+ # This must be done after the toolchain is setup, since we're looking at objcopy.
+ #
+ AC_ARG_ENABLE([debug-symbols],
+ [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
-if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
- # explicit enabling of enable-debug-symbols and can't find objcopy
- # this is an error
- AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
-fi
+ AC_MSG_CHECKING([if we should generate debug symbols])
-if test "x$enable_debug_symbols" = "xyes"; then
- ENABLE_DEBUG_SYMBOLS=true
-elif test "x$enable_debug_symbols" = "xno"; then
- ENABLE_DEBUG_SYMBOLS=false
-else
- # default on macosx is false
- if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- ENABLE_DEBUG_SYMBOLS=false
- # Default is on if objcopy is found, otherwise off
- elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
+ if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
+ # explicit enabling of enable-debug-symbols and can't find objcopy
+ # this is an error
+ AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
+ fi
+
+ if test "x$enable_debug_symbols" = "xyes"; then
ENABLE_DEBUG_SYMBOLS=true
+ elif test "x$enable_debug_symbols" = "xno"; then
+ ENABLE_DEBUG_SYMBOLS=false
else
- ENABLE_DEBUG_SYMBOLS=false
+ # Default is on if objcopy is found
+ if test "x$OBJCOPY" != x; then
+ ENABLE_DEBUG_SYMBOLS=true
+ # MacOS X and Windows don't use objcopy but default is on for those OSes
+ elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
+ ENABLE_DEBUG_SYMBOLS=true
+ else
+ ENABLE_DEBUG_SYMBOLS=false
+ fi
fi
-fi
-AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS])
+ AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS])
-#
-# ZIP_DEBUGINFO_FILES
-#
-AC_MSG_CHECKING([if we should zip debug-info files])
-AC_ARG_ENABLE([zip-debug-info],
- [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
- [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
-AC_MSG_RESULT([${enable_zip_debug_info}])
+ #
+ # ZIP_DEBUGINFO_FILES
+ #
+ AC_MSG_CHECKING([if we should zip debug-info files])
+ AC_ARG_ENABLE([zip-debug-info],
+ [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
+ [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
+ AC_MSG_RESULT([${enable_zip_debug_info}])
-if test "x${enable_zip_debug_info}" = "xno"; then
- ZIP_DEBUGINFO_FILES=false
-else
- ZIP_DEBUGINFO_FILES=true
-fi
+ if test "x${enable_zip_debug_info}" = "xno"; then
+ ZIP_DEBUGINFO_FILES=false
+ else
+ ZIP_DEBUGINFO_FILES=true
+ fi
-AC_SUBST(ENABLE_DEBUG_SYMBOLS)
-AC_SUBST(ZIP_DEBUGINFO_FILES)
-AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
-AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
+ AC_SUBST(ENABLE_DEBUG_SYMBOLS)
+ AC_SUBST(ZIP_DEBUGINFO_FILES)
+ AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
+ AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
])
# Support for customization of the build process. Some build files
@@ -592,5 +592,5 @@
# for a degree of customization of the build targets and the rules/recipes
# to create them
AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir],
- [use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
+[use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
AC_SUBST(CUSTOM_MAKE_DIR)