diff options
Diffstat (limited to 'pcr/openjdk6/disable-openjdk-Werror.diff')
| -rw-r--r-- | pcr/openjdk6/disable-openjdk-Werror.diff | 147 |
1 files changed, 0 insertions, 147 deletions
diff --git a/pcr/openjdk6/disable-openjdk-Werror.diff b/pcr/openjdk6/disable-openjdk-Werror.diff deleted file mode 100644 index 2fbecaffe..000000000 --- a/pcr/openjdk6/disable-openjdk-Werror.diff +++ /dev/null @@ -1,147 +0,0 @@ -diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk ---- openjdk.orig/corba/make/common/Defs-linux.gmk 2013-03-09 18:42:00.271861055 +0100 -+++ openjdk/corba/make/common/Defs-linux.gmk 2013-03-09 18:42:10.322026218 +0100 -@@ -130,13 +130,6 @@ - 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 -- --# - # Misc compiler options - # - ifeq ($(ARCH),ppc) -diff -ru openjdk.orig/corba/make/common/shared/Defs-java.gmk openjdk/corba/make/common/shared/Defs-java.gmk ---- openjdk.orig/corba/make/common/shared/Defs-java.gmk 2013-03-09 18:42:00.271861055 +0100 -+++ openjdk/corba/make/common/shared/Defs-java.gmk 2013-03-09 18:42:10.342026563 +0100 -@@ -100,9 +100,6 @@ - ifeq ($(DEBUG_CLASSFILES),true) - JAVACFLAGS += -g - endif --ifeq ($(COMPILER_WARNINGS_FATAL), true) -- JAVACFLAGS += -Werror --endif - - NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true - JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) -@@ -173,12 +170,6 @@ - # can bootstrap itself. - # - --# The javac options supplied to the boot javac is limited. This compiler --# should only be used to build the 'make/tools' sources, which are not --# class files that end up in the classes directory. --ifeq ($(COMPILER_WARNINGS_FATAL), true) -- BOOT_JAVACFLAGS += -Werror --endif - BOOT_SOURCE_LANGUAGE_VERSION = 5 - BOOT_TARGET_CLASS_VERSION = 5 - BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) -diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2013-03-09 18:42:00.891871222 +0100 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2013-03-09 18:42:10.342026563 +0100 -@@ -140,13 +140,6 @@ - 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 -- --# - # Misc compiler options - # - ifeq ($(ARCH),ppc) -diff -ru openjdk.orig/jdk/make/common/shared/Defs-java.gmk openjdk/jdk/make/common/shared/Defs-java.gmk ---- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2013-03-09 18:42:00.891871222 +0100 -+++ openjdk/jdk/make/common/shared/Defs-java.gmk 2013-03-09 18:42:10.342026563 +0100 -@@ -107,9 +107,6 @@ - ifeq ($(DEBUG_CLASSFILES),true) - JAVACFLAGS += -g - endif --ifeq ($(COMPILER_WARNINGS_FATAL), true) -- JAVACFLAGS += -Werror --endif - - # Add the source level (currently all source is 1.5, should this be 1.6?) - LANGUAGE_VERSION = -source 1.5 -@@ -180,13 +177,6 @@ - # can bootstrap itself. - # - --# The javac options supplied to the boot javac is limited. This compiler --# should only be used to build the 'make/tools' sources, which are not --# class files that end up in the classes directory. --ifeq ($(COMPILER_WARNINGS_FATAL), true) -- BOOT_JAVACFLAGS += -Werror --endif -- - BOOT_SOURCE_LANGUAGE_VERSION = 5 - BOOT_TARGET_CLASS_VERSION = 5 - BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) -diff -ru openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile ---- openjdk.orig/jdk/make/java/nio/Makefile 2013-03-09 18:42:00.881871058 +0100 -+++ openjdk/jdk/make/java/nio/Makefile 2013-03-09 18:42:10.342026563 +0100 -@@ -31,7 +31,7 @@ - PACKAGE = java.nio - LIBRARY = nio - PRODUCT = java --OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror -+OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial - include $(BUILDDIR)/common/Defs.gmk - - NIO_SRC = $(SHARE_SRC)/classes/java/nio -diff -ru openjdk.orig/jdk/make/java/sun_nio/Makefile openjdk/jdk/make/java/sun_nio/Makefile ---- openjdk.orig/jdk/make/java/sun_nio/Makefile 2013-03-09 18:42:00.871870894 +0100 -+++ openjdk/jdk/make/java/sun_nio/Makefile 2013-03-09 18:42:10.342026563 +0100 -@@ -31,7 +31,7 @@ - PACKAGE = sun.nio - PRODUCT = sun - --OTHER_JAVACFLAGS += -Xlint:serial -Werror -+OTHER_JAVACFLAGS += -Xlint:serial - include $(BUILDDIR)/common/Defs.gmk - - # -diff -ru openjdk.orig/jdk/make/sun/native2ascii/Makefile openjdk/jdk/make/sun/native2ascii/Makefile ---- openjdk.orig/jdk/make/sun/native2ascii/Makefile 2013-03-09 18:42:00.891871222 +0100 -+++ openjdk/jdk/make/sun/native2ascii/Makefile 2013-03-09 18:42:10.342026563 +0100 -@@ -30,7 +30,7 @@ - BUILDDIR = ../.. - PACKAGE = sun.tools.native2ascii - PRODUCT = sun --OTHER_JAVACFLAGS += -Xlint:serial -Werror -+OTHER_JAVACFLAGS += -Xlint:serial - include $(BUILDDIR)/common/Defs.gmk - - # -diff -ru openjdk.orig/jdk/make/sun/nio/Makefile openjdk/jdk/make/sun/nio/Makefile ---- openjdk.orig/jdk/make/sun/nio/Makefile 2013-03-09 18:42:00.891871222 +0100 -+++ openjdk/jdk/make/sun/nio/Makefile 2013-03-09 18:42:10.342026563 +0100 -@@ -35,7 +35,7 @@ - # This re-directs all the class files to a separate location - CLASSDESTDIR = $(TEMPDIR)/classes - --OTHER_JAVACFLAGS += -Xlint:serial -Werror -+OTHER_JAVACFLAGS += -Xlint:serial - include $(BUILDDIR)/common/Defs.gmk - - # -diff -ru openjdk.orig/langtools/make/build.properties openjdk/langtools/make/build.properties ---- openjdk.orig/langtools/make/build.properties 2013-03-09 18:42:00.311861690 +0100 -+++ openjdk/langtools/make/build.properties 2013-03-09 18:43:04.542923328 +0100 -@@ -68,7 +68,7 @@ - # set the following to -version to verify the versions of javac being used - javac.version.opt = - # in time, there should be no exceptions to -Xlint:all --javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror -+javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial - - # options for the <javadoc> task for javac - javadoc.jls3.url=http://java.sun.com/docs/books/jls/ |