aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch
blob: e725bf9b3b5cb6033769df30f2200a00d93cf22f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
From 0bb17a5083efcfd02e96ef034e51a190ea678f15 Mon Sep 17 00:00:00 2001
From: Jens Rehsack <rehsack@gmail.com>
Date: Thu, 2 Jan 2020 13:26:42 +0100
Subject: [PATCH 2008/2008] jdk: no unused deps

Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
---
 make/CompileNativeLibraries.gmk           |  2 ++
 make/lib/Awt2dLibraries.gmk               | 30 +++++++++++++++++------
 src/solaris/native/sun/awt/jawt.c         |  2 +-
 src/solaris/native/sun/awt/utility/rect.h |  2 +-
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk
index c23b958b0..2984302f0 100644
--- a/jdk/make/CompileNativeLibraries.gmk
+++ b/jdk/make/CompileNativeLibraries.gmk
@@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk
 
 include lib/Awt2dLibraries.gmk
 
+ifndef BUILD_SOUNDLESS_ONLY
 include lib/SoundLibraries.gmk
+endif
 
 # Include the corresponding custom file, if present. 
 -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk
diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
index cd8b94cd8..8d9c37246 100644
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
@@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix)
   LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting
 endif
 
+ifdef BUILD_HEADLESS_ONLY
+LIBAWT_CFLAGS += -DHEADLESS=true
+endif
+
 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
     $(X_CFLAGS) \
     $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
@@ -801,17 +805,28 @@ ifeq ($(BUILD_HEADLESS), true)
         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
         $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
 
-    LIBAWT_HEADLESS_FILES := \
-        awt_Font.c \
-        HeadlessToolkit.c \
-        fontpath.c \
-        VDrawingArea.c \
+    ifndef X11_NOT_NEEDED
+    LIBAWT_HEADLESS_X11_FILES := \
         X11Color.c \
         X11Renderer.c \
         X11PMBlitLoops.c \
         X11SurfaceData.c \
         X11FontScaler_md.c \
         X11TextRenderer_md.c \
+        GLXGraphicsConfig.c \
+        GLXSurfaceData.c
+    endif
+
+    ifndef CUPS_NOT_NEEDED
+    LIBAWT_HEADLESS_CUPS_FILES := \
+        CUPSfuncs.c
+    endif
+
+    LIBAWT_HEADLESS_FILES := \
+        awt_Font.c \
+        HeadlessToolkit.c \
+        fontpath.c \
+        VDrawingArea.c \
         OGLBlitLoops.c \
         OGLBufImgOps.c \
         OGLContext.c \
@@ -824,10 +839,9 @@ ifeq ($(BUILD_HEADLESS), true)
         OGLSurfaceData.c \
         OGLTextRenderer.c \
         OGLVertexCache.c \
-        GLXGraphicsConfig.c \
-        GLXSurfaceData.c \
         AccelGlyphCache.c \
-        CUPSfuncs.c
+	$(LIBAWT_HEADLESS_X11_FILES) \
+	$(LIBAWT_HEADLESS_CUPS_FILES)
 
     LIBAWT_HEADLESS_REORDER :=
     ifeq ($(OPENJDK_TARGET_OS), solaris)
diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c
index 64284bc6e..b3584c7ef 100644
--- a/jdk/src/solaris/native/sun/awt/jawt.c
+++ b/jdk/src/solaris/native/sun/awt/jawt.c
@@ -33,7 +33,7 @@
  */
 JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt)
 {
-#if defined(JAVASE_EMBEDDED) && defined(HEADLESS)
+#if defined(JAVASE_EMBEDDED) || defined(HEADLESS)
     /* there are no AWT libs available at all */
     return JNI_FALSE;
 #else
diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h
index ceea38f43..8d85782ba 100644
--- a/jdk/src/solaris/native/sun/awt/utility/rect.h
+++ b/jdk/src/solaris/native/sun/awt/utility/rect.h
@@ -28,7 +28,7 @@
 #ifndef _AWT_RECT_H
 #define _AWT_RECT_H
 
-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(HEADLESS))
 #include <X11/Xlib.h>
 typedef XRectangle RECT_T;
 #else
-- 
2.24.1