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 | 28 |
1 files changed, 13 insertions, 15 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 index e725bf9..115914a 100644 --- 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 @@ -1,18 +1,19 @@ -From 0bb17a5083efcfd02e96ef034e51a190ea678f15 Mon Sep 17 00:00:00 2001 +From bc6450aaa4b7652ee034423f1d04cb439152eaf6 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 +Subject: [PATCH] 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 +- + jdk/make/CompileNativeLibraries.gmk | 2 ++ + jdk/make/lib/Awt2dLibraries.gmk | 30 ++++++++++++++----- + jdk/src/solaris/native/sun/awt/jawt.c | 2 +- + jdk/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 +index c23b958b..2984302f 100644 --- a/jdk/make/CompileNativeLibraries.gmk +++ b/jdk/make/CompileNativeLibraries.gmk @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk @@ -26,7 +27,7 @@ index c23b958b0..2984302f0 100644 # 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 +index 7f42e09c..10232b61 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) @@ -40,7 +41,7 @@ index cd8b94cd8..8d9c37246 100644 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) +@@ -808,17 +812,28 @@ ifeq ($(BUILD_HEADLESS), true) -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir)) @@ -74,7 +75,7 @@ index cd8b94cd8..8d9c37246 100644 OGLBlitLoops.c \ OGLBufImgOps.c \ OGLContext.c \ -@@ -824,10 +839,9 @@ ifeq ($(BUILD_HEADLESS), true) +@@ -831,10 +846,9 @@ ifeq ($(BUILD_HEADLESS), true) OGLSurfaceData.c \ OGLTextRenderer.c \ OGLVertexCache.c \ @@ -88,7 +89,7 @@ index cd8b94cd8..8d9c37246 100644 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 +index 64284bc6..b3584c7e 100644 --- a/jdk/src/solaris/native/sun/awt/jawt.c +++ b/jdk/src/solaris/native/sun/awt/jawt.c @@ -33,7 +33,7 @@ @@ -101,7 +102,7 @@ index 64284bc6e..b3584c7ef 100644 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 +index ceea38f4..8d85782b 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 @@ @@ -113,6 +114,3 @@ index ceea38f43..8d85782ba 100644 #include <X11/Xlib.h> typedef XRectangle RECT_T; #else --- -2.24.1 - |