summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2015-12-08 14:52:51 +0100
committerMaxin B. John <maxin.john@intel.com>2015-12-08 17:43:40 +0200
commitbac3b9acee5110390d15d38dacdb1622e31b2238 (patch)
tree1f39d7b8392576f19f77fb65f470391e2d15c6c1 /recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
parent04d5d0bf414c05ca59618d77f17ff9898aa1c566 (diff)
downloadmeta-java-bac3b9acee5110390d15d38dacdb1622e31b2238.tar.gz
openjdk-8: add recipes for openjdk-8 and openjre-8
This adds openjdk-8 for native and target builds and allows a stripped openjre-8 being built as well instead of trying to cherry-pick jre components from jdk-image. The recipes allow building openjdk-8 with or without: * x11 * cups * alsa/pulseaudio and let packager enable unlimited-crypto, if desired. To support certificate based java libraries, cacerts is created based on ca-certificates from OE-core. Since there can be only one PROVIDES for virtual/java-native and virtual/javac-native, move the provides to openjdk-8-native (I think everyone agrees it's a better choice than ecj-bootstrap-native). Plus: Applying a fix from openjdk-9 repository which fixes build issues using gcc5 Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch94
1 files changed, 94 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
new file mode 100644
index 0000000..cd42544
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
@@ -0,0 +1,94 @@
1--- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-09-03 15:05:21.429981848 +0200
2+++ jdk/make/lib/Awt2dLibraries.gmk 2015-09-03 15:05:44.705981936 +0200
3@@ -235,6 +235,10 @@
4 LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting
5 endif
6
7+ifdef BUILD_HEADLESS_ONLY
8+LIBAWT_CFLAGS += -DHEADLESS=true
9+endif
10+
11 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
12 $(X_CFLAGS) \
13 $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
14@@ -1126,17 +1130,28 @@
15 -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
16 endif
17
18- LIBAWT_HEADLESS_FILES := \
19- awt_Font.c \
20- HeadlessToolkit.c \
21- fontpath.c \
22- VDrawingArea.c \
23+ ifndef X11_NOT_NEEDED
24+ LIBAWT_HEADLESS_X11_FILES := \
25 X11Color.c \
26 X11Renderer.c \
27 X11PMBlitLoops.c \
28 X11SurfaceData.c \
29 X11FontScaler_md.c \
30 X11TextRenderer_md.c \
31+ GLXGraphicsConfig.c \
32+ GLXSurfaceData.c
33+ endif
34+
35+ ifndef CUPS_NOT_NEEDED
36+ LIBAWT_HEADLESS_CUPS_FILES := \
37+ CUPSfuncs.c
38+ endif
39+
40+ LIBAWT_HEADLESS_FILES := \
41+ awt_Font.c \
42+ HeadlessToolkit.c \
43+ fontpath.c \
44+ VDrawingArea.c \
45 OGLBlitLoops.c \
46 OGLBufImgOps.c \
47 OGLContext.c \
48@@ -1149,10 +1164,9 @@
49 OGLSurfaceData.c \
50 OGLTextRenderer.c \
51 OGLVertexCache.c \
52- GLXGraphicsConfig.c \
53- GLXSurfaceData.c \
54 AccelGlyphCache.c \
55- CUPSfuncs.c
56+ $(LIBAWT_HEADLESS_X11_FILES) \
57+ $(LIBAWT_HEADLESS_CUPS_FILES)
58
59 LIBAWT_HEADLESS_REORDER :=
60 ifeq ($(OPENJDK_TARGET_OS), solaris)
61--- jdk/make/CompileNativeLibraries.gmk.orig 2015-08-24 13:35:55.320678845 +0200
62+++ jdk/make/CompileNativeLibraries.gmk 2015-08-24 13:36:22.776678949 +0200
63@@ -85,7 +85,9 @@
64
65 include lib/Awt2dLibraries.gmk
66
67+ifndef BUILD_SOUNDLESS_ONLY
68 include lib/SoundLibraries.gmk
69+endif
70
71 # Include the corresponding custom file, if present.
72 -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk
73--- jdk/src/solaris/native/sun/awt/jawt.c.orig 2015-08-24 14:12:29.376687104 +0200
74+++ jdk/src/solaris/native/sun/awt/jawt.c 2015-08-24 14:16:20.420687974 +0200
75@@ -33,7 +33,7 @@
76 */
77 JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt)
78 {
79-#if defined(JAVASE_EMBEDDED) && defined(HEADLESS)
80+#if defined(JAVASE_EMBEDDED) || defined(HEADLESS)
81 /* there are no AWT libs available at all */
82 return JNI_FALSE;
83 #else
84--- jdk/src/solaris/native/sun/awt/utility/rect.h.orig 2015-09-03 14:45:40.717977403 +0200
85+++ jdk/src/solaris/native/sun/awt/utility/rect.h 2015-09-03 14:46:46.337977650 +0200
86@@ -28,7 +28,7 @@
87 #ifndef _AWT_RECT_H
88 #define _AWT_RECT_H
89
90-#ifndef MACOSX
91+#if !(defined(MACOSX) || defined(HEADLESS))
92 #include <X11/Xlib.h>
93 typedef XRectangle RECT_T;
94 #else