merging cacao branch to default
Christian Thalinger
twisti at complang.tuwien.ac.at
Wed Mar 12 05:23:30 PDT 2008
On Wed, 2008-03-12 at 11:39 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > I would like to merge the cacao branch to default. Any objections?
>
> Yes, two:
>
> > diff -r 391090a3755d -r 9a0bc3372842 .hgtags
> > --- a/.hgtags Thu Mar 06 15:53:27 2008 +0000
> > +++ b/.hgtags Wed Mar 12 11:13:40 2008 +0100
> > @@ -5,3 +5,11 @@ cb78e0fccf14ed4a80b0ada2c98e4621479acbf5
> > cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4
> > 5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5
> > bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6
> > +e27b2d58770e704a422192826f28404ed5e8e6a2 icedtea6-1.0
> > +96e1bdfed80e258e0a82e19bde45c5c547c2552f icedtea-1.0
> > +b639d73581e34a5db114ed5addfd84b093d00254 icedtea-1.1
> > +1ce086327b07f17892cc351719de6897819e32fa icedtea-1.2
> > +8ea2619c21cfea2611b44879aab0f781ffd3fd50 icedtea-1.3
> > +cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4
> > +5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5
> > +bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6
>
> This hunk adds a load of duplicate tags.
OK, I remove them.
>
> > diff -r 391090a3755d -r 9a0bc3372842 Makefile.am
> > --- a/Makefile.am Thu Mar 06 15:53:27 2008 +0000
> > +++ b/Makefile.am Wed Mar 12 11:13:40 2008 +0100
> [snip]
> > @@ -569,7 +597,7 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
> > stamps/ports-ecj.stamp stamps/patch-ecj.stamp
> > $(MAKE) \
> > $(ICEDTEA_ENV_ECJ) \
> > - -C openjdk-ecj/
> > + -C openjdk-ecj/ j2se_only
> > @echo "ecj-poured IcedTea is served:" \
> > openjdk-ecj/build/$(LINUX_DIR)
> > mkdir -p stamps
>
> We don't want j2se_only in the normal build.
Oops, missed that one. New diff attached.
- twisti
---
diff -r 391090a3755d -r 59d280295a25 ChangeLog
--- a/ChangeLog Thu Mar 06 15:53:27 2008 +0000
+++ b/ChangeLog Wed Mar 12 13:04:58 2008 +0100
@@ -1,3 +1,24 @@ 2008-03-06 Gary Benson <gbenson at redhat
+2007-03-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
+
+ * Makefile.am (stamps/icedtea-ecj.stamp): Use
+ ICEDTEA_BUILD_TARGET.
+
+2007-03-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
+
+ * .hgtags: Removed duplicate tags.
+
+2007-03-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
+
+ * Makefile.am (ICEDTEA_BUILD_TARGET): Added.
+ (ICEDTEA_DEBUG_BUILD_TARGET): Likewise.
+ * Makefile.in: Regenerated.
+
+2007-03-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
+
+ * Makefile.in: Regenerated after transplanting.
+ * aclocal.m4: Likewise.
+ * configure: Likewise.
+
2008-03-06 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
@@ -1782,6 +1803,10 @@ 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.
@@ -1831,6 +1856,12 @@ 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.
@@ -1864,6 +1895,12 @@ 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>
@@ -2078,10 +2115,33 @@ 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>
@@ -2097,6 +2157,24 @@ 2007-09-13 Lillian Angel <langel at redha
* Makefile.am: Fixed target typo.
* Makefile.in: Regenerated.
+
+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>
@@ -2117,7 +2195,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: Regenerated.
+ * Makefile.in: Regenerate.
2007-09-12 Joshua Sumali <jsumali at redhat.com>
diff -r 391090a3755d -r 59d280295a25 Makefile.am
--- a/Makefile.am Thu Mar 06 15:53:27 2008 +0000
+++ b/Makefile.am Wed Mar 12 13:04:58 2008 +0100
@@ -105,6 +105,11 @@ ICEDTEA_ENV = \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)"
+if WITH_CACAO
+ICEDTEA_ENV += \
+ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+endif
+
env:
@echo 'unset JAVA_HOME'
@echo 'export $(ICEDTEA_ENV)'
@@ -144,6 +149,11 @@ ICEDTEA_ENV_ECJ = \
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)"
+
+if WITH_CACAO
+ICEDTEA_ENV_ECJ += \
+ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+endif
env-ecj:
@echo 'unset JAVA_HOME'
@@ -285,6 +295,11 @@ ICEDTEA_PATCHES = \
$(FAST_BUILD_PATCH) \
$(ZERO_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
+
+if WITH_CACAO
+ICEDTEA_PATCHES += \
+ patches/icedtea-cacao.patch
+endif
stamps/patch.stamp: stamps/clone.stamp
all_patches_ok=yes; \
@@ -491,9 +506,21 @@ clean-bootstrap-directory-symlink-ecj:
# ===============
if WITH_ICEDTEA
+if WITH_CACAO
+ MEMORY_LIMIT = -J-Xmx1024m
+else
MEMORY_LIMIT = -J-Xmx512m
+endif
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
@@ -504,7 +531,8 @@ icedtea: stamps/bootstrap-directory-syml
$(ICEDTEAPLUGIN_TARGET)
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/
+ -C openjdk/ \
+ $(ICEDTEA_BUILD_TARGET)
if ENABLE_LIVECONNECT
cp -pPRf IcedTeaPlugin.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -531,7 +559,7 @@ icedtea-debug: stamps/bootstrap-director
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
- debug_build
+ $(ICEDTEA_DEBUG_BUILD_TARGET)
if ENABLE_LIVECONNECT
cp -pPRf IcedTeaPlugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -569,7 +597,8 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/
+ -C openjdk-ecj/ \
+ $(ICEDTEA_BUILD_TARGET)
@echo "ecj-poured IcedTea is served:" \
openjdk-ecj/build/$(LINUX_DIR)
mkdir -p stamps
@@ -755,7 +784,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar
\
$(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
fi
-
+
# rt-closed.jar class files.
rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
find rt -name '*.java' | sort > $@
diff -r 391090a3755d -r 59d280295a25 Makefile.in
--- a/Makefile.in Thu Mar 06 15:53:27 2008 +0000
+++ b/Makefile.in Wed Mar 12 13:04:58 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.
@@ -31,6 +31,15 @@ POST_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+ at WITH_CACAO_TRUE@am__append_1 = \
+ at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+
+ at WITH_CACAO_TRUE@am__append_2 = \
+ at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+
+ at WITH_CACAO_TRUE@am__append_3 = \
+ at WITH_CACAO_TRUE@ patches/icedtea-cacao.patch
+
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/javac.in $(srcdir)/javap.in \
@@ -68,6 +77,7 @@ AUTOMAKE = @AUTOMAKE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
+CACAO = @CACAO@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -251,31 +261,24 @@ ICEDTEA_ENDORSED_DIR = \
@CORE_BUILD_FALSE at ICEDTEA_CORE_BUILD =
@CORE_BUILD_TRUE at ICEDTEA_CORE_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)" \
- "HOTSPOT_VM_DISTRO=\"IcedTea\"" \
- "LANG=C" \
+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)" \
+ "HOTSPOT_VM_DISTRO=\"IcedTea\"" "LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"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)" \
+ "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
- "CLASSPATH=" \
- "LD_LIBRARY_PATH=" \
+ "CLASSPATH=" "LD_LIBRARY_PATH=" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)"
-
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1)
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
@@ -284,37 +287,30 @@ ICEDTEA_CLS_DIR_ECJ = \
ICEDTEA_CLS_DIR_ECJ = \
$(abs_top_srcdir)/openjdk-ecj/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)" \
- "HOTSPOT_VM_DISTRO=IcedTea" \
- "LANG=C" \
+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)" \
+ "HOTSPOT_VM_DISTRO=IcedTea" "LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"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)" \
+ "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR_ECJ)" \
"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
"BOOTCLASSPATH_CLS_RT=-bootclasspath \
- $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
+ $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
"BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
- "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):
$(LIBGCJ_JAR)" \
- "CLASSPATH=" \
- "LD_LIBRARY_PATH=" \
+ "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \
+ $(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
"GENSRCDIR=$(abs_top_srcdir)/generated" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)"
-
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
# OpenJDK Source Preparation Targets
# ==================================
@@ -335,31 +331,23 @@ OPENJDK_URL = http://hg.openjdk.java.net
# If new gcc is installed, apply 4.3 patch
@GCC_OLD_TRUE at GCC_PATCH =
-ICEDTEA_PATCHES = \
- patches/icedtea-copy-plugs.patch \
+ICEDTEA_PATCHES = 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-license-headers.patch \
- $(PLUGIN_PATCH) \
- $(NETX_PATCH) \
- patches/icedtea-rmi_amd64.patch \
- patches/icedtea-tools.patch \
- patches/icedtea-certbundle.patch \
+ patches/icedtea-graphics.patch patches/icedtea-paths.patch \
+ patches/icedtea-debuginfo.patch patches/icedtea-ssl.patch \
+ patches/icedtea-license-headers.patch $(PLUGIN_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-headers.patch patches/icedtea-ant.patch \
patches/icedtea-gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/icedtea-float-double-trailing-zeros.patch \
patches/icedtea-gtkplaf.patch \
patches/icedtea-memory-limits.patch \
- patches/icedtea-sunsrc.patch \
- patches/icedtea-libraries.patch \
+ patches/icedtea-sunsrc.patch patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
patches/icedtea-bytecodeInterpreterWithChecks.patch \
patches/icedtea-corba.patch \
@@ -369,18 +357,12 @@ ICEDTEA_PATCHES = \
patches/icedtea-test-atomic-operations.patch \
patches/icedtea-core-build.patch \
patches/icedtea-linker-options.patch \
- patches/icedtea-ports.patch \
- patches/icedtea-lcms-leak.patch \
+ patches/icedtea-ports.patch patches/icedtea-lcms-leak.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-generated.patch \
- patches/icedtea-lib64.patch \
- patches/icedtea-zero.patch \
- patches/icedtea-freetype.patch \
- $(GCC_PATCH) \
- $(FAST_BUILD_PATCH) \
- $(ZERO_BUILD_PATCH) \
- $(DISTRIBUTION_PATCHES)
-
+ patches/icedtea-generated.patch patches/icedtea-lib64.patch \
+ patches/icedtea-zero.patch patches/icedtea-freetype.patch \
+ $(GCC_PATCH) $(FAST_BUILD_PATCH) $(ZERO_BUILD_PATCH) \
+ $(DISTRIBUTION_PATCHES) $(am__append_3)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
@@ -388,11 +370,16 @@ ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.
@WITH_ICEDTEA_TRUE at BOOTSTRAP_DIRECTORY_STAMP =
@WITH_ICEDTEA_FALSE at ICEDTEA_HOME = icedtea
@WITH_ICEDTEA_TRUE at ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
- at WITH_ICEDTEA_FALSE@MEMORY_LIMIT =
+ at WITH_CACAO_FALSE@@WITH_ICEDTEA_TRUE at MEMORY_LIMIT = -J-Xmx512m
# OpenJDK Targets
# ===============
- at WITH_ICEDTEA_TRUE@MEMORY_LIMIT = -J-Xmx512m
+ at WITH_CACAO_TRUE@@WITH_ICEDTEA_TRUE at MEMORY_LIMIT = -J-Xmx1024m
+ at WITH_ICEDTEA_FALSE@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 = \
@@ -510,6 +497,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)
@@ -536,6 +527,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*) \
@@ -679,17 +672,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
@@ -984,7 +977,8 @@ icedtea: stamps/bootstrap-directory-syml
$(ICEDTEAPLUGIN_TARGET)
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/
+ -C openjdk/ \
+ $(ICEDTEA_BUILD_TARGET)
@ENABLE_LIVECONNECT_TRUE@ cp -pPRf IcedTeaPlugin.so \
@ENABLE_LIVECONNECT_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@ENABLE_LIVECONNECT_TRUE@ cp -pPRf IcedTeaPlugin.so \
@@ -1006,7 +1000,7 @@ icedtea-debug: stamps/bootstrap-director
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
- debug_build
+ $(ICEDTEA_DEBUG_BUILD_TARGET)
@ENABLE_LIVECONNECT_TRUE@ cp -pPRf IcedTeaPlugin.so \
@ENABLE_LIVECONNECT_TRUE@
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@ENABLE_LIVECONNECT_TRUE@ cp -pPRf IcedTeaPlugin.so \
@@ -1039,7 +1033,7 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/
+ -C openjdk-ecj/ j2se_only
@echo "ecj-poured IcedTea is served:" \
openjdk-ecj/build/$(LINUX_DIR)
mkdir -p stamps
diff -r 391090a3755d -r 59d280295a25 README.cacao
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/README.cacao Wed Mar 12 13:04:58 2008 +0100
@@ -0,0 +1,4 @@
+IcedTea with CACAO as VM
+========================
+
+TODO
diff -r 391090a3755d -r 59d280295a25 acinclude.m4
--- a/acinclude.m4 Thu Mar 06 15:53:27 2008 +0000
+++ b/acinclude.m4 Wed Mar 12 13:04:58 2008 +0100
@@ -550,3 +550,31 @@ AC_DEFUN([ENABLE_NETX_PLUGIN],
])
])
+
+
+AC_DEFUN([AC_CHECK_WITH_CACAO],
+[
+ AC_MSG_CHECKING(whether to use CACAO as VM)
+ AC_ARG_WITH([cacao],
+ [AS_HELP_STRING(--with-cacao,use CACAO as VM)],
+ [
+ case "${withval}" in
+ yes)
+ CACAO=/usr/local/cacao
+ ;;
+ no)
+ CACAO=no
+ ;;
+ *)
+ CACAO=${withval}
+ ;;
+ esac
+ ],
+ [
+ CACAO=no
+ ])
+
+ AC_MSG_RESULT(${CACAO})
+ AM_CONDITIONAL(WITH_CACAO, test x"${CACAO}" != "xno")
+ AC_SUBST(CACAO)
+])
diff -r 391090a3755d -r 59d280295a25 aclocal.m4
--- a/aclocal.m4 Thu Mar 06 15:53:27 2008 +0000
+++ b/aclocal.m4 Wed Mar 12 13:04:58 2008 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file 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.
@@ -11,10 +11,13 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not
guaranteed to.
+If you have problems, you may need to regenerate the build system
entirely.
+To do so, use the procedure documented by the package, typically
`autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*-
Autoconf -*-
#
@@ -174,7 +177,7 @@ fi[]dnl
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation,
Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -189,7 +192,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -205,8 +208,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be
traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*-
Autoconf -*-
@@ -478,7 +483,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1;
then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X
>/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -526,13 +531,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
# Do all the work for Automake. -*-
Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file 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.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -637,16 +642,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -935,7 +941,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in
Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -r 391090a3755d -r 59d280295a25 configure
--- a/configure Thu Mar 06 15:53:27 2008 +0000
+++ b/configure Wed Mar 12 13:04:58 2008 +0100
@@ -742,6 +742,9 @@ OPENJDK_SRC_DIR
OPENJDK_SRC_DIR
GNU_CLASSLIB_FOUND_TRUE
GNU_CLASSLIB_FOUND_FALSE
+WITH_CACAO_TRUE
+WITH_CACAO_FALSE
+CACAO
FAST_BUILD_TRUE
FAST_BUILD_FALSE
ZERO_BUILD_TRUE
@@ -1440,6 +1443,7 @@ Optional Packages:
--with-xerces2-jar specify location of the xerces2 jar
--with-openjdk-src-zip specify the location of the openjdk source
zip
--with-openjdk-src-dir specify the location of the openjdk sources
+ --with-cacao use CACAO as VM
Some influential environment variables:
CC C compiler command
@@ -6962,6 +6966,44 @@ fi
+ { echo "$as_me:$LINENO: checking whether to use CACAO as VM" >&5
+echo $ECHO_N "checking whether to use CACAO as VM... $ECHO_C" >&6; }
+
+# Check whether --with-cacao was given.
+if test "${with_cacao+set}" = set; then
+ withval=$with_cacao;
+ case "${withval}" in
+ yes)
+ CACAO=/usr/local/cacao
+ ;;
+ no)
+ CACAO=no
+ ;;
+ *)
+ CACAO=${withval}
+ ;;
+ esac
+
+else
+
+ CACAO=no
+
+fi
+
+
+ { echo "$as_me:$LINENO: result: ${CACAO}" >&5
+echo "${ECHO_T}${CACAO}" >&6; }
+ if test x"${CACAO}" != "xno"; then
+ WITH_CACAO_TRUE=
+ WITH_CACAO_FALSE='#'
+else
+ WITH_CACAO_TRUE='#'
+ WITH_CACAO_FALSE=
+fi
+
+
+
+
# Check whether --enable-fast-build was given.
if test "${enable_fast_build+set}" = set; then
enableval=$enable_fast_build;
@@ -10654,6 +10696,13 @@ if test -z "${GNU_CLASSLIB_FOUND_TRUE}"
{ { echo "$as_me:$LINENO: error: conditional \"GNU_CLASSLIB_FOUND\"
was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"GNU_CLASSLIB_FOUND\" was never
defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${WITH_CACAO_TRUE}" && test -z "${WITH_CACAO_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_CACAO\" was never
defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_CACAO\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -11405,6 +11454,9 @@ OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_deli
OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_delim
GNU_CLASSLIB_FOUND_TRUE!$GNU_CLASSLIB_FOUND_TRUE$ac_delim
GNU_CLASSLIB_FOUND_FALSE!$GNU_CLASSLIB_FOUND_FALSE$ac_delim
+WITH_CACAO_TRUE!$WITH_CACAO_TRUE$ac_delim
+WITH_CACAO_FALSE!$WITH_CACAO_FALSE$ac_delim
+CACAO!$CACAO$ac_delim
FAST_BUILD_TRUE!$FAST_BUILD_TRUE$ac_delim
FAST_BUILD_FALSE!$FAST_BUILD_FALSE$ac_delim
ZERO_BUILD_TRUE!$ZERO_BUILD_TRUE$ac_delim
@@ -11451,7 +11503,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` =
74; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` =
77; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -11773,7 +11825,7 @@ echo "$as_me: executing $ac_file command
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1;
then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X
>/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff -r 391090a3755d -r 59d280295a25 configure.ac
--- a/configure.ac Thu Mar 06 15:53:27 2008 +0000
+++ b/configure.ac Wed Mar 12 13:04:58 2008 +0100
@@ -131,6 +131,7 @@ fi
fi
WITH_OPENJDK_SRC_ZIP
WITH_OPENJDK_SRC_DIR
+AC_CHECK_WITH_CACAO
ENABLE_FAST_BUILD
ENABLE_ZERO_BUILD
ENABLE_NETX_PLUGIN
diff -r 391090a3755d -r 59d280295a25 patches/icedtea-cacao.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao.patch Wed Mar 12 13:04:58 2008 +0100
@@ -0,0 +1,13 @@
+diff -r 37a05a11f281 src/share/bin/java.c
+--- origopenjdk/jdk/src/share/bin/java.c Sat Dec 01 00:00:00 2007
+0000
++++ openjdk/jdk/src/share/bin/java.c Tue Jan 15 16:13:54 2008 +0100
+@@ -1955,7 +1955,8 @@ ContinueInNewThread(InvocationFunctions*
+ args.classname = classname;
+ args.ifn = *ifn;
+
+- rslt = ContinueInNewThread0(JavaMain, threadStackSize,
(void*)&args);
++/* rslt = ContinueInNewThread0(JavaMain, threadStackSize,
(void*)&args); */
++ rslt = JavaMain((void*)&args);
+ /* If the caller has deemed there is an error we
+ * simply return that, otherwise we return the value of
+ * the callee
More information about the distro-pkg-dev
mailing list