summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch24
1 files changed, 11 insertions, 13 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch
index 4c462c4..115914a 100644
--- a/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch
@@ -1,18 +1,19 @@
1From 335f9891be66e1292509d6a9dc18d41fac0a066c Mon Sep 17 00:00:00 2001 1From bc6450aaa4b7652ee034423f1d04cb439152eaf6 Mon Sep 17 00:00:00 2001
2From: Jens Rehsack <rehsack@gmail.com> 2From: Jens Rehsack <rehsack@gmail.com>
3Date: Thu, 2 Jan 2020 13:26:42 +0100 3Date: Thu, 2 Jan 2020 13:26:42 +0100
4Subject: [PATCH 2008/2009] jdk: no unused deps 4Subject: [PATCH] jdk: no unused deps
5 5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7
7--- 8---
8 make/CompileNativeLibraries.gmk | 2 ++ 9 jdk/make/CompileNativeLibraries.gmk | 2 ++
9 make/lib/Awt2dLibraries.gmk | 30 +++++++++++++++++------ 10 jdk/make/lib/Awt2dLibraries.gmk | 30 ++++++++++++++-----
10 src/solaris/native/sun/awt/jawt.c | 2 +- 11 jdk/src/solaris/native/sun/awt/jawt.c | 2 +-
11 src/solaris/native/sun/awt/utility/rect.h | 2 +- 12 jdk/src/solaris/native/sun/awt/utility/rect.h | 2 +-
12 4 files changed, 26 insertions(+), 10 deletions(-) 13 4 files changed, 26 insertions(+), 10 deletions(-)
13 14
14diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk 15diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk
15index c23b958b06..2984302f0a 100644 16index c23b958b..2984302f 100644
16--- a/jdk/make/CompileNativeLibraries.gmk 17--- a/jdk/make/CompileNativeLibraries.gmk
17+++ b/jdk/make/CompileNativeLibraries.gmk 18+++ b/jdk/make/CompileNativeLibraries.gmk
18@@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk 19@@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk
@@ -26,7 +27,7 @@ index c23b958b06..2984302f0a 100644
26 # Include the corresponding custom file, if present. 27 # Include the corresponding custom file, if present.
27 -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk 28 -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk
28diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk 29diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
29index 7f42e09ce4..10232b61ca 100644 30index 7f42e09c..10232b61 100644
30--- a/jdk/make/lib/Awt2dLibraries.gmk 31--- a/jdk/make/lib/Awt2dLibraries.gmk
31+++ b/jdk/make/lib/Awt2dLibraries.gmk 32+++ b/jdk/make/lib/Awt2dLibraries.gmk
32@@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) 33@@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix)
@@ -88,7 +89,7 @@ index 7f42e09ce4..10232b61ca 100644
88 LIBAWT_HEADLESS_REORDER := 89 LIBAWT_HEADLESS_REORDER :=
89 ifeq ($(OPENJDK_TARGET_OS), solaris) 90 ifeq ($(OPENJDK_TARGET_OS), solaris)
90diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c 91diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c
91index 64284bc6e9..b3584c7efe 100644 92index 64284bc6..b3584c7e 100644
92--- a/jdk/src/solaris/native/sun/awt/jawt.c 93--- a/jdk/src/solaris/native/sun/awt/jawt.c
93+++ b/jdk/src/solaris/native/sun/awt/jawt.c 94+++ b/jdk/src/solaris/native/sun/awt/jawt.c
94@@ -33,7 +33,7 @@ 95@@ -33,7 +33,7 @@
@@ -101,7 +102,7 @@ index 64284bc6e9..b3584c7efe 100644
101 return JNI_FALSE; 102 return JNI_FALSE;
102 #else 103 #else
103diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h 104diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h
104index ceea38f434..8d85782ba0 100644 105index ceea38f4..8d85782b 100644
105--- a/jdk/src/solaris/native/sun/awt/utility/rect.h 106--- a/jdk/src/solaris/native/sun/awt/utility/rect.h
106+++ b/jdk/src/solaris/native/sun/awt/utility/rect.h 107+++ b/jdk/src/solaris/native/sun/awt/utility/rect.h
107@@ -28,7 +28,7 @@ 108@@ -28,7 +28,7 @@
@@ -113,6 +114,3 @@ index ceea38f434..8d85782ba0 100644
113 #include <X11/Xlib.h> 114 #include <X11/Xlib.h>
114 typedef XRectangle RECT_T; 115 typedef XRectangle RECT_T;
115 #else 116 #else
116--
1172.26.2
118