diff options
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 | 118 |
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 @@ | |||
1 | From 0bb17a5083efcfd02e96ef034e51a190ea678f15 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Rehsack <rehsack@gmail.com> | ||
3 | Date: Thu, 2 Jan 2020 13:26:42 +0100 | ||
4 | Subject: [PATCH 2008/2008] jdk: no unused deps | ||
5 | |||
6 | Signed-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 | |||
14 | diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk | ||
15 | index 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 | ||
28 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | ||
29 | index 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) | ||
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 | ||
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 | ||
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 | ||
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 | -- | ||
117 | 2.24.1 | ||
118 | |||