[java-1.6.0-openjdk] added paths to do not threat warnings as errors. Specfile is applying just hotspotGccWerrors one now

[jiri vanek]

commit 3df738bb594a49bfac2984db3941a7c7fecfc87a
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Mon Jan 30 14:56:19 2012 +0100

    added paths to do not threat warnings as errors. Specfile is applying just hotspotGccWerrors one now.

 Defs-linux.diff         |   19 +++++++++++++++++++
 hotspotGccWerrors.aptch |   32 ++++++++++++++++++++++++++++++++
 icedtea.patch.patch     |   15 +++++++++++++++
 java-1.6.0-openjdk.spec |    6 ++++++
 4 files changed, 72 insertions(+), 0 deletions(-)
---
diff --git a/Defs-linux.diff b/Defs-linux.diff
new file mode 100644
index 0000000..7d2fc3f
--- /dev/null
+++ b/Defs-linux.diff
@@ -0,0 +1,19 @@
+--- openjdk/jdk/make/common/Defs-linux.gmk-old	2012-01-27 16:37:12.000000000 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk	2012-01-30 13:33:14.209857187 +0100
+@@ -151,13 +151,13 @@
+ GCC_WARNINGS	= -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
+ 
+ #
+ # Treat compiler warnings as errors, if warnings not allowed
+ #
+-ifeq ($(COMPILER_WARNINGS_FATAL),true)
+-  GCC_WARNINGS += -Werror
+-endif
++#ifeq ($(COMPILER_WARNINGS_FATAL),true)
++#  GCC_WARNINGS += -Werror
++#endif
+ 
+ #
+ # Misc compiler options
+ #
+ ifeq ($(ARCH),ppc)
diff --git a/hotspotGccWerrors.aptch b/hotspotGccWerrors.aptch
new file mode 100644
index 0000000..891c0c8
--- /dev/null
+++ b/hotspotGccWerrors.aptch
@@ -0,0 +1,32 @@
+--- openjdk/hotspot/make/linux/makefiles/adlc.make	2012-01-30 14:25:19.440745474 +0100
++++ openjdk/hotspot/make/linux/makefiles/adlc.make	2012-01-30 14:20:59.324754772 +0100
+@@ -58,11 +58,12 @@
+ # Force assertions on.
+ CPPFLAGS += -DASSERT
+ 
+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
+ # Compiler warnings are treated as errors
+-CFLAGS_WARN = -Werror
++# CFLAGS_WARN = -Werror
++CFLAGS_WARN =
+ CFLAGS += $(CFLAGS_WARN)
+ 
+ OBJECTNAMES = \
+ 	adlparse.o \
+ 	archDesc.o \
+--- openjdk/hotspot/make/linux/makefiles/gcc.make	2012-01-30 14:25:40.165744733 +0100
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	2012-01-30 14:21:23.626753903 +0100
+@@ -121,11 +121,12 @@
+ else
+   CFLAGS += -pipe
+ endif
+ 
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++#WARNINGS_ARE_ERRORS = -Werror
++WARNINGS_ARE_ERRORS = 
+ 
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+ # conversions which might affect the values. To avoid that, we need to turn
+ # it off explicitly. 
diff --git a/icedtea.patch.patch b/icedtea.patch.patch
new file mode 100644
index 0000000..fcbdbb1
--- /dev/null
+++ b/icedtea.patch.patch
@@ -0,0 +1,15 @@
+--- patches/ecj/icedtea.patch	2012-01-30 12:50:17.000000000 +0100
++++ patches/ecj/icedtea.patch	2012-01-30 12:56:33.768935843 +0100
+@@ -683,11 +683,11 @@
+ @@ -31,7 +31,7 @@
+  PACKAGE = java.nio
+  LIBRARY = nio
+  PRODUCT = java
+ -OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
+-+OTHER_JAVACFLAGS += -Xlint:serial -Werror
+++OTHER_JAVACFLAGS += -Xlint:serial
+  include $(BUILDDIR)/common/Defs.gmk
+  
+  NIO_SRC = $(SHARE_SRC)/classes/java/nio
+ diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile
+ --- openjdk-ecj.orig/jdk/make/java/text/Makefile	2010-05-26 09:32:35.000000000 +0100
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index ce1bf8b..7082851 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -174,6 +174,9 @@ Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
 Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
 #Patch5:   makefile-xalan-deps.patch
 #Patch6:   glibc-name-clash.patch
+#Patch7:   icedtea.patch.patch
+#8:   Defs-linux.diff
+Patch9:	  hotspotGccWerrors.aptch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -372,6 +375,7 @@ export CFLAGS="$CFLAGS -mieee"
 %endif
 
 #patch -l -p0 < %{PATCH5}
+#patch -l -p0 < %{PATCH7}
 
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
@@ -387,6 +391,8 @@ make patch
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
 #patch -l -p0 < %{PATCH6}
+#patch -l -p0 < %{PATCH8}
+patch -l -p0 < %{PATCH9}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image