diff options
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.patch | 44 |
1 files changed, 22 insertions, 22 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 index cd42544..7b5d998 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch | |||
@@ -1,9 +1,9 @@ | |||
1 | --- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-09-03 15:05:21.429981848 +0200 | 1 | --- jdk/make/lib/Awt2dLibraries.gmk.orig |
2 | +++ jdk/make/lib/Awt2dLibraries.gmk 2015-09-03 15:05:44.705981936 +0200 | 2 | +++ jdk/make/lib/Awt2dLibraries.gmk |
3 | @@ -235,6 +235,10 @@ | 3 | @@ -235,6 +235,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) |
4 | LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting | 4 | LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting |
5 | endif | 5 | endif |
6 | 6 | ||
7 | +ifdef BUILD_HEADLESS_ONLY | 7 | +ifdef BUILD_HEADLESS_ONLY |
8 | +LIBAWT_CFLAGS += -DHEADLESS=true | 8 | +LIBAWT_CFLAGS += -DHEADLESS=true |
9 | +endif | 9 | +endif |
@@ -11,10 +11,10 @@ | |||
11 | LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ | 11 | LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ |
12 | $(X_CFLAGS) \ | 12 | $(X_CFLAGS) \ |
13 | $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) | 13 | $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) |
14 | @@ -1126,17 +1130,28 @@ | 14 | @@ -792,17 +796,28 @@ ifeq ($(BUILD_HEADLESS), true) |
15 | -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks | 15 | -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ |
16 | endif | 16 | $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) |
17 | 17 | ||
18 | - LIBAWT_HEADLESS_FILES := \ | 18 | - LIBAWT_HEADLESS_FILES := \ |
19 | - awt_Font.c \ | 19 | - awt_Font.c \ |
20 | - HeadlessToolkit.c \ | 20 | - HeadlessToolkit.c \ |
@@ -45,7 +45,7 @@ | |||
45 | OGLBlitLoops.c \ | 45 | OGLBlitLoops.c \ |
46 | OGLBufImgOps.c \ | 46 | OGLBufImgOps.c \ |
47 | OGLContext.c \ | 47 | OGLContext.c \ |
48 | @@ -1149,10 +1164,9 @@ | 48 | @@ -815,10 +830,9 @@ ifeq ($(BUILD_HEADLESS), true) |
49 | OGLSurfaceData.c \ | 49 | OGLSurfaceData.c \ |
50 | OGLTextRenderer.c \ | 50 | OGLTextRenderer.c \ |
51 | OGLVertexCache.c \ | 51 | OGLVertexCache.c \ |
@@ -55,23 +55,23 @@ | |||
55 | - CUPSfuncs.c | 55 | - CUPSfuncs.c |
56 | + $(LIBAWT_HEADLESS_X11_FILES) \ | 56 | + $(LIBAWT_HEADLESS_X11_FILES) \ |
57 | + $(LIBAWT_HEADLESS_CUPS_FILES) | 57 | + $(LIBAWT_HEADLESS_CUPS_FILES) |
58 | 58 | ||
59 | LIBAWT_HEADLESS_REORDER := | 59 | LIBAWT_HEADLESS_REORDER := |
60 | ifeq ($(OPENJDK_TARGET_OS), solaris) | 60 | ifeq ($(OPENJDK_TARGET_OS), solaris) |
61 | --- jdk/make/CompileNativeLibraries.gmk.orig 2015-08-24 13:35:55.320678845 +0200 | 61 | --- jdk/make/CompileNativeLibraries.gmk.orig |
62 | +++ jdk/make/CompileNativeLibraries.gmk 2015-08-24 13:36:22.776678949 +0200 | 62 | +++ jdk/make/CompileNativeLibraries.gmk |
63 | @@ -85,7 +85,9 @@ | 63 | @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk |
64 | 64 | ||
65 | include lib/Awt2dLibraries.gmk | 65 | include lib/Awt2dLibraries.gmk |
66 | 66 | ||
67 | +ifndef BUILD_SOUNDLESS_ONLY | 67 | +ifndef BUILD_SOUNDLESS_ONLY |
68 | include lib/SoundLibraries.gmk | 68 | include lib/SoundLibraries.gmk |
69 | +endif | 69 | +endif |
70 | 70 | ||
71 | # Include the corresponding custom file, if present. | 71 | # Include the corresponding custom file, if present. |
72 | -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk | 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 | 73 | --- jdk/src/solaris/native/sun/awt/jawt.c.orig |
74 | +++ jdk/src/solaris/native/sun/awt/jawt.c 2015-08-24 14:16:20.420687974 +0200 | 74 | +++ jdk/src/solaris/native/sun/awt/jawt.c |
75 | @@ -33,7 +33,7 @@ | 75 | @@ -33,7 +33,7 @@ |
76 | */ | 76 | */ |
77 | JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt) | 77 | JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt) |
@@ -81,12 +81,12 @@ | |||
81 | /* there are no AWT libs available at all */ | 81 | /* there are no AWT libs available at all */ |
82 | return JNI_FALSE; | 82 | return JNI_FALSE; |
83 | #else | 83 | #else |
84 | --- jdk/src/solaris/native/sun/awt/utility/rect.h.orig 2015-09-03 14:45:40.717977403 +0200 | 84 | --- jdk/src/solaris/native/sun/awt/utility/rect.h.orig |
85 | +++ jdk/src/solaris/native/sun/awt/utility/rect.h 2015-09-03 14:46:46.337977650 +0200 | 85 | +++ jdk/src/solaris/native/sun/awt/utility/rect.h |
86 | @@ -28,7 +28,7 @@ | 86 | @@ -28,7 +28,7 @@ |
87 | #ifndef _AWT_RECT_H | 87 | #ifndef _AWT_RECT_H |
88 | #define _AWT_RECT_H | 88 | #define _AWT_RECT_H |
89 | 89 | ||
90 | -#ifndef MACOSX | 90 | -#ifndef MACOSX |
91 | +#if !(defined(MACOSX) || defined(HEADLESS)) | 91 | +#if !(defined(MACOSX) || defined(HEADLESS)) |
92 | #include <X11/Xlib.h> | 92 | #include <X11/Xlib.h> |