aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
diff options
context:
space:
mode:
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, 0 insertions, 94 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
deleted file mode 100644
index 7b5d998..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- jdk/make/lib/Awt2dLibraries.gmk.orig
-+++ jdk/make/lib/Awt2dLibraries.gmk
-@@ -235,6 +235,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))
-@@ -792,17 +796,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 \
-@@ -815,10 +830,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)
---- jdk/make/CompileNativeLibraries.gmk.orig
-+++ 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
---- jdk/src/solaris/native/sun/awt/jawt.c.orig
-+++ 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
---- jdk/src/solaris/native/sun/awt/utility/rect.h.orig
-+++ 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