From df478fb6adcb3bce12d75bf905959c45b1b359ae Mon Sep 17 00:00:00 2001 From: OpenJDK Team Date: Tue, 7 Feb 2017 15:41:50 +0000 Subject: [PATCH] it-patch-updates Gbp-Pq: Name it-patch-updates.diff --- patches/boot/bootstrap-tools.patch | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/patches/boot/bootstrap-tools.patch b/patches/boot/bootstrap-tools.patch index 4bc1316..b057a9d 100644 --- 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) -- 2.30.2