changeset in /hg/icedtea6: 2008-03-27 Gary Benson <gbenson at red...

[Gary Benson]

changeset fc06aaf1e991 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc06aaf1e991
description:
	2008-03-27  Gary Benson  <gbenson at redhat.com>

		* Makefile.am
		(stamps/ports.stamp, stamps/ports-ecj.stamp): Fixed broken cacao
		detection.

diffstat:

3 files changed, 14 insertions(+), 8 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |    8 ++++----
Makefile.in |    8 ++++----

diffs (75 lines):

diff -r 4749fccc0859 -r fc06aaf1e991 ChangeLog
--- a/ChangeLog	Wed Mar 26 06:44:13 2008 -0400
+++ b/ChangeLog	Thu Mar 27 08:58:31 2008 +0000
@@ -1,3 +1,9 @@ 2008-03-26  Gary Benson  <gbenson at redhat
+2008-03-27  Gary Benson  <gbenson at redhat.com>
+
+	* Makefile.am
+	(stamps/ports.stamp, stamps/ports-ecj.stamp): Fixed broken cacao
+	detection.
+
 2008-03-26  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-zero-build.patch: Added zero-specific bits to
diff -r 4749fccc0859 -r fc06aaf1e991 Makefile.am
--- a/Makefile.am	Wed Mar 26 06:44:13 2008 -0400
+++ b/Makefile.am	Thu Mar 27 08:58:31 2008 +0000
@@ -199,11 +199,11 @@ stamps/ports.stamp: stamps/extract.stamp
 	  ln -sf $$PWD/$$target $$link; \
 	done
 	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
-	if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
-	if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \
 	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
@@ -363,11 +363,11 @@ stamps/ports-ecj.stamp: stamps/extract-e
 	  ln -sf $$PWD/$$target $$link; \
 	done
 	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
-	if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
-	if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \
 	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
diff -r 4749fccc0859 -r fc06aaf1e991 Makefile.in
--- a/Makefile.in	Wed Mar 26 06:44:13 2008 -0400
+++ b/Makefile.in	Thu Mar 27 08:58:31 2008 +0000
@@ -776,11 +776,11 @@ stamps/ports.stamp: stamps/extract.stamp
 	  ln -sf $$PWD/$$target $$link; \
 	done
 	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
-	if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
-	if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \
 	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
@@ -862,11 +862,11 @@ stamps/ports-ecj.stamp: stamps/extract-e
 	  ln -sf $$PWD/$$target $$link; \
 	done
 	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
-	if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
-	if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \
 	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps