changeset in /hg/icedtea: * Fixes after transplant and changes f...
Christian Thalinger
twisti at complang.tuwien.ac.at
Thu May 29 14:12:35 PDT 2008
changeset 2b413b0a984f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2b413b0a984f
description:
* Fixes after transplant and changes for merge.
diffstat:
9 files changed, 193 insertions(+), 203 deletions(-)
ChangeLog | 64 ----------------------
Makefile.am | 19 +++++-
Makefile.in | 166 ++++++++++++++++++++++++++++++++++++++--------------------
README | 8 ++
README.cacao | 4 -
acinclude.m4 | 2
aclocal.m4 | 50 +++++++++--------
configure | 82 ++++++++++------------------
configure.ac | 1
diffs (truncated from 823 to 500 lines):
diff -r b96db45c4913 -r 2b413b0a984f ChangeLog
--- a/ChangeLog Mon Mar 17 08:48:42 2008 -0400
+++ b/ChangeLog Mon Mar 17 16:00:18 2008 +0100
@@ -84,11 +84,6 @@ 2008-03-11 Matthias Klose <doko at ubuntu
2008-03-11 Matthias Klose <doko at ubuntu.com>
* .hgignore: Add debian packaging directory.
-
-2008-03-11 Lillian Angel <langel at redhat.com>
-
- * configure: Regenerated.
- * configure.ac: Added conditional for WITH_OPENJDK.
2008-03-11 Lillian Angel <langel at redhat.com>
@@ -2120,10 +2115,6 @@ 2007-11-07 Lillian Angel <langel at redha
patch.
* tools-copy-files.txt: Removed.
-2007-11-07 Christan Thalinger <twisti at complang.tuwien.ac.at>
-
- * Makefile.in: Regenerated after transplanting.
-
2007-11-07 Gary Benson <gbenson at redhat.com>
* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
@@ -2173,12 +2164,6 @@ 2007-10-24 Lillian Angel <langel at redha
create OpenJDK's libjpeg.so without files common to the system
installed libjpeg.so.
-2007-10-23 Christan Thalinger <twisti at complang.tuwien.ac.at>
-
- * j2se/make/common/Defs-linux.gmk: Updated for b22.
- * j2se/make/common/shared/Platform.gmk: Likewise.
- * j2se/src/share/bin/java.c: Likewise.
-
2007-10-22 Lillian Angel <langel at redhat.com>
* configure.ac: Fixed typo. libgif should be giflib.
@@ -2212,12 +2197,6 @@ 2007-10-18 Lillian Angel <langel at redha
2007-10-18 Lillian Angel <langel at redhat.com>
* README: Updated.
-
-2007-10-17 Christan Thalinger <twisti at complang.tuwien.ac.at>
-
- * Makefile.in: Regenerated (I was too lazy to merge all
- conflicts).
- * configure: Likewise.
2007-10-16 Francis Kung <fkung at redhat.com>
@@ -2432,33 +2411,10 @@ 2007-09-27 Keith Seitz <keiths at redhat.
* Makefile.am (ICEDTEA_PATCHES): Add above patch.
* Makefile.in: Regenerated.
-2007-09-18 Christan Thalinger <twisti at complang.tuwien.ac.at>
-
- * patches/icedtea-cacao-jvm-cfg.patch: Added
- j2se/src/solaris/bin/ppc/jvm.cfg.
-
-2007-09-16 Christan Thalinger <twisti at complang.tuwien.ac.at>
-
- * Makefile.am [WITH_CACAO] (ICEDTEA_ENV): Set
- ALT_HOTSPOT_IMPORT_PATH and ALT_JDK_IMPORT_PATH to CACAO
- directory.
- * Makefile.in: Regenerated.
-
-2007-09-16 Christan Thalinger <twisti at complang.tuwien.ac.at>
-
- * Makefile.am (ICEDTEA_PATCHES): Added
- patches/icedtea-cacao-docs-Makefile.patch.
- * Makefile.in: Regenerated.
- * patches/icedtea-cacao-docs-Makefile.patch: New file.
-
2007-09-14 Keith Seitz <keiths at redhat.com>
* configure.ac: Added check for libXtst.
* configure: Regenerated.
-
-2007-09-13 Christan Thalinger <twisti at complang.tuwien.ac.at>
-
- * patches/icedtea-cacao-instrument-Makefile.patch: New file.
2007-09-13 Lillian Angel <langel at redhat.com>
@@ -2477,24 +2433,6 @@ 2007-09-13 Lillian Angel <langel at redha
2007-09-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
- * Makefile.am: Added WITH_CACAO stuff.
- * Makefile.in: Regenerated.
- * acinclude.m4 (AC_CHECK_WITH_CACAO): New function.
- * configure.ac (AC_CHECK_WITH_CACAO): Added.
- * configure: Regenerated.
- * patches/icedtea-cacao-Compiler-gcc-gmk.patch,
- patches/icedtea-cacao-Defs-linux-gmk.patch,
- patches/icedtea-cacao-Platform-gmk.patch,
- patches/icedtea-cacao-Program-gmk.patch,
- patches/icedtea-cacao-java-c.patch,
- patches/icedtea-cacao-jvm-cfg.patch: New file.
-
-2007-09-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
-
- * README.cacao: New file.
-
-2007-09-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
-
* Makefile.am (icedtea-debug): Added -debug to target directory,
as found today by Andrew Haley.
* Makefile.in: Likewise.
@@ -2512,7 +2450,7 @@ 2007-09-12 Lillian Angel <langel at redha
* Makefile.am: Added BUILD_NUMBER to environment. This should be
updated with each bXX release. Also, added dependency for
icedtea-debug target.
- * Makefile.in: Regenerate.
+ * Makefile.in: Regenerated.
2007-09-12 Joshua Sumali <jsumali at redhat.com>
diff -r b96db45c4913 -r 2b413b0a984f Makefile.am
--- a/Makefile.am Mon Mar 17 08:48:42 2008 -0400
+++ b/Makefile.am Mon Mar 17 16:00:18 2008 +0100
@@ -40,7 +40,8 @@ install:
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
- patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES)
+ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
+ patches/icedtea-cacao.patch
# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
# name is completely irrelevant; only contains the plugs to build IcedTea.
@@ -514,6 +515,14 @@ else
MEMORY_LIMIT =
endif
+if WITH_CACAO
+ ICEDTEA_BUILD_TARGET=j2se_only
+ ICEDTEA_DEBUG_BUILD_TARGET=j2se_fastdebug_only
+else
+ ICEDTEA_BUILD_TARGET=
+ ICEDTEA_DEBUG_BUILD_TARGET=debug_build
+endif
+
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
icedtea: stamps/bootstrap-directory-symlink.stamp \
@@ -522,7 +531,8 @@ icedtea: stamps/bootstrap-directory-syml
extra-lib/about.jar
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make/
+ -C openjdk/control/make/ \
+ $(ICEDTEA_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
cp -pPRf gcjwebplugin.so \
@@ -545,7 +555,7 @@ icedtea-debug: stamps/bootstrap-director
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make \
- debug_build
+ $(ICEDTEA_DEBUG_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
cp -pPRf gcjwebplugin.so \
@@ -578,7 +588,8 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make
+ -C openjdk-ecj/control/make \
+ $(ICEDTEA_BUILD_TARGET)
@echo "ecj-poured IcedTea is served:" \
openjdk-ecj/control/build/$(LINUX_DIR)
mkdir -p stamps
diff -r b96db45c4913 -r 2b413b0a984f Makefile.in
--- a/Makefile.in Mon Mar 17 08:48:42 2008 -0400
+++ b/Makefile.in Mon Mar 17 16:00:18 2008 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -235,7 +235,8 @@ OPENJDK_VERSION = b06
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
- patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES)
+ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
+ patches/icedtea-cacao.patch
# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
@@ -253,16 +254,22 @@ ICEDTEA_CLS_DIR = \
ICEDTEA_CLS_DIR = \
$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+ICEDTEA_BOOT_DIR = \
+ $(abs_top_srcdir)/bootstrap/jdk1.6.0
+
ICEDTEA_ENDORSED_DIR = \
- $(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
-
-ICEDTEA_ENV = \
- "ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
+ $(ICEDTEA_BOOT_DIR)/lib/endorsed
+
+ at CORE_BUILD_FALSE@ICEDTEA_CORE_BUILD =
+ at CORE_BUILD_TRUE@ICEDTEA_CORE_BUILD = yes
+ at ZERO_BUILD_FALSE@ICEDTEA_ZERO_BUILD =
+ at ZERO_BUILD_TRUE@ICEDTEA_ZERO_BUILD = yes
+ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
+ "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
- "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
+ "ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -270,22 +277,30 @@ ICEDTEA_ENV = \
"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
"CLASSPATH=" "LD_LIBRARY_PATH=" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_1)
+ "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+ "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
+ "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1)
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/
+ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/classes
-
-ICEDTEA_ENV_ECJ = \
- "ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
+ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+
+ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
+ "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
- "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
+ "ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -299,7 +314,16 @@ ICEDTEA_ENV_ECJ = \
"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \
$(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
"GENSRCDIR=$(abs_top_srcdir)/generated" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_2)
+ "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+ "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
+ "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
# OpenJDK Source Preparation Targets
# ==================================
@@ -312,15 +336,34 @@ OPENJDK_URL = http://download.java.net/o
# Patch OpenJDK sources for plug replacements.
@FAST_BUILD_TRUE at FAST_BUILD_PATCH = patches/icedtea-speed.patch
-ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
- patches/icedtea-version.patch \
+ at GCC_OLD_FALSE@GCC_PATCH = patches/icedtea-gcc-4.3.patch
+
+# If new gcc is installed, apply 4.3 patch
+ at GCC_OLD_TRUE@GCC_PATCH =
+
+# If ZERO_BUILD is set then we are building zero and need
+# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
+ZERO_PATCHES = \
+ patches/icedtea-hotspot-6b06-7b24.patch \
+ patches/icedtea-hotspot7-build-fixes.patch \
+ patches/icedtea-bytecodeInterpreter.patch \
+ patches/icedtea-bytecodeInterpreterWithChecks.patch \
+ patches/icedtea-signature-iterator.patch \
+ patches/icedtea-signed-types.patch \
+ patches/icedtea-test-atomic-operations.patch \
+ patches/icedtea-zero.patch
+
+ at ZERO_BUILD_FALSE@ZERO_PATCHES_COND =
+ at ZERO_BUILD_TRUE@ZERO_PATCHES_COND = $(ZERO_PATCHES)
+ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
+ patches/icedtea-copy-plugs.patch patches/icedtea-version.patch \
patches/icedtea-text-relocations.patch \
- patches/icedtea-graphics.patch patches/icedtea-paths.patch \
- patches/icedtea-debuginfo.patch patches/icedtea-ssl.patch \
+ patches/icedtea-graphics.patch patches/icedtea-debuginfo.patch \
+ patches/icedtea-ssl.patch \
patches/icedtea-license-headers.patch \
- patches/icedtea-plugin.patch patches/icedtea-rmi_amd64.patch \
- patches/icedtea-tools.patch patches/icedtea-certbundle.patch \
- patches/icedtea-demos.patch \
+ patches/icedtea-webservices.patch $(NETX_PATCH) \
+ patches/icedtea-rmi_amd64.patch patches/icedtea-tools.patch \
+ patches/icedtea-certbundle.patch patches/icedtea-demos.patch \
patches/icedtea-use-system-tzdata.patch \
patches/icedtea-headers.patch patches/icedtea-ant.patch \
patches/icedtea-gcc-suffix.patch \
@@ -329,32 +372,37 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
patches/icedtea-gtkplaf.patch \
patches/icedtea-memory-limits.patch \
patches/icedtea-sunsrc.patch patches/icedtea-libraries.patch \
- patches/icedtea-javafiles.patch \
- patches/icedtea-corba.patch \
- patches/icedtea-signature-iterator.patch \
- patches/icedtea-signed-types.patch \
- patches/icedtea-test-atomic-operations.patch \
+ patches/icedtea-javafiles.patch patches/icedtea-corba.patch \
patches/icedtea-core-build.patch \
patches/icedtea-linker-options.patch \
- patches/icedtea-ports.patch patches/icedtea-lcms-leak.patch \
- patches/icedtea-c1-unimplemented.patch \
+ patches/icedtea-ports.patch \
+ patches/icedtea-static-libstdc++.patch \
+ patches/icedtea-lcms-leak.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-jnlp-launcher.patch \
+ patches/icedtea-lesstif-64.patch \
patches/icedtea-generated.patch patches/icedtea-lib64.patch \
- $(am__append_3)
+ patches/icedtea-zero-build.patch \
+ patches/icedtea-print-lsb-release.patch $(GCC_PATCH) \
+ $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
- at WITH_ICEDTEA_FALSE@BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
- at WITH_ICEDTEA_TRUE@BOOTSTRAP_DIRECTORY_STAMP =
- at WITH_ICEDTEA_FALSE@ICEDTEA_HOME = icedtea
- at WITH_ICEDTEA_TRUE@ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
+ at WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
+ at WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP =
+ at WITH_OPENJDK_TRUE@BOOTSTRAP_DIRECTORY_STAMP =
+ at WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at ICEDTEA_HOME = icedtea
+ at WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
+ at WITH_OPENJDK_TRUE@ICEDTEA_HOME = $(SYSTEM_OPENJDK_DIR)
@WITH_CACAO_FALSE@@WITH_ICEDTEA_TRUE at MEMORY_LIMIT = -J-Xmx512m
# OpenJDK Targets
# ===============
@WITH_CACAO_TRUE@@WITH_ICEDTEA_TRUE at MEMORY_LIMIT = -J-Xmx1024m
@WITH_ICEDTEA_FALSE at MEMORY_LIMIT =
+ at WITH_CACAO_FALSE@ICEDTEA_BUILD_TARGET =
+ at WITH_CACAO_TRUE@ICEDTEA_BUILD_TARGET = j2se_only
+ at WITH_CACAO_FALSE@ICEDTEA_DEBUG_BUILD_TARGET = debug_build
+ at WITH_CACAO_TRUE@ICEDTEA_DEBUG_BUILD_TARGET = j2se_fastdebug_only
# Shared objects.
SHARED_OBJECT_FILES = \
@@ -476,6 +524,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -502,6 +554,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -645,17 +699,17 @@ uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am all-local am--refresh check check-am clean \
- clean-generic dist dist-all dist-bzip2 dist-gzip dist-shar \
- dist-tarZ dist-zip distcheck distclean distclean-generic \
- distclean-local distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am
+ clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-local distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
# Top-Level Targets
@@ -939,7 +993,8 @@ icedtea: stamps/bootstrap-directory-syml
extra-lib/about.jar
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/ j2se_only
+ -C openjdk/control/make/ \
+ $(ICEDTEA_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
cp -pPRf gcjwebplugin.so \
@@ -961,8 +1016,8 @@ icedtea-debug: stamps/bootstrap-director
extra-lib/about.jar
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/ \
- j2se_fastdebug_only
+ -C openjdk/control/make \
+ $(ICEDTEA_DEBUG_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
cp -pPRf gcjwebplugin.so \
@@ -995,7 +1050,8 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make
+ -C openjdk-ecj/control/make \
+ $(ICEDTEA_BUILD_TARGET)
@echo "ecj-poured IcedTea is served:" \
openjdk-ecj/control/build/$(LINUX_DIR)
mkdir -p stamps
diff -r b96db45c4913 -r 2b413b0a984f README
--- a/README Mon Mar 17 08:48:42 2008 -0400
+++ b/README Mon Mar 17 16:00:18 2008 +0100
@@ -124,3 +124,11 @@ certificate storing, system certificate
certificate storing, system certificate store checking, and provides
some services specified by the jnlp API.
+CACAO as VM
+===========
+
+The --with-cacao configure option replaces the libjvm.so from Sun's
+HotSpot with the one from the CACAO VM. This enables the usage of
+IcedTea on architectures which are not supported by the HotSpot VM,
+besides the HotSpot zero port. In contrast to the HotSpot zero port,
+CACAO provides a Just-In-Time compiler for various architectures.
diff -r b96db45c4913 -r 2b413b0a984f README.cacao
--- a/README.cacao Mon Mar 17 08:48:42 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-IcedTea with CACAO as VM
-========================
-
-TODO
diff -r b96db45c4913 -r 2b413b0a984f acinclude.m4
--- a/acinclude.m4 Mon Mar 17 08:48:42 2008 -0400
+++ b/acinclude.m4 Mon Mar 17 16:00:18 2008 +0100
@@ -607,8 +607,6 @@ AC_DEFUN([ENABLE_NETX_PLUGIN],
])
])
-
-
AC_DEFUN([AC_CHECK_WITH_CACAO],
[
AC_MSG_CHECKING(whether to use CACAO as VM)
diff -r b96db45c4913 -r 2b413b0a984f aclocal.m4
--- a/aclocal.m4 Mon Mar 17 08:48:42 2008 -0400
+++ b/aclocal.m4 Mon Mar 17 16:00:18 2008 +0100
More information about the distro-pkg-dev
mailing list