/hg/icedtea: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 081a31fe1c39 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=081a31fe1c39
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Apr 07 03:55:41 2016 +0100

	PR2917: Don't pass --with-cacerts-file to build if USE_ALT_CACERTS_FILE is not set

	2016-04-06  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR2917: Don't pass --with-cacerts-file to
		build if USE_ALT_CACERTS_FILE is not set
		* Makefile.am:
		(ICEDTEA_CONFIGURE): Only pass --with-cacerts-file
		if USE_ALT_CACERTS_FILE is set.
		* NEWS: Updated.


changeset 560c5d58d756 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=560c5d58d756
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Apr 07 04:18:28 2016 +0100

	PR2918: Makefile handles cacerts as a symlink, but the configure check doesn't

	2016-04-06  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR2918: Makefile handles cacerts as a symlink,
		but the configure check doesn't
		* Makefile.am:
		(JDK_CACERTS_FILE): Removed as no longer needed.
		(CACERTS_FILE): Just use @ALT_CACERTS_FILE@ directly
		as it will have been resolved by configure.
		* NEWS: Updated.
		* acinclude.m4:
		(IT_WITH_CACERTS_FILE): Detect if the cacerts is
		a symlink and resolve it if so.


diffstat:

 ChangeLog    |  22 ++++++++++++++++++++++
 Makefile.am  |  11 ++++++-----
 NEWS         |   2 ++
 acinclude.m4 |   4 ++++
 4 files changed, 34 insertions(+), 5 deletions(-)

diffs (90 lines):

diff -r 7fd913249ef5 -r 560c5d58d756 ChangeLog
--- a/ChangeLog	Thu Apr 07 03:25:35 2016 +0100
+++ b/ChangeLog	Thu Apr 07 04:18:28 2016 +0100
@@ -1,3 +1,25 @@
+2016-04-06  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR2918: Makefile handles cacerts as a symlink,
+	but the configure check doesn't
+	* Makefile.am:
+	(JDK_CACERTS_FILE): Removed as no longer needed.
+	(CACERTS_FILE): Just use @ALT_CACERTS_FILE@ directly
+	as it will have been resolved by configure.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_WITH_CACERTS_FILE): Detect if the cacerts is
+	a symlink and resolve it if so.
+
+2016-04-06  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR2917: Don't pass --with-cacerts-file to
+	build if USE_ALT_CACERTS_FILE is not set
+	* Makefile.am:
+	(ICEDTEA_CONFIGURE): Only pass --with-cacerts-file
+	if USE_ALT_CACERTS_FILE is set.
+	* NEWS: Updated.
+
 2016-04-06  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	PR2916: Update CACAO drop to use the latest
diff -r 7fd913249ef5 -r 560c5d58d756 Makefile.am
--- a/Makefile.am	Thu Apr 07 03:25:35 2016 +0100
+++ b/Makefile.am	Thu Apr 07 04:18:28 2016 +0100
@@ -90,10 +90,7 @@
 
 VERSION_SETTINGS_FILE_BACKUP = $$(basename $(VERSION_SETTINGS_FILE)).bak
 
-JDK_CACERTS_FILE = @ALT_CACERTS_FILE@
-
-CACERTS_FILE = \
-  `if [ -h $(JDK_CACERTS_FILE) ] ; then $(READLINK) -e $(JDK_CACERTS_FILE) ; else echo $(JDK_CACERTS_FILE); fi`
+CACERTS_FILE = @ALT_CACERTS_FILE@
 
 # Settings for javac
 
@@ -411,7 +408,6 @@
 	  --build=$(build_triplet) \
 	  --host=$(host_triplet) \
 	  --enable-unlimited-crypto \
-	  --with-cacerts-file=$(CACERTS_FILE) \
 	  --with-stdc++lib=dynamic \
 	  --with-boot-jdk=$(BOOT_DIR) \
 	  --with-update-version=$(JDK_UPDATE_VERSION) \
@@ -497,6 +493,11 @@
 	--disable-warnings-as-errors
 endif
 
+if USE_ALT_CACERTS_FILE
+ICEDTEA_CONFIGURE += \
+	--with-cacerts-file=$(CACERTS_FILE)
+endif
+
 ICEDTEA_UNSET = \
 	JAVAC= \
 	JAVA_HOME= \
diff -r 7fd913249ef5 -r 560c5d58d756 NEWS
--- a/NEWS	Thu Apr 07 03:25:35 2016 +0100
+++ b/NEWS	Thu Apr 07 04:18:28 2016 +0100
@@ -161,6 +161,8 @@
   - PR2885: Location of 'stap' executable is hard-coded
   - PR2906: Support prefixed variants of GNU tools used on *BSD systems
   - PR2907: Replace --with-abs-install-dir with usual --prefix
+  - PR2917: Don't pass --with-cacerts-file to build if USE_ALT_CACERTS_FILE is not set
+  - PR2918: Makefile handles cacerts as a symlink, but the configure check doesn't
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck
diff -r 7fd913249ef5 -r 560c5d58d756 acinclude.m4
--- a/acinclude.m4	Thu Apr 07 03:25:35 2016 +0100
+++ b/acinclude.m4	Thu Apr 07 04:18:28 2016 +0100
@@ -2217,6 +2217,10 @@
       AC_MSG_NOTICE([No cacerts file specified; using ${CACERTS_DEFAULT}])
       ALT_CACERTS_FILE=${CACERTS_DEFAULT} ;
     fi
+    if test -h "${ALT_CACERTS_FILE}"; then
+       ALT_CACERTS_FILE=$(${READLINK} -e ${ALT_CACERTS_FILE})
+       AC_MSG_NOTICE([Resolved cacerts file symlink to ${ALT_CACERTS_FILE}])
+    fi
     AC_MSG_CHECKING([if $ALT_CACERTS_FILE is a valid keystore file])
     if test -f "${ALT_CACERTS_FILE}" && \
      ${FILE} ${ALT_CACERTS_FILE} | ${GREP} 'Java KeyStore' >&AS_MESSAGE_LOG_FD 2>&1; then