[java-1.7.0-openjdk/f20] Fixed debug builds

[jiri vanek]

commit 4954776725d6e66a54d88d8c11dba9fae86a27b4
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Thu May 22 12:58:11 2014 +0200

    Fixed debug builds

 java-1.7.0-openjdk-debugdocs.patch |   39 ++++++++++++++++++++++++++++-------
 java-1.7.0-openjdk-debuginfo.patch |   20 +++++++++---------
 java-1.7.0-openjdk.spec            |   18 ++++++++++++---
 3 files changed, 55 insertions(+), 22 deletions(-)
---
diff --git a/java-1.7.0-openjdk-debugdocs.patch b/java-1.7.0-openjdk-debugdocs.patch
index dbfebb2..8a130e4 100644
--- a/java-1.7.0-openjdk-debugdocs.patch
+++ b/java-1.7.0-openjdk-debugdocs.patch
@@ -1,12 +1,35 @@
 --- oldMakefile	2008-07-02 17:48:01.000000000 -0400
 +++ openjdk/Makefile	2008-07-02 17:48:09.000000000 -0400
-@@ -176,8 +176,7 @@
+@@ -199,19 +199,19 @@
  
- COMMON_DEBUG_FLAGS= \
- 	DEBUG_NAME=$(DEBUG_NAME) \
--	ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME) \
--	NO_DOCS=true
-+	ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME)
+ create_fresh_product_bootdir: FRC
+ 	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
+-		GENERATE_DOCS=false \
++		GENERATE_DOCS=true \
+ 		BOOT_CYCLE_SETTINGS= \
+ 		build_product_image
  
- product_build: setup
- 	@$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'`
+ create_fresh_debug_bootdir: FRC
+ 	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
+-		GENERATE_DOCS=false \
++		GENERATE_DOCS=true \
+ 		BOOT_CYCLE_DEBUG_SETTINGS= \
+ 		build_debug_image
+ 
+ create_fresh_fastdebug_bootdir: FRC
+ 	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
+-		GENERATE_DOCS=false \
++		GENERATE_DOCS=true \
+ 		BOOT_CYCLE_DEBUG_SETTINGS= \
+ 		build_fastdebug_image
+ 
+@@ -262,7 +262,7 @@
+ 	$(MAKE) \
+ 		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
+ 	        DEBUG_NAME=$(DEBUG_NAME) \
+-		GENERATE_DOCS=false \
++		GENERATE_DOCS=true \
+ 		$(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \
+ 		CREATE_DEBUGINFO_BUNDLES=true \
+ 	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
+
diff --git a/java-1.7.0-openjdk-debuginfo.patch b/java-1.7.0-openjdk-debuginfo.patch
index 263d59e..11776ef 100644
--- a/java-1.7.0-openjdk-debuginfo.patch
+++ b/java-1.7.0-openjdk-debuginfo.patch
@@ -1,20 +1,20 @@
 --- openjdk/hotspot/build/linux/makefiles/saproc.make_back	2009-12-14 13:35:46.000000000 +0100
 +++ openjdk/hotspot/make/linux/makefiles/saproc.make	2009-12-14 13:36:47.000000000 +0100
-@@ -67,6 +67,7 @@
- 	           -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family)    \
+@@ -95,6 +95,7 @@
+ 			   $(ALT_SAINCDIR) 										\
  	           $(SASRCFILES)                                        \
  	           $(SA_LFLAGS)                                         \
-+		   -g							\
++	           -g                                                   \
+ 	           $(SA_DEBUG_CFLAGS)                                   \
+ 	           $(EXTRA_CFLAGS)                                      \
  	           -o $@                                                \
- 	           -lthread_db
- 
 --- openjdk/hotspot/build/linux/makefiles/jsig.make_back	2009-12-14 13:34:56.000000000 +0100
 +++ openjdk/hotspot/make/linux/makefiles/jsig.make	2009-12-14 13:35:31.000000000 +0100
-@@ -44,6 +44,7 @@
+@@ -59,6 +59,7 @@
  $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
  	@echo Making signal interposition lib...
  	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
-+			 -g						  \
-                          $(LFLAGS_JSIG) -o $@ $< -ldl
- 
- install_jsig: $(LIBJSIG)
++	                     -g							  \
+                          $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
+ 	$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 1eaa270..51f383c 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,5 +1,5 @@
 # If debug is 1, OpenJDK is built with all debug info present.
-%global debug 0
+%global debug 1
 
 %global icedtea_version 2.4.7
 %global hg_tag icedtea-{icedtea_version}
@@ -74,8 +74,11 @@
 %global debugbuild %{nil}
 %endif
 
+%if %{debug}
+%global buildoutputdir openjdk/build/linux-%{archbuild}-debug
+%else
 %global buildoutputdir openjdk/build/linux-%{archbuild}
-
+%endif
 %global with_pulseaudio 1
 
 %ifarch %{jit_arches}
@@ -149,7 +152,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.60
-Release: %{icedtea_version}.1%{?dist}
+Release: %{icedtea_version}.2%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -1522,7 +1525,14 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
-%changelog
+* Thu May 22 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.51-2.4.7.2.el6
+- bumped release
+- changed  buildoutputdir to contains "-debug" in case of debug on
+- rewritten (long unmaintained) java-1.7.0-openjdk-debugdocs.patch and 
+  java-1.7.0-openjdk-debuginfo.patch
+- debug turned on (1)
+
+
 * Thu Apr 22 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.55-2.4.7.1.fc20
 - Added Omair's fix for RH1059925
  - added and used Source14, remove-origin-from-rpaths