Mercurial > hg > release > icedtea7-2.5
changeset 2672:981d010a05bf
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.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 20 Sep 2013 18:01:32 +0100 |
| parents | 9e0c07300664 |
| children | c3c661000904 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 22 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 15 09:40:18 2013 +0000 +++ b/ChangeLog Fri Sep 20 18:01:32 2013 +0100 @@ -1,3 +1,15 @@ +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. + 2013-01-15 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am:
--- a/Makefile.am Tue Jan 15 09:40:18 2013 +0000 +++ b/Makefile.am Fri Sep 20 18:01:32 2013 +0100 @@ -67,6 +67,8 @@ STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build +STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar +STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar # Source directories @@ -1646,14 +1648,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/ && \ @@ -2677,8 +2678,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 $@ @@ -2688,7 +2690,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 # Crypto Level Check