changeset in /hg/icedtea: * Makefile.am [WITH_CACAO] (ICEDTEA_EN...

[Christian Thalinger]

changeset 66be744ca8fd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=66be744ca8fd
description:
	* Makefile.am [WITH_CACAO] (ICEDTEA_ENV): Removed ALT_JDK_IMPORT_PATH.
	[WITH_CACAO] (ICEDTEA_ENV_ECJ): Likewise.
	[WITH_CACAO] (ICEDTEA_PATCHES): Removed old patches and added
	icedtea-cacao.patch.
	[WITH_ICEDTEA && WITH_CACAO] (MEMORY_LIMIT): Set to -J-Xmx1024m.

diffstat:

1 file changed, 7 insertions(+), 12 deletions(-)
Makefile.am |   19 +++++++------------

diffs (51 lines):

diff -r 2171125bac73 -r 66be744ca8fd Makefile.am
--- a/Makefile.am	Tue Jan 15 16:15:58 2008 +0100
+++ b/Makefile.am	Tue Jan 15 16:18:20 2008 +0100
@@ -62,8 +62,7 @@ ICEDTEA_ENV = \
 
 if WITH_CACAO
 ICEDTEA_ENV += \
-	"ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" \
-	"ALT_JDK_IMPORT_PATH=$(CACAO)"
+	"ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
 endif
 
 env:
@@ -103,8 +102,7 @@ ICEDTEA_ENV_ECJ = \
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
-	"ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" \
-	"ALT_JDK_IMPORT_PATH=$(CACAO)"
+	"ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
 endif
 
 env-ecj:
@@ -233,14 +231,7 @@ ICEDTEA_PATCHES = \
 
 if WITH_CACAO
 ICEDTEA_PATCHES += \
-	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-docs-Makefile.patch \
-	patches/icedtea-cacao-instrument-Makefile.patch \
-	patches/icedtea-cacao-java-c.patch \
-	patches/icedtea-cacao-jvm-cfg.patch
+	patches/icedtea-cacao.patch
 endif
 
 stamps/patch.stamp: stamps/clone.stamp
@@ -429,7 +420,11 @@ 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