Mercurial > hg > icedtea7
changeset 2884:585a1a8b57bf icedtea-2.7.0pre06
PR3119: Makefile handles cacerts as a symlink, but the configure check doesn't
2016-04-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR3119: 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, 28 Jul 2016 19:58:24 +0100 |
parents | 1f371c45ae04 |
children | b84bb570bbb5 |
files | ChangeLog Makefile.am NEWS acinclude.m4 |
diffstat | 4 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 28 18:21:44 2016 +0100 +++ b/ChangeLog Thu Jul 28 19:58:24 2016 +0100 @@ -1,3 +1,16 @@ +2016-04-06 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR3119: 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-07-28 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3118: Path to agpl-3.0.txt not updated
--- a/Makefile.am Thu Jul 28 18:21:44 2016 +0100 +++ b/Makefile.am Thu Jul 28 19:58:24 2016 +0100 @@ -92,10 +92,7 @@ SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS) -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@ # Sources used from OpenJDK. ICEDTEA_BOOTSTRAP_CLASSES =
--- a/NEWS Thu Jul 28 18:21:44 2016 +0100 +++ b/NEWS Thu Jul 28 19:58:24 2016 +0100 @@ -53,6 +53,7 @@ - PR3115: Add check for elliptic curve cryptography implementation - PR3116: Add tests for Java debug info and source files - PR3118: Path to agpl-3.0.txt not updated + - PR3119: Makefile handles cacerts as a symlink, but the configure check doesn't * AArch64 port - S8148328: aarch64: redundant lsr instructions in stub code. - S8148783: aarch64: SEGV running SpecJBB2013
--- a/acinclude.m4 Thu Jul 28 18:21:44 2016 +0100 +++ b/acinclude.m4 Thu Jul 28 19:58:24 2016 +0100 @@ -3377,6 +3377,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