diff options
author | lana <none@none> | 2013-04-02 11:55:09 -0700 |
---|---|---|
committer | lana <none@none> | 2013-04-02 11:55:09 -0700 |
commit | e92e572772d9428a8a535c37770baf9f0f9cdf56 (patch) | |
tree | bdbd3c34b2bae8c3136373dd42b2e4d5eb40d956 | |
parent | c160fe989271bf3ff00b61ffa01c8ae6f71e07c7 (diff) | |
parent | ee406887dfecb9c857d891126bb24b2c99769f0b (diff) |
Merge
-rw-r--r-- | .hgtags | 2 | ||||
-rw-r--r-- | common/autoconf/configure.ac | 1 | ||||
-rw-r--r-- | common/autoconf/generated-configure.sh | 27 | ||||
-rw-r--r-- | common/autoconf/jdk-options.m4 | 19 | ||||
-rw-r--r-- | common/autoconf/libraries.m4 | 2 | ||||
-rw-r--r-- | common/autoconf/spec.gmk.in | 1 |
6 files changed, 49 insertions, 3 deletions
@@ -203,3 +203,5 @@ fd1a5574cf68af24bfd52decc37ac6361afb278a jdk8-b78 91d35211e74464dca5edf9b66ab01d0d0d8cded7 jdk8-b79 907a926d3c96472f357617b48b6b968ea855c23c jdk8-b80 145dbc56f931c134e837b675b9e6e7bf08902e93 jdk8-b81 +29153d0df68f84162ffe8c2cf4f402a3f2245e85 jdk8-b82 +466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83 diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac index da9996f..5e632c4 100644 --- a/common/autoconf/configure.ac +++ b/common/autoconf/configure.ac @@ -194,6 +194,7 @@ BASIC_COMPILE_FIXPATH ############################################################################### JDKOPT_SETUP_BUILD_TWEAKS +JDKOPT_DETECT_INTREE_EC ############################################################################### # diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index bb61656..4d9ec98 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -612,6 +612,7 @@ SJAVAC_SERVER_JAVA JOBS MEMORY_SIZE NUM_CORES +ENABLE_INTREE_EC SALIB_NAME HOTSPOT_MAKE_ARGS FIXPATH @@ -3752,7 +3753,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1363150186 +DATE_WHEN_GENERATED=1363706268 ############################################################################### # @@ -10786,6 +10787,12 @@ fi ############################################################################### # +# Enable or disable the elliptic curve crypto implementation +# + + +############################################################################### +# # Compress jars # COMPRESS_JARS=false @@ -29823,7 +29830,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : _ACEOF X11_A_OK=yes else - X11_A_OK=no + X11_A_OK=no; break fi done @@ -31694,6 +31701,22 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5 +$as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; } + +if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then + ENABLE_INTREE_EC=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + ENABLE_INTREE_EC=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + ############################################################################### # # Configure parts of the build that only affect the build performance, diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 48eb3f8..d3d55e5 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -366,6 +366,25 @@ 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]) + +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) +]) + +############################################################################### +# # Compress jars # COMPRESS_JARS=false diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 index 91b0a84..6cc9d63 100644 --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 @@ -182,7 +182,7 @@ CFLAGS="$CFLAGS $X_CFLAGS" # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10 AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h], [X11_A_OK=yes], - [X11_A_OK=no], + [X11_A_OK=no; break], [ # include <X11/Xlib.h> # include <X11/Xutil.h> ]) diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index 92c6d9c..bfba636 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -539,6 +539,7 @@ endif # Build setup ENABLE_JFR=@ENABLE_JFR@ +ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ |