Mercurial > hg > icedtea12
changeset 2578:aecf66878c91
PR2429: OpenJDK build does not copy a symlinked cacerts file
2015-06-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2429: OpenJDK build does not copy a symlinked
cacerts file
* Makefile.am:
(JDK_CACERTS_FILE): Added to specify the location
of cacerts within the bootstrap JDK.
(CACERTS_FILE): Find the regular cacerts file,
dereferencing any symlinks which point to it.
(ICEDTEA_CONFIGURE): Pass the deferenced CACERTS_FILE
to OpenJDK's configure, rather than the JDK path.
* NEWS: Updated.
* configure.ac:
Call IT_FIND_TOOL to locate the readlink tool,
which is part of coreutils.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Tue, 16 Jun 2015 20:04:36 +0100 |
| parents | e383106102c8 |
| children | 703212f89ecb |
| files | ChangeLog Makefile.am NEWS configure.ac |
| diffstat | 4 files changed, 24 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 15 16:31:23 2015 +0100 +++ b/ChangeLog Tue Jun 16 20:04:36 2015 +0100 @@ -1,3 +1,19 @@ +2015-06-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2429: OpenJDK build does not copy a symlinked + cacerts file + * Makefile.am: + (JDK_CACERTS_FILE): Added to specify the location + of cacerts within the bootstrap JDK. + (CACERTS_FILE): Find the regular cacerts file, + dereferencing any symlinks which point to it. + (ICEDTEA_CONFIGURE): Pass the deferenced CACERTS_FILE + to OpenJDK's configure, rather than the JDK path. + * NEWS: Updated. + * configure.ac: + Call IT_FIND_TOOL to locate the readlink tool, + which is part of coreutils. + 2015-06-15 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2413: OpenJDK doesn't auto-select Zero on
--- a/Makefile.am Mon Jun 15 16:31:23 2015 +0100 +++ b/Makefile.am Tue Jun 16 20:04:36 2015 +0100 @@ -96,6 +96,11 @@ VERSION_SETTINGS_FILE = openjdk/jdk/make/ProfileNames.gmk +JDK_CACERTS_FILE = $(SYSTEM_JDK_DIR)/jre/lib/security/cacerts + +CACERTS_FILE = \ + `if [ -h $(JDK_CACERTS_FILE) ] ; then $(READLINK) -e $(JDK_CACERTS_FILE) ; else echo $(JDK_CACERTS_FILE); fi` + # Sources used from OpenJDK. #PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement #PR48033 - Missing javax.management.remote.JMXServiceURL @@ -284,7 +289,7 @@ ICEDTEA_CONFIGURE = \ --enable-unlimited-crypto \ - --with-cacerts-file=$(SYSTEM_JDK_DIR)/jre/lib/security/cacerts \ + --with-cacerts-file=$(CACERTS_FILE) \ --with-stdc++lib=dynamic \ --with-boot-jdk=$(BOOT_DIR) \ --with-update-version=$(JDK_UPDATE_VERSION) \
--- a/NEWS Mon Jun 15 16:31:23 2015 +0100 +++ b/NEWS Tue Jun 16 20:04:36 2015 +0100 @@ -103,6 +103,7 @@ - PR2411: Fix references to hotspot.map following PR2001 - PR2413: OpenJDK doesn't auto-select Zero on architectures where no server JVM is available - PR2414: CFLAGS, CXXFLAGS and LDFLAGS should be passed to OpenJDK build + - PR2429: OpenJDK build does not copy a symlinked cacerts file - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck
--- a/configure.ac Mon Jun 15 16:31:23 2015 +0100 +++ b/configure.ac Tue Jun 16 20:04:36 2015 +0100 @@ -34,6 +34,7 @@ IT_FIND_TOOL([UNZIP], [unzip]) IT_FIND_TOOL([CPIO], [cpio]) IT_FIND_TOOL([FILE], [file]) +IT_FIND_TOOL([READLINK], [readlink]) AC_CHECK_TOOLS([FASTJAR], [fastjar jar]) if test "x$FASTJAR" = x; then AC_MSG_ERROR([Can't find fastjar or jar])