/hg/icedtea: PR1983: Support using the system installation of NS...

[andrew at icedtea.classpath.org]

changeset 130888a5c713 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=130888a5c713
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sat Jan 30 01:25:06 2016 +0000

	PR1983: Support using the system installation of NSS with the SunEC provider

	2016-01-29  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR1983: Support using the system installation
		of NSS with the SunEC provider
		* Makefile.am:
		(check-ecc): Make argument dependent on whether
		the SunEC provider is enabled or not.


diffstat:

 ChangeLog   |  8 ++++++++
 Makefile.am |  8 +++++++-
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r e4660f6210fa -r 130888a5c713 ChangeLog
--- a/ChangeLog	Sat Jan 30 01:15:16 2016 +0000
+++ b/ChangeLog	Sat Jan 30 01:25:06 2016 +0000
@@ -1,3 +1,11 @@
+2016-01-29  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR1983: Support using the system installation
+	of NSS with the SunEC provider
+	* Makefile.am:
+	(check-ecc): Make argument dependent on whether
+	the SunEC provider is enabled or not.
+
 2016-01-29  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	PR1983: Support using the system installation
diff -r e4660f6210fa -r 130888a5c713 Makefile.am
--- a/Makefile.am	Sat Jan 30 01:15:16 2016 +0000
+++ b/Makefile.am	Sat Jan 30 01:25:06 2016 +0000
@@ -209,6 +209,12 @@
 TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))
 endif
 
+if ENABLE_SUNEC
+ECC_RESULT = yes
+else
+ECC_RESULT = no
+endif
+
 # Target to ensure a patched OpenJDK tree containing Zero & Shark
 # and any overlays is available in $(abs_top_builddir)/openjdk
 OPENJDK_TREE = stamps/overlay.stamp
@@ -2367,7 +2373,7 @@
 
 stamps/check-ecc.stamp: stamps/ecccheck.stamp stamps/icedtea.stamp
 	if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
-	  $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport yes ; \
+	  $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport $(ECC_RESULT) ; \
 	fi
 	mkdir -p stamps
 	touch $@