Mercurial > hg > release > icedtea7-2.3
changeset 2658:a91c52e39914
PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4
2013-05-28 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4
* Makefile.am:
(STAGE1_BOOT_RUNTIME): New variable to store path
to stage 1 rt.jar.
(STAGE2_BOOT_RUNTIME): Likewise for stage 2.
(bootstrap-directory-stage1): Use STAGE1_BOOT_RUNTIME.
(rt): Only update STAGE1_BOOT_RUNTIME if it exists.
(clean-rt): Mirror creation of STAGE1_BOOT_RUNTIME in
bootstrap-directory-stage1.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Tue, 28 May 2013 16:42:32 +0100 |
| parents | b13f012ad143 |
| children | 7e0d2c785516 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 24 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue May 28 16:04:38 2013 +0100 +++ b/ChangeLog Tue May 28 16:42:32 2013 +0100 @@ -1,3 +1,16 @@ +2013-05-28 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 + * Makefile.am: + (STAGE1_BOOT_RUNTIME): New variable to store path + to stage 1 rt.jar. + (STAGE2_BOOT_RUNTIME): Likewise for stage 2. + (bootstrap-directory-stage1): Use STAGE1_BOOT_RUNTIME. + (rt): Only update STAGE1_BOOT_RUNTIME if it exists. + (clean-rt): Mirror creation of STAGE1_BOOT_RUNTIME in + bootstrap-directory-stage1. + * NEWS: Updated. + 2013-05-28 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1378: Add AArch64 support to Zero
--- a/Makefile.am Tue May 28 16:04:38 2013 +0100 +++ b/Makefile.am Tue May 28 16:42:32 2013 +0100 @@ -66,6 +66,8 @@ STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot +STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar +STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar # Source directories @@ -1630,14 +1632,13 @@ ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap mkdir -p $(STAGE1_BOOT_DIR)/lib/modules mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \ - cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ - $(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \ - chmod u+w $(STAGE1_BOOT_DIR)/jre/lib/rt.jar + cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_RUNTIME) && \ + chmod u+w $(STAGE1_BOOT_RUNTIME) mkdir -p $(STAGE1_BOOT_DIR)/lib && \ if [ -e $(SYSTEM_JDK_DIR)/lib/tools.jar ] ; then \ ln -sf $(SYSTEM_JDK_DIR)/lib/tools.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ else \ - ln -sf $(STAGE1_BOOT_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ + ln -sf $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ fi ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \ $(STAGE1_BOOT_DIR)/jre/lib/ && \ @@ -2434,8 +2435,9 @@ mkdir -p `dirname $$destpath` ; \ cp -a ../../$$dirs $$destpath ; \ done ; \ - $(ZIP) -qur $(STAGE1_BOOT_DIR)/jre/lib/rt.jar \ - com java javax sun ); \ + if [ -w $(STAGE1_BOOT_RUNTIME) ] ; then \ + $(ZIP) -qur $(STAGE1_BOOT_RUNTIME) com java javax sun ; \ + fi ; ) \ fi mkdir -p stamps touch $@ @@ -2445,7 +2447,8 @@ rm -f stamps/rt-class-files.stamp stamps/rt.stamp rm -f rt-source-files.txt if [ -e $(STAGE1_BOOT_DIR)/jre/lib ] ; then \ - cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/jre/lib ; \ + cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_RUNTIME) ; \ + chmod u+w $(STAGE1_BOOT_RUNTIME) ; \ fi # Target Aliases
--- a/NEWS Tue May 28 16:04:38 2013 +0100 +++ b/NEWS Tue May 28 16:42:32 2013 +0100 @@ -16,6 +16,7 @@ - PR1378: Add AArch64 support to Zero * Bug fixes - PR1409: IcedTea 2.3.9 fails to build Zero due to -Werror + - PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4 New in release 2.3.9 (2013-04-21):