Mercurial > hg > icedtea8
changeset 2977:219b6e046247
PR3811: Don't attempt to install JFR files when JFR is disabled
2020-10-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR3811: Don't attempt to install JFR files when
JFR is disabled
* Makefile.am,
(install-data-local): Create jre/lib/jfr directory
and copy over *.jfc files only if USE_JFR is set.
(uninstall-local): Only attempt to remove the
jre/lib/jfr directory if it exists.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 28 Oct 2020 07:05:24 +0000 |
| parents | 03c085bd7eee |
| children | 6934b243d5b8 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 23 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 27 21:49:10 2020 +0000 +++ b/ChangeLog Wed Oct 28 07:05:24 2020 +0000 @@ -1,3 +1,14 @@ +2020-10-27 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR3811: Don't attempt to install JFR files when + JFR is disabled + * Makefile.am, + (install-data-local): Create jre/lib/jfr directory + and copy over *.jfc files only if USE_JFR is set. + (uninstall-local): Only attempt to remove the + jre/lib/jfr directory if it exists. + * NEWS: Updated. + 2020-10-27 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3810: Enable JFR on x86 (32-bit) now that
--- a/Makefile.am Tue Oct 27 21:49:10 2020 +0000 +++ b/Makefile.am Wed Oct 28 07:05:24 2020 +0000 @@ -3106,7 +3106,7 @@ ${mkinstalldirs} $(DESTDIR)${prefix}/jre/.systemPrefs ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR) - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/{cmm,ext,jfr,images/cursors,management,security} + ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security} ${mkinstalldirs} $(DESTDIR)$(mandir)/{man1,ja_JP.UTF-8/man1} ${mkinstalldirs} $(DESTDIR)${prefix}/demo ${mkinstalldirs} $(DESTDIR)${prefix}/sample @@ -3137,9 +3137,6 @@ $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/cmm; \ done $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/ext/meta-index $(DESTDIR)${prefix}/jre/lib/ext - for files in $(BUILD_SDK_DIR)/jre/lib/jfr/*.jfc; do \ - $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/jfr; \ - done for files in $(BUILD_SDK_DIR)/jre/lib/images/cursors/*.gif; do \ $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/images/cursors; \ done @@ -3204,6 +3201,12 @@ ${mkinstalldirs} $(DESTDIR)$(htmldir) cp -RP $(BUILD_OUTPUT_DIR)/docs/* $(DESTDIR)$(htmldir) endif +if USE_JFR + ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/jfr + for files in $(BUILD_SDK_DIR)/jre/lib/jfr/*.jfc; do \ + $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/jfr; \ + done +endif for vms in client server ; do \ if [ -f $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/classes.jsa ] ; then \ ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \ @@ -3367,13 +3370,16 @@ if [ -h $(DESTDIR)${prefix}/jre/lib/arm ] ; then \ rm -vf $(DESTDIR)${prefix}/jre/lib/arm ; \ fi + if [ -d $(DESTDIR)${prefix}/jre/lib/jfr ] ; then \ + $(RMDIR) $(DESTDIR)${prefix}/jre/lib/jfr ; \ + fi $(RMDIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli $(RMDIR) $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR) $(RMDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)${exec_prefix}/lib $(RMDIR) $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli $(RMDIR) $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR) $(RMDIR) $(DESTDIR)${prefix}/jre/lib/security/policy - $(RMDIR) $(DESTDIR)${prefix}/jre/lib/{cmm,ext,jfr,images/cursors,management,security} + $(RMDIR) $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security} $(RMDIR) $(DESTDIR)${prefix}/jre/lib/images $(RMDIR) $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib $(RMDIR) $(DESTDIR)${prefix}/jre/.systemPrefs
--- a/NEWS Tue Oct 27 21:49:10 2020 +0000 +++ b/NEWS Wed Oct 28 07:05:24 2020 +0000 @@ -399,6 +399,7 @@ - PR3799: Adapt elliptic curve patches to JDK-8245468: Add TLSv1.3 implementation classes from 11.0.7 - PR3808: IcedTea does not install the JFR *.jfc files - PR3810: Enable JFR on x86 (32-bit) now that JDK-8252096 has fixed its use with Shenandoah + - PR3811: Don't attempt to install JFR files when JFR is disabled * Shenandoah - [backport] 8221435: Shenandoah should not mark through weak roots - [backport] 8221629: Shenandoah: Cleanup class unloading logic