/hg/icedtea: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 29 02:04:39 UTC 2016
changeset 78b8eb3be3f8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=78b8eb3be3f8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 29 00:41:46 2016 +0100
PR2873: Fix make distcheck
2015-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2873: Fix make distcheck
* Makefile.am:
(clean-download-langtools): Correct typo, deleting
download-openjdk.stamp instead of download-langtools.stamp
(clean-extract-openjdk): Also depend on clean-extract-nashorn.
changeset f54a849488b0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f54a849488b0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 29 01:12:29 2016 +0100
PR2351: Split CACAO rule into configure and make stages
2015-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2351: Split CACAO rule into configure and make stages
* Makefile.am:
(cacao): Depend on cacao-configure, cacao-build and
cacao-install rather than doing the job itself.
(cacao-configure): Split from cacao step. Configures
the CACAO build.
(cacao-build): Likewise. Builds CACAO.
(cacao-install): Likewise. Installs CACAO and creates
the CACAO symlinks needed by the OpenJDK build.
(clean-cacao): Delete the intermediate stamps
from the cacao-configure, cacao-build and cacao-install
steps.
* NEWS: Updated.
changeset 54974595d970 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=54974595d970
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 29 02:29:36 2016 +0100
PR2352: Split JamVM rule into configure, make and make install stages
2016-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2352: Split JamVM rule into configure, make and
make install stages
* Makefile.am:
(jamvm): Depend on jamvm-configure, jamvm-build and
jamvm-install rather than doing the job itself.
(jamvm-configure): Split from jamvm step. Configures
the JamVM build.
(jamvm-build): Split from jamvm step and update
the make invocation to match that used by CACAO.
Builds JamVM.
(jamvm-install): Likewise. Installs JamVM and
creates the JamVM symlinks needed by the OpenJDK
build.
(clean-jamvm): Delete the intermediate stamps
from the jamvm-configure, jamvm-build and jamvm-install
steps.
* NEWS: Updated.
changeset 761b826dbec2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=761b826dbec2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 29 03:00:45 2016 +0100
PR2897: clean-cacao removes extracted source tree but not extract-cacao.stamp
2016-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2897: clean-cacao removes extracted source tree
but not extract-cacao.stamp
* Makefile.am,
(clean-extract-cacao): Remove the entire
CACAO tree here.
(cacao-configure): Build in a separate directory,
cacao.build.
(cacao-build): Likewise.
(cacao-install): Likewise.
(clean-cacao): Only remove the installation and
build directories, leaving the clean source tree
intact.
* NEWS: Updated.
changeset c4c90d76f8a7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c4c90d76f8a7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 29 03:04:49 2016 +0100
PR2873: Fix make distcheck
2016-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2873: Fix make distcheck
* Makefile.am:
(clean-tests): Don't try and delete the test
subdirectory of the build tree. configure now
generates test/tapset/jstaptest.pl and so
the directory won't be empty until the autoconf
tools remove this.
diffstat:
ChangeLog | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 88 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
NEWS | 2 +
3 files changed, 143 insertions(+), 17 deletions(-)
diffs (268 lines):
diff -r 9fd836c4922e -r c4c90d76f8a7 ChangeLog
--- a/ChangeLog Wed Mar 23 04:02:30 2016 +0000
+++ b/ChangeLog Tue Mar 29 03:04:49 2016 +0100
@@ -1,3 +1,73 @@
+2016-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2873: Fix make distcheck
+ * Makefile.am:
+ (clean-tests): Don't try and delete the test
+ subdirectory of the build tree. configure now
+ generates test/tapset/jstaptest.pl and so
+ the directory won't be empty until the autoconf
+ tools remove this.
+
+2016-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2897: clean-cacao removes extracted source tree
+ but not extract-cacao.stamp
+ * Makefile.am,
+ (clean-extract-cacao): Remove the entire
+ CACAO tree here.
+ (cacao-configure): Build in a separate directory,
+ cacao.build.
+ (cacao-build): Likewise.
+ (cacao-install): Likewise.
+ (clean-cacao): Only remove the installation and
+ build directories, leaving the clean source tree
+ intact.
+ * NEWS: Updated.
+
+2016-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2352: Split JamVM rule into configure, make and
+ make install stages
+ * Makefile.am:
+ (jamvm): Depend on jamvm-configure, jamvm-build and
+ jamvm-install rather than doing the job itself.
+ (jamvm-configure): Split from jamvm step. Configures
+ the JamVM build.
+ (jamvm-build): Split from jamvm step and update
+ the make invocation to match that used by CACAO.
+ Builds JamVM.
+ (jamvm-install): Likewise. Installs JamVM and
+ creates the JamVM symlinks needed by the OpenJDK
+ build.
+ (clean-jamvm): Delete the intermediate stamps
+ from the jamvm-configure, jamvm-build and jamvm-install
+ steps.
+ * NEWS: Updated.
+
+2016-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2351: Split CACAO rule into configure and make stages
+ * Makefile.am:
+ (cacao): Depend on cacao-configure, cacao-build and
+ cacao-install rather than doing the job itself.
+ (cacao-configure): Split from cacao step. Configures
+ the CACAO build.
+ (cacao-build): Likewise. Builds CACAO.
+ (cacao-install): Likewise. Installs CACAO and creates
+ the CACAO symlinks needed by the OpenJDK build.
+ (clean-cacao): Delete the intermediate stamps
+ from the cacao-configure, cacao-build and cacao-install
+ steps.
+ * NEWS: Updated.
+
+2016-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2873: Fix make distcheck
+ * Makefile.am:
+ (clean-download-langtools): Correct typo, deleting
+ download-openjdk.stamp instead of download-langtools.stamp
+ (clean-extract-openjdk): Also depend on clean-extract-nashorn.
+
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2034: --enable-jamvm builds broken, missing
diff -r 9fd836c4922e -r c4c90d76f8a7 Makefile.am
--- a/Makefile.am Wed Mar 23 04:02:30 2016 +0000
+++ b/Makefile.am Tue Mar 29 03:04:49 2016 +0100
@@ -659,11 +659,6 @@
check-local: jtregcheck $(SYSTEMTAP_TEST_SUITE) stamps/check-ecc.stamp
clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports clean-check-ecc
- if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
- if [ -e test ] ; then \
- rmdir test ; \
- fi \
- fi
clean-local: clean-tests \
clean-icedtea clean-icedtea-debug clean-icedtea-boot clean-clone clean-clone-boot \
@@ -959,7 +954,7 @@
if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
rm -f $(LANGTOOLS_SRC_ZIP) ; \
fi
- rm -f stamps/download-openjdk.stamp
+ rm -f stamps/download-langtools.stamp
stamps/download-cacao.stamp:
if BUILD_CACAO
@@ -1140,7 +1135,7 @@
clean-patch-fsg clean-remove-intree-libraries \
clean-sanitise-openjdk clean-extract-hotspot \
clean-extract-jdk clean-extract-jaxp clean-extract-jaxws \
- clean-extract-corba clean-extract-langtools
+ clean-extract-corba clean-extract-langtools clean-extract-nashorn
rm -rf openjdk
rm -f stamps/extract-openjdk.stamp
@@ -1384,6 +1379,7 @@
touch $@
clean-extract-cacao: clean-cacao
+ rm -rf cacao
rm -f stamps/extract-cacao.stamp
stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
@@ -2073,26 +2069,46 @@
# JamVM
-stamps/jamvm.stamp: $(OPENJDK_TREE)
+stamps/jamvm.stamp: stamps/jamvm-configure.stamp stamps/jamvm-build.stamp stamps/jamvm-install.stamp
+ mkdir -p stamps
+ touch stamps/jamvm.stamp
+
+stamps/jamvm-configure.stamp: $(OPENJDK_TREE)
if BUILD_JAMVM
cd jamvm/jamvm && \
./autogen.sh --with-java-runtime-library=openjdk8 \
- --prefix=$(abs_top_builddir)/jamvm/install ; \
- $(MAKE) ; \
- $(MAKE) install
+ --prefix=$(abs_top_builddir)/jamvm/install
+endif
+ mkdir -p stamps
+ touch $@
+
+stamps/jamvm-build.stamp: stamps/jamvm-configure.stamp
+if BUILD_JAMVM
+ cd jamvm/jamvm && \
+ $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS)
+endif
+ mkdir -p stamps
+ touch $@
+
+stamps/jamvm-install.stamp: stamps/jamvm-build.stamp
+if BUILD_JAMVM
+ cd jamvm/jamvm && \
+ $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/lib
touch $(abs_top_builddir)/jamvm/install/hotspot/lib/sa-jdi.jar
mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
- cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
+ cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so \
+ $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
ln -sf libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client/libjsig.so
endif
mkdir -p stamps
- touch stamps/jamvm.stamp
+ touch $@
clean-jamvm:
rm -rf jamvm
+ rm -f stamps/jamvm-configure.stamp stamps/jamvm-build.stamp stamps/jamvm-install.stamp
rm -f stamps/jamvm.stamp
# Targets for additional VMs
@@ -2135,12 +2151,18 @@
# CACAO
-stamps/cacao.stamp: $(OPENJDK_TREE)
+stamps/cacao.stamp: stamps/cacao-configure.stamp stamps/cacao-build.stamp stamps/cacao-install.stamp
+ mkdir -p stamps
+ touch $@
+
+stamps/cacao-configure.stamp: $(OPENJDK_TREE)
if BUILD_CACAO
if !USE_SYSTEM_CACAO
cd cacao/cacao && \
./autogen.sh && \
- $(ARCH_PREFIX) ./configure \
+ mkdir ../cacao.build && \
+ cd ../cacao.build && \
+ $(ARCH_PREFIX) ../cacao/configure \
--host=$(host_alias) \
--build=$(build_alias) \
--target=$(target_alias) \
@@ -2149,7 +2171,26 @@
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
--with-java-runtime-library-classes=$(RUNTIME) \
--with-libatomic-ops=no \
- --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
+ --enable-jre-layout $(CACAO_CONFIGURE_ARGS);
+endif
+endif
+ mkdir -p stamps
+ touch $@
+
+stamps/cacao-build.stamp: stamps/cacao-configure.stamp
+if BUILD_CACAO
+if !USE_SYSTEM_CACAO
+ cd cacao/cacao.build && \
+ $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS)
+endif
+endif
+ mkdir -p stamps
+ touch $@
+
+stamps/cacao-install.stamp: stamps/cacao-build.stamp
+if BUILD_CACAO
+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
@@ -2162,7 +2203,8 @@
touch $@
clean-cacao:
- rm -rf cacao
+ rm -rf cacao/cacao.build cacao/install
+ rm -f stamps/cacao-configure.stamp stamps/cacao-build.stamp stamps/cacao-install.stamp
rm -f stamps/cacao.stamp
# targets for additional VMs
@@ -2842,6 +2884,12 @@
cacao: stamps/cacao.stamp
+cacao-build: stamps/cacao-build.stamp
+
+cacao-configure: stamps/cacao-configure.stamp
+
+cacao-install: stamps/cacao-install.stamp
+
check-crypto: stamps/check-crypto.stamp
check-crypto-boot: stamps/check-crypto-boot.stamp
@@ -2920,6 +2968,12 @@
jamvm: stamps/jamvm.stamp
+jamvm-build: stamps/jamvm-build.stamp
+
+jamvm-configure: stamps/jamvm-configure.stamp
+
+jamvm-install: stamps/jamvm-install.stamp
+
jtreg: stamps/jtreg.stamp
native-ecj: stamps/native-ecj.stamp
diff -r 9fd836c4922e -r c4c90d76f8a7 NEWS
--- a/NEWS Wed Mar 23 04:02:30 2016 +0000
+++ b/NEWS Tue Mar 29 03:04:49 2016 +0100
@@ -96,6 +96,8 @@
- PR2329: jamvm parallel unpack failures
- PR2339: Fail early if there is no native HotSpot JIT & all other options are disabled
- PR2348: Avoid following symlinks for CACAO and JamVM patches
+ - PR2351: Split CACAO rule into configure and make stages
+ - PR2352: Split JamVM rule into configure, make and make install stages
- PR2358: Add aliases for all stamp targets
- PR2362: Update HACKING & fsg.sh.in
- PR2363: Remove EC source code prior to build
More information about the distro-pkg-dev
mailing list