1.1 --- a/common/autoconf/jdk-options.m4 Thu Sep 06 17:27:20 2012 -0700
1.2 +++ b/common/autoconf/jdk-options.m4 Tue Sep 18 11:29:16 2012 -0700
1.3 @@ -30,7 +30,7 @@
1.4 # Check which variant of the JDK that we want to build.
1.5 # Currently we have:
1.6 # normal: standard edition
1.7 -# embedded: cut down to a smaller footprint
1.8 +# but the custom make system may add other variants
1.9 #
1.10 # Effectively the JDK variant gives a name to a specific set of
1.11 # modules to compile into the JDK. In the future, these modules
1.12 @@ -38,22 +38,14 @@
1.13 #
1.14 AC_MSG_CHECKING([which variant of the JDK to build])
1.15 AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
1.16 - [JDK variant to build (normal, embedded) @<:@normal@:>@])])
1.17 + [JDK variant to build (normal) @<:@normal@:>@])])
1.18
1.19 if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
1.20 - JAVASE_EMBEDDED=""
1.21 - MINIMIZE_RAM_USAGE=""
1.22 JDK_VARIANT="normal"
1.23 -elif test "x$with_jdk_variant" = xembedded; then
1.24 - JAVASE_EMBEDDED="JAVASE_EMBEDDED:=true"
1.25 - MINIMIZE_RAM_USAGE="MINIMIZE_RAM_USAGE:=true"
1.26 - JDK_VARIANT="embedded"
1.27 else
1.28 - AC_MSG_ERROR([The available JDK variants are: normal, embedded])
1.29 + AC_MSG_ERROR([The available JDK variants are: normal])
1.30 fi
1.31 -
1.32 -AC_SUBST(JAVASE_EMBEDDED)
1.33 -AC_SUBST(MINIMIZE_RAM_USAGE)
1.34 +
1.35 AC_SUBST(JDK_VARIANT)
1.36
1.37 AC_MSG_RESULT([$JDK_VARIANT])
1.38 @@ -77,11 +69,7 @@
1.39 [JVM variants (separated by commas) to build (server, client, kernel, zero, zeroshark) @<:@server@:>@])])
1.40
1.41 if test "x$with_jvm_variants" = x; then
1.42 - if test "x$JDK_VARIANT" = xembedded; then
1.43 - with_jvm_variants="client"
1.44 - else
1.45 - with_jvm_variants="server"
1.46 - fi
1.47 + with_jvm_variants="server"
1.48 fi
1.49
1.50 JVM_VARIANTS=",$with_jvm_variants,"
1.51 @@ -125,6 +113,11 @@
1.52 AC_SUBST(JVM_VARIANT_ZERO)
1.53 AC_SUBST(JVM_VARIANT_ZEROSHARK)
1.54
1.55 +if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.56 + MACOSX_UNIVERSAL="true"
1.57 +fi
1.58 +
1.59 +AC_SUBST(MACOSX_UNIVERSAL)
1.60
1.61 ])
1.62
1.63 @@ -223,6 +216,14 @@
1.64
1.65 HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
1.66
1.67 +# On Macosx universal binaries are produced, but they only contain
1.68 +# 64 bit intel. This invalidates control of which jvms are built
1.69 +# from configure, but only server is valid anyway. Fix this
1.70 +# when hotspot makefiles are rewritten.
1.71 +if test "x$MACOSX_UNIVERSAL" = xtrue; then
1.72 + HOTSPOT_TARGET=universal_product
1.73 +fi
1.74 +
1.75 #####
1.76
1.77 AC_SUBST(DEBUG_LEVEL)
1.78 @@ -289,14 +290,12 @@
1.79
1.80 if test "x$SUPPORT_HEADFUL" = xyes; then
1.81 # We are building both headful and headless.
1.82 - BUILD_HEADLESS_ONLY=""
1.83 headful_msg="inlude support for both headful and headless"
1.84 fi
1.85
1.86 if test "x$SUPPORT_HEADFUL" = xno; then
1.87 # Thus we are building headless only.
1.88 BUILD_HEADLESS="BUILD_HEADLESS:=true"
1.89 - BUILD_HEADLESS_ONLY="BUILD_HEADLESS_ONLY:=true"
1.90 headful_msg="headless only"
1.91 fi
1.92
1.93 @@ -305,23 +304,6 @@
1.94 AC_SUBST(SUPPORT_HEADLESS)
1.95 AC_SUBST(SUPPORT_HEADFUL)
1.96 AC_SUBST(BUILD_HEADLESS)
1.97 -AC_SUBST(BUILD_HEADLESS_ONLY)
1.98 -
1.99 -###############################################################################
1.100 -#
1.101 -# Should we run the painfully slow javadoc tool?
1.102 -#
1.103 -AC_MSG_CHECKING([whether to build documentation])
1.104 -AC_ARG_ENABLE([docs], [AS_HELP_STRING([--enable-docs],
1.105 - [enable generation of Javadoc documentation @<:@disabled@:>@])],
1.106 - [ENABLE_DOCS="${enableval}"], [ENABLE_DOCS='no'])
1.107 -AC_MSG_RESULT([$ENABLE_DOCS])
1.108 -AC_SUBST(ENABLE_DOCS)
1.109 -GENERATE_DOCS=false
1.110 -if test "x$ENABLE_DOCS" = xyes; then
1.111 - GENERATE_DOCS=true
1.112 -fi
1.113 -AC_SUBST(GENERATE_DOCS)
1.114
1.115 ###############################################################################
1.116 #
1.117 @@ -373,25 +355,21 @@
1.118 #
1.119 COMPRESS_JARS=false
1.120
1.121 -# default for embedded is yes...
1.122 -if test "x$JDK_VARIANT" = "xembedded"; then
1.123 - COMPRESS_JARS=true
1.124 -fi
1.125 AC_SUBST(COMPRESS_JARS)
1.126
1.127 ###############################################################################
1.128 #
1.129 # Should we compile JFR
1.130 -# default no, except for on closed-jdk and !embedded
1.131 +# default no, except for on closed-jdk
1.132 #
1.133 ENABLE_JFR=no
1.134
1.135 # Is the JFR source present
1.136
1.137 #
1.138 -# For closed && !embedded default is yes if the source is present
1.139 +# For closed default is yes
1.140 #
1.141 -if test "x${OPENJDK}" != "xtrue" && test "x$JDK_VARIANT" != "xembedded" && test -d "$SRC_ROOT/jdk/src/closed/share/native/oracle/jfr"; then
1.142 +if test "x${OPENJDK}" != "xtrue"; then
1.143 ENABLE_JFR=yes
1.144 fi
1.145
1.146 @@ -469,7 +447,7 @@
1.147
1.148 AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],
1.149 [
1.150 -HOTSPOT_MAKE_ARGS="ALT_OUTPUTDIR=$HOTSPOT_OUTPUTDIR ALT_EXPORT_PATH=$HOTSPOT_DIST $HOTSPOT_TARGET"
1.151 +HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
1.152 AC_SUBST(HOTSPOT_MAKE_ARGS)
1.153
1.154 # The name of the Service Agent jar.
1.155 @@ -494,11 +472,6 @@
1.156 ENABLE_DEBUG_SYMBOLS=no
1.157 fi
1.158
1.159 -# default for embedded is no...
1.160 -if test "x$JDK_VARIANT" = "xembedded"; then
1.161 - ENABLE_DEBUG_SYMBOLS=no
1.162 -fi
1.163 -
1.164 AC_ARG_ENABLE([debug-symbols],
1.165 [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols (@<:@enabled@:>@)])],
1.166 [ENABLE_DEBUG_SYMBOLS=${enable_debug_symbols}],
1.167 @@ -549,3 +522,11 @@
1.168 AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
1.169 AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
1.170 ])
1.171 +
1.172 +# Support for customization of the build process. Some build files
1.173 +# will include counterparts from this location, if they exist. This allows
1.174 +# for a degree of customization of the build targets and the rules/recipes
1.175 +# to create them
1.176 +AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir],
1.177 + [directory containing custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
1.178 +AC_SUBST(CUSTOM_MAKE_DIR)
