Mercurial > hg > icedtea10
changeset 2659:a2e2736b29fd
PR2909: Install CACAO in same way as JamVM
2016-03-31 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2909: Install CACAO in same way as JamVM
* Makefile.am:
(cacao-install): Perform same operations as
in jamvm-install.
* NEWS: Updated.
* acinclude.m4:
(IT_WITH_CACAO_HOME): Use a clean subdirectory for
the OpenJDK-style VM import, as JamVM does.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 01 Apr 2016 07:32:24 +0100 |
| parents | 6749369df844 |
| children | d4666165e486 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 |
| diffstat | 4 files changed, 21 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 01 06:28:16 2016 +0100 +++ b/ChangeLog Fri Apr 01 07:32:24 2016 +0100 @@ -1,3 +1,14 @@ +2016-03-31 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2909: Install CACAO in same way as JamVM + * Makefile.am: + (cacao-install): Perform same operations as + in jamvm-install. + * NEWS: Updated. + * acinclude.m4: + (IT_WITH_CACAO_HOME): Use a clean subdirectory for + the OpenJDK-style VM import, as JamVM does. + 2016-03-31 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2907: Replace --with-abs-install-dir
--- a/Makefile.am Fri Apr 01 06:28:16 2016 +0100 +++ b/Makefile.am Fri Apr 01 07:32:24 2016 +0100 @@ -2223,11 +2223,14 @@ if !USE_SYSTEM_CACAO cd cacao/cacao.build && \ $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install - mkdir -p $(abs_top_builddir)/cacao/install/lib - touch $(abs_top_builddir)/cacao/install/lib/sa-jdi.jar - ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client - touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt - ln -sf client/libjvm.so $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so + mkdir -p $(abs_top_builddir)/cacao/install/hotspot/lib + touch $(abs_top_builddir)/cacao/install/hotspot/lib/sa-jdi.jar + mkdir -p $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server + cp $(abs_top_builddir)/cacao/install/lib/libjvm.so \ + $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server + ln -sf server $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client + touch $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt + ln -sf libjvm.so $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client/libjsig.so endif endif mkdir -p stamps
--- a/NEWS Fri Apr 01 06:28:16 2016 +0100 +++ b/NEWS Fri Apr 01 07:32:24 2016 +0100 @@ -161,6 +161,7 @@ - PR2885: Location of 'stap' executable is hard-coded - PR2906: Support prefixed variants of GNU tools used on *BSD systems - PR2907: Replace --with-abs-install-dir with usual --prefix + - PR2909: Install CACAO in same way as JamVM - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck
--- a/acinclude.m4 Fri Apr 01 06:28:16 2016 +0100 +++ b/acinclude.m4 Fri Apr 01 07:32:24 2016 +0100 @@ -754,7 +754,7 @@ AM_CONDITIONAL(USE_SYSTEM_CACAO, true) ], [ - CACAO_IMPORT_PATH="\$(abs_top_builddir)/cacao/install" + CACAO_IMPORT_PATH="\$(abs_top_builddir)/cacao/install/hotspot" AM_CONDITIONAL(USE_SYSTEM_CACAO, false) ]) AC_MSG_RESULT(${CACAO_IMPORT_PATH})