Mercurial > hg > release > icedtea7-2.4
changeset 2638:609b5317bd98
RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive
2013-06-05 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR1280: Updating/Installing OpenJDK should recreate the
shared class-data archive
* Makefile.am:
(.PHONY): Add clean-add-archive, clean-add-archive-debug
and clean-add-archive-boot.
2013-02-08 Andrew John Hughes <gnu.andrew@redhat.com>
PR1301: PR1171 causes Zero builds to fail
* Makefile.am:
(add-archive): Don't run -Xshare:dump if building
Zero.
(add-archive-debug): Likewise.
(add-archive-boot): Likewise.
2013-01-25 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(clean-add-archive): Delete the archive.
(clean-add-archive-debug): Likewise for debug.
(clean-add-archive-boot): Likewise for bootstrap.
2012-11-28 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(add-archive): Only run -Xshare:dump when java
exists and we aren't building CACAO or JamVM.
(add-archive-debug): Likewise.
(add-archive-boot): Likewise.
2012-11-20 Andrew John Hughes <gnu.andrew@redhat.com>
RH513605: Updating/Installing OpenJDK should recreate
the shared class-data archive
* Makefile.am:
(add-archive): Run -Xshare:dump on the newly built JDK.
(clean-add-archive): Delete stamp.
(add-archive-debug): Same as add-archive for icedtea-debug.
(clean-add-archive-debug): Same as clean-add-archive for icedtea-debug.
(icedtea-stage2): Depend on add-archive.
(clean-icedtea-stage2): Depend on clean-add-archive.
(icedtea-debug-stage2): Depend on add-archive-debug.
(clean-icedtea-debug-stage2): Depend on clean-add-archive-debug.
(add-archive-boot): Same as add-archive for icedtea-boot.
(clean-add-archive-boot): Same as clean-add-archive for icedtea-boot.
(icedtea-stage1): Depend on add-archive-boot.
(clean-icedtea-stage1): Depend on clean-add-archive-boot.
* NEWS: Mention.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Wed, 05 Jun 2013 22:56:36 +0100 |
parents | 080f4776a2f8 |
children | bfcb188e2568 |
files | ChangeLog Makefile.am NEWS |
diffstat | 3 files changed, 118 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 05 20:59:33 2013 +0100 +++ b/ChangeLog Wed Jun 05 22:56:36 2013 +0100 @@ -1,3 +1,54 @@ +2013-06-05 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR1280: Updating/Installing OpenJDK should recreate the + shared class-data archive + * Makefile.am: + (.PHONY): Add clean-add-archive, clean-add-archive-debug + and clean-add-archive-boot. + +2013-02-08 Andrew John Hughes <gnu.andrew@redhat.com> + + PR1301: PR1171 causes Zero builds to fail + * Makefile.am: + (add-archive): Don't run -Xshare:dump if building + Zero. + (add-archive-debug): Likewise. + (add-archive-boot): Likewise. + +2013-01-25 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (clean-add-archive): Delete the archive. + (clean-add-archive-debug): Likewise for debug. + (clean-add-archive-boot): Likewise for bootstrap. + +2012-11-28 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (add-archive): Only run -Xshare:dump when java + exists and we aren't building CACAO or JamVM. + (add-archive-debug): Likewise. + (add-archive-boot): Likewise. + +2012-11-20 Andrew John Hughes <gnu.andrew@redhat.com> + + RH513605: Updating/Installing OpenJDK should recreate + the shared class-data archive + * Makefile.am: + (add-archive): Run -Xshare:dump on the newly built JDK. + (clean-add-archive): Delete stamp. + (add-archive-debug): Same as add-archive for icedtea-debug. + (clean-add-archive-debug): Same as clean-add-archive for icedtea-debug. + (icedtea-stage2): Depend on add-archive. + (clean-icedtea-stage2): Depend on clean-add-archive. + (icedtea-debug-stage2): Depend on add-archive-debug. + (clean-icedtea-debug-stage2): Depend on clean-add-archive-debug. + (add-archive-boot): Same as add-archive for icedtea-boot. + (clean-add-archive-boot): Same as clean-add-archive for icedtea-boot. + (icedtea-stage1): Depend on add-archive-boot. + (clean-icedtea-stage1): Depend on clean-add-archive-boot. + * NEWS: Mention. + 2013-06-05 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1170: Ensure unlimited crypto policy is in place.
--- a/Makefile.am Wed Jun 05 20:59:33 2013 +0100 +++ b/Makefile.am Wed Jun 05 22:56:36 2013 +0100 @@ -835,7 +835,8 @@ clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \ clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \ clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot \ - clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot + clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \ + clean-add-archive clean-add-archive-debug clean-add-archive-boot env: @echo 'unset JAVA_HOME' @@ -1928,23 +1929,58 @@ clean-check-crypto-debug: rm -f stamps/check-crypto-debug.stamp +stamps/add-archive.stamp: stamps/icedtea.stamp +if !ENABLE_JAMVM +if !ENABLE_CACAO +if !ZERO_BUILD + if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif +endif + touch stamps/add-archive.stamp + +clean-add-archive: + rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -f stamps/add-archive.stamp + +stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp +if !ENABLE_JAMVM +if !ENABLE_CACAO +if !ZERO_BUILD + if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif +endif + touch stamps/add-archive-debug.stamp + +clean-add-archive-debug: + rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -f stamps/add-archive-debug.stamp + stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \ - stamps/add-pulseaudio.stamp stamps/add-tzdata-support.stamp stamps/check-crypto.stamp + stamps/add-pulseaudio.stamp stamps/add-tzdata-support.stamp stamps/check-crypto.stamp \ + stamps/add-archive.stamp mkdir -p stamps touch $@ -clean-icedtea-stage2: clean-add-jamvm clean-check-crypto +clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive rm -f stamps/icedtea-stage2.stamp stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \ stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \ - stamps/add/tzdata-support-debug.stamp stamps/check-crypto-debug.stamp + stamps/add/tzdata-support-debug.stamp stamps/check-crypto-debug.stamp \ + stamps/add-archive-debug.stamp mkdir -p stamps touch $@ -clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug +clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \ + clean-add-archive-debug rm -f stamps/icedtea-debug-stage2.stamp # OpenJDK boot Targets @@ -2046,14 +2082,31 @@ clean-check-crypto-boot: rm -f stamps/check-crypto-boot.stamp +stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp +if !ENABLE_JAMVM +if !ENABLE_CACAO +if !ZERO_BUILD + if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif +endif + touch $@ + +clean-add-archive-boot: + rm -vf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -f stamps/add-archive-boot.stamp + stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \ stamps/add-systemtap-boot.stamp stamps/add-pulseaudio-boot.stamp \ - stamps/add-tzdata-support-boot.stamp stamps/check-crypto-boot.stamp + stamps/add-tzdata-support-boot.stamp stamps/check-crypto-boot.stamp \ + stamps/add-archive-boot.stamp mkdir -p stamps touch $@ clean-icedtea-stage1: clean-add-systemtap-boot clean-add-pulseaudio-boot \ - clean-add-tzdata-support-boot clean-check-crypto-boot + clean-add-tzdata-support-boot clean-check-crypto-boot clean-add-archive-boot rm -f stamps/icedtea-stage1.stamp # Rebuild targets @@ -2632,6 +2685,12 @@ # Target Aliases # =============== +add-archive: stamps/add-archive.stamp + +add-archive-boot: stamps/add-archive-ecj.stamp + +add-archive-debug: stamps/add-archive-debug.stamp + add-nss: stamps/add-nss.stamp add-nss-debug: stamps/add-nss-debug.stamp
--- a/NEWS Wed Jun 05 20:59:33 2013 +0100 +++ b/NEWS Wed Jun 05 22:56:36 2013 +0100 @@ -810,6 +810,7 @@ - Make sure libffi cflags and libs are used. - PR1378: Add AArch64 support to Zero - PR1170: Ensure unlimited crypto policy is in place. + - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive * CACAO - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned. - src/native/jni.cpp (GetObjectClass): Remove null pointer check.