changeset in /hg/icedtea: 2007-09-16 Christan Thalinger <twist...

[Christian Thalinger]

changeset a132dda038bc in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a132dda038bc
description:
	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.

diffstat:

3 files changed, 23 insertions(+), 11 deletions(-)
ChangeLog   |    7 +++++++
Makefile.am |    6 ++++++
Makefile.in |   21 ++++++++++-----------

diffs (90 lines):

diff -r 4a2b7d77133d -r a132dda038bc ChangeLog
--- a/ChangeLog	Sun Sep 16 18:06:32 2007 +0200
+++ b/ChangeLog	Sun Sep 16 19:40:18 2007 +0200
@@ -1,3 +1,10 @@ 2007-09-16  Christan Thalinger  <twisti@
+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
diff -r 4a2b7d77133d -r a132dda038bc Makefile.am
--- a/Makefile.am	Sun Sep 16 18:06:32 2007 +0200
+++ b/Makefile.am	Sun Sep 16 19:40:18 2007 +0200
@@ -60,6 +60,12 @@ ICEDTEA_ENV = \
 	"LD_LIBRARY_PATH=" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
 
+if WITH_CACAO
+ICEDTEA_ENV += \
+	"ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" \
+	"ALT_JDK_IMPORT_PATH=$(CACAO)"
+endif
+
 env:
 	@echo 'unset JAVA_HOME'
 	@echo 'export $(ICEDTEA_ENV)'
diff -r 4a2b7d77133d -r a132dda038bc Makefile.in
--- a/Makefile.in	Sun Sep 16 18:06:32 2007 +0200
+++ b/Makefile.in	Sun Sep 16 19:40:18 2007 +0200
@@ -36,6 +36,10 @@ host_triplet = @host@
 @WITH_CACAO_TRUE@	"ALT_JDK_IMPORT_PATH=$(CACAO)"
 
 @WITH_CACAO_TRUE at am__append_2 = \
+ at WITH_CACAO_TRUE@	"ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" \
+ at WITH_CACAO_TRUE@	"ALT_JDK_IMPORT_PATH=$(CACAO)"
+
+ at WITH_CACAO_TRUE@am__append_3 = \
 @WITH_CACAO_TRUE@	patches/icedtea-cacao-Compiler-gcc-gmk.patch \
 @WITH_CACAO_TRUE@	patches/icedtea-cacao-Defs-linux-gmk.patch \
 @WITH_CACAO_TRUE@	patches/icedtea-cacao-Platform-gmk.patch \
@@ -224,23 +228,18 @@ ICEDTEA_ENDORSED_DIR = \
 ICEDTEA_ENDORSED_DIR = \
 	$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
 
-ICEDTEA_ENV = \
-	"BUILD_NUMBER=b19" \
-	"LANG=C" \
+ICEDTEA_ENV = "BUILD_NUMBER=b19" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
-	"ICEDTEA_JCE=$(ICEDTEA_JCE)" \
-	"ICEDTEA_RT=$(ICEDTEA_RT)" \
+	"ICEDTEA_JCE=$(ICEDTEA_JCE)" "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=" \
-	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
-
+	"CLASSPATH=" "LD_LIBRARY_PATH=" \
+	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_1)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
@@ -267,7 +266,7 @@ ICEDTEA_ENV_ECJ = "BUILD_NUMBER=b19" "LA
 	"BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
 	"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \
 	$(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
-	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_1)
+	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_2)
 
 # OpenJDK Source Preparation Targets
 # ==================================
@@ -294,7 +293,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-lesstif_amd64.patch \
 	patches/icedtea-tools.patch patches/icedtea-certbundle.patch \
 	patches/icedtea-demos.patch $(FAST_BUILD_PATCH) \
-	$(am__append_2)
+	$(am__append_3)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = patches/icedtea-ecj-bootstrap.patch