summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-12-30 15:35:59 +0100
committerRichard Leitner <richard.leitner@skidata.com>2020-01-28 15:09:31 +0100
commit7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch)
tree398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch
parent19b569281cc30e3aa94e772d6885cd340b1d1724 (diff)
downloadmeta-java-7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14.tar.gz
openjdk-8: update to latest ga version 242
As OpenJDK-8 is now tagging "ga" versions in addition to the "build" version the recipes are adapted to use those "ga" versions. All existing patches got re-applied and renamed. For better handling Hotspot patches now start at patch number 1001 and jdk patches at 2001. Furthermore architecture dependent patches are prefixed with the architecture they apply on. Following patches/hunks were completely dropped: - 0002-hotspot-fix-compilation-with-security-flags-enabled.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185 - 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch ostream.cpp:112 got fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502 - 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 - 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd - 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c - openjdk8-add-missing-linker-flags.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a - openjdk8-fix-shark-stdc++11.patch fixed in hotspot jdk8u - openjdk8-fix-libpng-neon-build.patch fixed in jdk https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1 - aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u Following patches were newly added: - 0011-autoconf-fix-CC-with-arguments-detection.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" - 0012-autoconf-NativeCompilation-remove-sysroot.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" Additionally add UPDATING.md which describes the openjdk8 update process for this layer and update8checksums.sh, a script that updates the openjdk8 source archive checksums in the corresponding .inc files. 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.patch118
1 files changed, 118 insertions, 0 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
new file mode 100644
index 0000000..e725bf9
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch
@@ -0,0 +1,118 @@
1From 0bb17a5083efcfd02e96ef034e51a190ea678f15 Mon Sep 17 00:00:00 2001
2From: Jens Rehsack <rehsack@gmail.com>
3Date: Thu, 2 Jan 2020 13:26:42 +0100
4Subject: [PATCH 2008/2008] jdk: no unused deps
5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7---
8 make/CompileNativeLibraries.gmk | 2 ++
9 make/lib/Awt2dLibraries.gmk | 30 +++++++++++++++++------
10 src/solaris/native/sun/awt/jawt.c | 2 +-
11 src/solaris/native/sun/awt/utility/rect.h | 2 +-
12 4 files changed, 26 insertions(+), 10 deletions(-)
13
14diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk
15index c23b958b0..2984302f0 100644
16--- a/jdk/make/CompileNativeLibraries.gmk
17+++ b/jdk/make/CompileNativeLibraries.gmk
18@@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk
19
20 include lib/Awt2dLibraries.gmk
21
22+ifndef BUILD_SOUNDLESS_ONLY
23 include lib/SoundLibraries.gmk
24+endif
25
26 # Include the corresponding custom file, if present.
27 -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk
28diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
29index cd8b94cd8..8d9c37246 100644
30--- a/jdk/make/lib/Awt2dLibraries.gmk
31+++ b/jdk/make/lib/Awt2dLibraries.gmk
32@@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix)
33 LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting
34 endif
35
36+ifdef BUILD_HEADLESS_ONLY
37+LIBAWT_CFLAGS += -DHEADLESS=true
38+endif
39+
40 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
41 $(X_CFLAGS) \
42 $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
43@@ -801,17 +805,28 @@ ifeq ($(BUILD_HEADLESS), true)
44 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
45 $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
46
47- LIBAWT_HEADLESS_FILES := \
48- awt_Font.c \
49- HeadlessToolkit.c \
50- fontpath.c \
51- VDrawingArea.c \
52+ ifndef X11_NOT_NEEDED
53+ LIBAWT_HEADLESS_X11_FILES := \
54 X11Color.c \
55 X11Renderer.c \
56 X11PMBlitLoops.c \
57 X11SurfaceData.c \
58 X11FontScaler_md.c \
59 X11TextRenderer_md.c \
60+ GLXGraphicsConfig.c \
61+ GLXSurfaceData.c
62+ endif
63+
64+ ifndef CUPS_NOT_NEEDED
65+ LIBAWT_HEADLESS_CUPS_FILES := \
66+ CUPSfuncs.c
67+ endif
68+
69+ LIBAWT_HEADLESS_FILES := \
70+ awt_Font.c \
71+ HeadlessToolkit.c \
72+ fontpath.c \
73+ VDrawingArea.c \
74 OGLBlitLoops.c \
75 OGLBufImgOps.c \
76 OGLContext.c \
77@@ -824,10 +839,9 @@ ifeq ($(BUILD_HEADLESS), true)
78 OGLSurfaceData.c \
79 OGLTextRenderer.c \
80 OGLVertexCache.c \
81- GLXGraphicsConfig.c \
82- GLXSurfaceData.c \
83 AccelGlyphCache.c \
84- CUPSfuncs.c
85+ $(LIBAWT_HEADLESS_X11_FILES) \
86+ $(LIBAWT_HEADLESS_CUPS_FILES)
87
88 LIBAWT_HEADLESS_REORDER :=
89 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
91index 64284bc6e..b3584c7ef 100644
92--- a/jdk/src/solaris/native/sun/awt/jawt.c
93+++ b/jdk/src/solaris/native/sun/awt/jawt.c
94@@ -33,7 +33,7 @@
95 */
96 JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt)
97 {
98-#if defined(JAVASE_EMBEDDED) && defined(HEADLESS)
99+#if defined(JAVASE_EMBEDDED) || defined(HEADLESS)
100 /* there are no AWT libs available at all */
101 return JNI_FALSE;
102 #else
103diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h
104index ceea38f43..8d85782ba 100644
105--- a/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 @@
108 #ifndef _AWT_RECT_H
109 #define _AWT_RECT_H
110
111-#ifndef MACOSX
112+#if !(defined(MACOSX) || defined(HEADLESS))
113 #include <X11/Xlib.h>
114 typedef XRectangle RECT_T;
115 #else
116--
1172.24.1
118