diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 09:00:08 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 15:11:36 +0200 |
commit | e5510ba991a5494e562776f135fc07f2999a86a8 (patch) | |
tree | 48c5fb5d665af845c4dfd92861dc99aa88b71347 /recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch | |
parent | a599da830cdfe8f50534a8b5d4b8b963b34bc045 (diff) | |
download | meta-java-e5510ba991a5494e562776f135fc07f2999a86a8.tar.gz |
openjdk-8: update to latest ga version 265
Patch related changes:
* The hotspot patch 1004 was mainlined in changeset 3a3803a0c789 [1] and
is therfore dropped.
* The jdk patch 2010 was mainlined in changeset c4418d567028 [2] and is
therefore dropped.
* Rename hotspot/aarch64 patches to start with number 1401.
* Rename hotspot/aarch32 patches to start with number 1201.
* Merge aarch32-hotspot-fix-shark-build-pt2.patch and
openjdk8-fix-shark-build-pt2.patch to hotspot patch 1013 as they were
the same.
[1] https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/3a3803a0c789
[2] https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/c4418d567028
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
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.patch | 18 |
1 files changed, 9 insertions, 9 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 e725bf9..2f3360a 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,7 +1,7 @@ | |||
1 | From 0bb17a5083efcfd02e96ef034e51a190ea678f15 Mon Sep 17 00:00:00 2001 | 1 | From 5105a57bbfd463ddd441ac687bd0101c626188ed Mon Sep 17 00:00:00 2001 |
2 | From: Jens Rehsack <rehsack@gmail.com> | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | Date: Thu, 2 Jan 2020 13:26:42 +0100 | 3 | Date: Thu, 2 Jan 2020 13:26:42 +0100 |
4 | Subject: [PATCH 2008/2008] jdk: no unused deps | 4 | Subject: [PATCH 2008/2009] jdk: no unused deps |
5 | 5 | ||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
7 | --- | 7 | --- |
@@ -12,7 +12,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | |||
12 | 4 files changed, 26 insertions(+), 10 deletions(-) | 12 | 4 files changed, 26 insertions(+), 10 deletions(-) |
13 | 13 | ||
14 | diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk | 14 | diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk |
15 | index c23b958b0..2984302f0 100644 | 15 | index c23b958b06..2984302f0a 100644 |
16 | --- a/jdk/make/CompileNativeLibraries.gmk | 16 | --- a/jdk/make/CompileNativeLibraries.gmk |
17 | +++ b/jdk/make/CompileNativeLibraries.gmk | 17 | +++ b/jdk/make/CompileNativeLibraries.gmk |
18 | @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk | 18 | @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk |
@@ -26,7 +26,7 @@ index c23b958b0..2984302f0 100644 | |||
26 | # Include the corresponding custom file, if present. | 26 | # Include the corresponding custom file, if present. |
27 | -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk | 27 | -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk |
28 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | 28 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk |
29 | index cd8b94cd8..8d9c37246 100644 | 29 | index 7f42e09ce4..10232b61ca 100644 |
30 | --- a/jdk/make/lib/Awt2dLibraries.gmk | 30 | --- a/jdk/make/lib/Awt2dLibraries.gmk |
31 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | 31 | +++ b/jdk/make/lib/Awt2dLibraries.gmk |
32 | @@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) | 32 | @@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) |
@@ -40,7 +40,7 @@ index cd8b94cd8..8d9c37246 100644 | |||
40 | LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ | 40 | LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ |
41 | $(X_CFLAGS) \ | 41 | $(X_CFLAGS) \ |
42 | $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) | 42 | $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) |
43 | @@ -801,17 +805,28 @@ ifeq ($(BUILD_HEADLESS), true) | 43 | @@ -808,17 +812,28 @@ ifeq ($(BUILD_HEADLESS), true) |
44 | -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ | 44 | -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ |
45 | $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) | 45 | $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) |
46 | 46 | ||
@@ -74,7 +74,7 @@ index cd8b94cd8..8d9c37246 100644 | |||
74 | OGLBlitLoops.c \ | 74 | OGLBlitLoops.c \ |
75 | OGLBufImgOps.c \ | 75 | OGLBufImgOps.c \ |
76 | OGLContext.c \ | 76 | OGLContext.c \ |
77 | @@ -824,10 +839,9 @@ ifeq ($(BUILD_HEADLESS), true) | 77 | @@ -831,10 +846,9 @@ ifeq ($(BUILD_HEADLESS), true) |
78 | OGLSurfaceData.c \ | 78 | OGLSurfaceData.c \ |
79 | OGLTextRenderer.c \ | 79 | OGLTextRenderer.c \ |
80 | OGLVertexCache.c \ | 80 | OGLVertexCache.c \ |
@@ -88,7 +88,7 @@ index cd8b94cd8..8d9c37246 100644 | |||
88 | LIBAWT_HEADLESS_REORDER := | 88 | LIBAWT_HEADLESS_REORDER := |
89 | ifeq ($(OPENJDK_TARGET_OS), solaris) | 89 | ifeq ($(OPENJDK_TARGET_OS), solaris) |
90 | diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c | 90 | diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c |
91 | index 64284bc6e..b3584c7ef 100644 | 91 | index 64284bc6e9..b3584c7efe 100644 |
92 | --- a/jdk/src/solaris/native/sun/awt/jawt.c | 92 | --- a/jdk/src/solaris/native/sun/awt/jawt.c |
93 | +++ b/jdk/src/solaris/native/sun/awt/jawt.c | 93 | +++ b/jdk/src/solaris/native/sun/awt/jawt.c |
94 | @@ -33,7 +33,7 @@ | 94 | @@ -33,7 +33,7 @@ |
@@ -101,7 +101,7 @@ index 64284bc6e..b3584c7ef 100644 | |||
101 | return JNI_FALSE; | 101 | return JNI_FALSE; |
102 | #else | 102 | #else |
103 | diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h | 103 | diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h |
104 | index ceea38f43..8d85782ba 100644 | 104 | index ceea38f434..8d85782ba0 100644 |
105 | --- a/jdk/src/solaris/native/sun/awt/utility/rect.h | 105 | --- a/jdk/src/solaris/native/sun/awt/utility/rect.h |
106 | +++ b/jdk/src/solaris/native/sun/awt/utility/rect.h | 106 | +++ b/jdk/src/solaris/native/sun/awt/utility/rect.h |
107 | @@ -28,7 +28,7 @@ | 107 | @@ -28,7 +28,7 @@ |
@@ -114,5 +114,5 @@ index ceea38f43..8d85782ba 100644 | |||
114 | typedef XRectangle RECT_T; | 114 | typedef XRectangle RECT_T; |
115 | #else | 115 | #else |
116 | -- | 116 | -- |
117 | 2.24.1 | 117 | 2.26.2 |
118 | 118 | ||