Mercurial > hg > icedtea9
changeset 2664:560c5d58d756
PR2918: Makefile handles cacerts as a symlink, but the configure check doesn't
2016-04-06 Andrew John Hughes <gnu_andrew@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.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Thu, 07 Apr 2016 04:18:28 +0100 |
parents | 081a31fe1c39 |
children | 9e5bab0925d7 |
files | ChangeLog Makefile.am NEWS acinclude.m4 |
diffstat | 4 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 07 03:55:41 2016 +0100 +++ b/ChangeLog Thu Apr 07 04:18:28 2016 +0100 @@ -1,3 +1,16 @@ +2016-04-06 Andrew John Hughes <gnu_andrew@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@member.fsf.org> PR2917: Don't pass --with-cacerts-file to
--- a/Makefile.am Thu Apr 07 03:55:41 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
--- a/NEWS Thu Apr 07 03:55:41 2016 +0100 +++ b/NEWS Thu Apr 07 04:18:28 2016 +0100 @@ -162,6 +162,7 @@ - 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
--- a/acinclude.m4 Thu Apr 07 03:55:41 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