it-patch-updates

Gbp-Pq: Name it-patch-updates.diff

diff --git a/patches/boot/bootstrap-tools.patch b/patches/boot/bootstrap-tools.patch
index 4bc1316467dd3f64b70d9c9fa05fd65f30d99fea..b057a9dc439df86c3211c1d7e525154f8ecc0ab9 100644 (file)
--- a/patches/boot/bootstrap-tools.patch
+++ b/patches/boot/bootstrap-tools.patch
@@ -1,7 +1,8 @@
-diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk   2012-06-29 15:19:55.000000000 +0100
-+++ openjdk-boot/corba/make/common/shared/Defs-java.gmk        2012-06-29 18:52:40.584723407 +0100
-@@ -131,26 +131,14 @@
+Index: openjdk-boot/corba/make/common/shared/Defs-java.gmk
+===================================================================
+--- openjdk-boot/corba/make/common/shared/Defs-java.gmk.orig
++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk
+@@ -137,26 +137,14 @@ TARGET_CLASS_VERSION = 7
  CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
  JAVACFLAGS  += $(CLASS_VERSION)
  JAVACFLAGS  += -encoding ascii
@@ -33,10 +34,11 @@ diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/
  
  # Override of what javac to use (see deploy workspace)
  ifdef JAVAC
-diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk     2012-06-29 15:21:00.000000000 +0100
-+++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk  2012-06-29 18:53:43.337711469 +0100
-@@ -168,27 +168,15 @@
+Index: openjdk-boot/jdk/make/common/shared/Defs-java.gmk
+===================================================================
+--- openjdk-boot/jdk/make/common/shared/Defs-java.gmk.orig
++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk
+@@ -173,27 +173,15 @@ NO_PROPRIETARY_API_WARNINGS = -XDignore.
  
  # Langtools
  ifdef LANGTOOLS_DIST
@@ -60,7 +62,7 @@ diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jd
    JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
                  $(JAVAHFLAGS)
 -  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) \
--                $(JAVADOCFLAGS)
+-                $(JAVADOCFLAGS)
  endif
  
  # Override of what javac to use (see deploy workspace)