/hg/icedtea6: Fix debug build by ensuring specified output direc...

[andrew at icedtea.classpath.org]

changeset b434625f3fd8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b434625f3fd8
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 30 00:47:55 2010 +0100

	Fix debug build by ensuring specified output directory is used as
	intended.

	2010-06-28 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (ICEDTEA_DEBUG_BUILD_TARGET): Don't
	add debug suffix, OpenJDK makefile already does this.
		* patches/debug-dir.patch: Fix OpenJDK Makefile to just add
	the debug suffix and not move it to ../$(OS)-$(ARCH)-debug.


diffstat:

3 files changed, 44 insertions(+), 4 deletions(-)
ChangeLog               |    9 +++++++++
Makefile.am             |    8 ++++----
patches/debug-dir.patch |   31 +++++++++++++++++++++++++++++++

diffs (79 lines):

diff -r fa1c6854f1e6 -r b434625f3fd8 ChangeLog
--- a/ChangeLog	Mon Jun 28 14:18:16 2010 +0100
+++ b/ChangeLog	Wed Jun 30 00:47:55 2010 +0100
@@ -1,3 +1,12 @@ 2010-06-25 Andrew John Hughes  <ahughes@
+2010-06-28 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_DEBUG_BUILD_TARGET): Don't add
+	debug suffix, OpenJDK makefile already does this.
+	* patches/debug-dir.patch: Fix OpenJDK
+	Makefile to just add the debug suffix and
+	not move it to ../$(OS)-$(ARCH)-debug.
+
 2010-06-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	Remove VisualVM support, now maintained at
diff -r fa1c6854f1e6 -r b434625f3fd8 Makefile.am
--- a/Makefile.am	Mon Jun 28 14:18:16 2010 +0100
+++ b/Makefile.am	Wed Jun 30 00:47:55 2010 +0100
@@ -155,12 +155,11 @@ else
   MEMORY_LIMIT =
 endif
 
-ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(DEBUG_BUILD_OUTPUT_DIR)"
 if WITH_CACAO
   ICEDTEA_BUILD_TARGET=jdk_only
-  ICEDTEA_DEBUG_BUILD_TARGET += jdk_fastdebug_only
+  ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
 else
-  ICEDTEA_DEBUG_BUILD_TARGET += debug_build
+  ICEDTEA_DEBUG_BUILD_TARGET = debug_build
 endif
 
 # FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap
@@ -289,7 +288,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-jtreg-httpTest.patch \
 	patches/arm.patch \
 	patches/shark-debug-option.patch \
-	patches/openjdk/6961732.patch
+	patches/openjdk/6961732.patch \
+	patches/debug-dir.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r fa1c6854f1e6 -r b434625f3fd8 patches/debug-dir.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/debug-dir.patch	Wed Jun 30 00:47:55 2010 +0100
@@ -0,0 +1,31 @@
+--- openjdk/Makefile.orig	2010-06-28 20:11:00.000000000 +0100
++++ openjdk/Makefile	2010-06-28 20:11:54.000000000 +0100
+@@ -138,7 +138,7 @@
+ # Location of fresh bootdir output
+ ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
+ FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image
+-FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME)/j2sdk-image
++FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/j2sdk-image
+   
+ create_fresh_product_bootdir: FRC
+ 	@$(START_ECHO)
+@@ -210,7 +210,7 @@
+ generic_debug_build:
+ 	@$(START_ECHO)
+ 	$(MAKE) \
+-		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME) \
++		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \
+ 	        DEBUG_NAME=$(DEBUG_NAME) \
+ 		GENERATE_DOCS=false \
+ 	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
+@@ -230,8 +230,8 @@
+ 
+ clobber::
+ 	$(RM) -r $(OUTPUTDIR)/*
+-	$(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/*
+-	$(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/*
++	$(RM) -r $(OUTPUTDIR)-debug/*
++	$(RM) -r $(OUTPUTDIR)-fastdebug/*
+ 	-($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE))
+ 
+ clean: clobber