1 files changed, 0 insertions, 262 deletions

diff --git a/recipes-core/openjdk/patches-openjdk-8/0003-jdk-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/0003-jdk-Allow-using-a-system-installed-libjpeg.patch
deleted file mode 100644
index e189278..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/0003-jdk-Allow-using-a-system-installed-libjpeg.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From a6746c1ee43a63e79b5405e40c463d00160bc02e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
-Date: Tue, 27 Feb 2018 13:36:53 +0000
-Subject: [PATCH 3/9] jdk: Allow using a system-installed libjpeg
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Patch stolen (and some typos corrected) from debian patch,
-which itself was a backport from:
-  http://hg.openjdk.java.net/jdk9/client/rev/bfd9a3e1aeb5
-  http://hg.openjdk.java.net/jdk9/client/jdk/rev/320743f0b4fc
-
-Issues fixed on top of debian patch:
-  * imageIOJPEG.c -> imageioJPEG.c
-  * $(LIBJPEG_LIBS) must be added to LDFLAGS_SUFFIX, not
-    LDFLAGS as it otherwise doesn't make it into the linker
-    command line and then fails when using -Wl,-z,now in
-    LDFLAGS (as done when 'security' is enabled)
-
-Upstream-Status: Backport
-Signed-off-by: André Draszik <andre.draszik@jci.com>
----
- common/autoconf/libraries.m4                       | 35 +++++++++--
- jdk/make/lib/Awt2dLibraries.gmk                    | 69 +++++++++++++++-------
- .../sun/imageio/plugins/jpeg/JPEGImageReader.java  |  2 +-
- .../sun/imageio/plugins/jpeg/JPEGImageWriter.java  |  2 +-
- .../classes/sun/awt/image/JPEGImageDecoder.java    |  2 +-
- .../share/native/sun/awt/image/jpeg/imageioJPEG.c  |  2 +-
- 6 files changed, 81 insertions(+), 31 deletions(-)
-
-diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
-index 91b8ed7f..3f5f69b1 100644
---- a/common/autoconf/libraries.m4
-+++ b/common/autoconf/libraries.m4
-@@ -595,11 +595,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
-   # Check for the jpeg library
-   #
- 
--  USE_EXTERNAL_LIBJPEG=true
--  AC_CHECK_LIB(jpeg, main, [],
--      [ USE_EXTERNAL_LIBJPEG=false
--      AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
--  ])
-+  AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
-+      [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
-+
-+  AC_MSG_CHECKING([for which libjpeg to use])
-+
-+  # default is bundled
-+  DEFAULT_LIBJPEG=bundled
-+
-+  #
-+  # if user didn't specify, use DEFAULT_LIBJPEG
-+  #
-+  if test "x${with_libjpeg}" = "x"; then
-+    with_libjpeg=${DEFAULT_LIBJPEG}
-+  fi
-+
-+  AC_MSG_RESULT(${with_libjpeg})
-+
-+  if test "x${with_libjpeg}" = "xbundled"; then
-+    USE_EXTERNAL_LIBJPEG=false
-+  elif test "x${with_libjpeg}" = "xsystem"; then
-+    AC_CHECK_HEADER(jpeglib.h, [],
-+        [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])])
-+    AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [],
-+        [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])])
-+
-+    USE_EXTERNAL_LIBJPEG=true
-+  else
-+    AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
-+  fi
-+
-   AC_SUBST(USE_EXTERNAL_LIBJPEG)
- 
-   ###############################################################################
-diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
-index aa7efc4a..8872a8e8 100644
---- a/jdk/make/lib/Awt2dLibraries.gmk
-+++ b/jdk/make/lib/Awt2dLibraries.gmk
-@@ -707,21 +707,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
- 
- ##########################################################################################
- 
-+BUILD_LIBJAVAJPEG_DIR := $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-+
- ifdef OPENJDK
--  BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
-+  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
- else
--  BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
--  BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
--  BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
-+  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
-+  BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
-+  BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJAVAJPEG_CLOSED_SRC)
- endif
- 
--BUILD_LIBJPEG_REORDER :=
-+BUILD_LIBJAVAJPEG_REORDER :=
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
--    BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
-+    BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
-   endif
- endif
- 
-+
- # Suppress gcc warnings like "variable might be clobbered by 'longjmp'
- # or 'vfork'": this warning indicates that some variable is placed to
- # a register by optimized compiler and it's value might be lost on longjmp().
-@@ -733,37 +736,50 @@ endif
- #      $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
- #          \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
- #  ifeq ($(CC_43_OR_NEWER), 1)
--#    BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
-+#    BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
- #  endif
- #endif
- 
--$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
--    LIBRARY := jpeg, \
-+ifeq ($(USE_EXTERNAL_LIBJPEG), true)
-+  LIBJPEG_LIBS := -ljpeg
-+  BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
-+      imageioJPEG.c \
-+      jpegdecoder.c
-+  BUILD_LIBJAVAJPEG_HEADERS :=
-+else
-+  LIBJPEG_LIBS :=
-+  BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
-+  BUILD_LIBJAVAJPEG_HEADERS := -I$(BUILD_LIBJAVAJPEG_DIR)
-+endif
-+
-+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
-+    LIBRARY := javajpeg, \
-     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
--    SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
--        $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
-+    SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
-+        $(BUILD_LIBJAVAJPEG_DIR), \
-+    INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
-     LANG := C, \
-     OPTIMIZATION := HIGHEST, \
-     CFLAGS := $(CFLAGS_JDKLIB) \
--        $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
--        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
--    MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
-+        $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
-+        $(BUILD_LIBJAVAJPEG_HEADERS), \
-+    MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
--    LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
-+    LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) $(LIBJPEG_LIBS), \
-     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-     RC_FLAGS := $(RC_FLAGS) \
--        -D "JDK_FNAME=jpeg.dll" \
--        -D "JDK_INTERNAL_NAME=jpeg" \
-+        -D "JDK_FNAME=javajpeg.dll" \
-+        -D "JDK_INTERNAL_NAME=javajpeg" \
-         -D "JDK_FTYPE=0x2L", \
--    REORDER := $(BUILD_LIBJPEG_REORDER), \
-+    REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
-     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
-     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
- 
--$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
-+$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
- 
--BUILD_LIBRARIES += $(BUILD_LIBJPEG)
-+BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
- 
- ##########################################################################################
- 
-@@ -1213,6 +1229,13 @@ ifndef BUILD_HEADLESS_ONLY
-     GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
-   endif
- 
-+  ifeq ($(USE_EXTERNAL_LIBJPEG), true)
-+    LIBJPEG_LDFLAGS := -ljpeg
-+  else
-+    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-+    LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
-+  endif
-+
-   ifneq ($(OPENJDK_TARGET_OS), macosx)
-     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
-   else
-@@ -1273,11 +1296,13 @@ ifndef BUILD_HEADLESS_ONLY
-       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
-       LANG := C, \
-       OPTIMIZATION := LOW, \
--      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
-+      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
-+                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \
-       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
-       LDFLAGS := $(LDFLAGS_JDKLIB) \
-           $(call SET_SHARED_LIBRARY_ORIGIN), \
--      LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
-+      LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
-+                        $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \
-       LDFLAGS_SUFFIX_solaris := -lc, \
-       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-       RC_FLAGS := $(RC_FLAGS) \
-diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
-index 5c93d89e..5efc00a7 100644
---- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
-+++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
-@@ -89,7 +89,7 @@ public class JPEGImageReader extends ImageReader {
-         java.security.AccessController.doPrivileged(
-             new java.security.PrivilegedAction<Void>() {
-                 public Void run() {
--                    System.loadLibrary("jpeg");
-+                    System.loadLibrary("javajpeg");
-                     return null;
-                 }
-             });
-diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
-index 6a33bd5a..dca189ed 100644
---- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
-+++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
-@@ -177,7 +177,7 @@ public class JPEGImageWriter extends ImageWriter {
-         java.security.AccessController.doPrivileged(
-             new java.security.PrivilegedAction<Void>() {
-                 public Void run() {
--                    System.loadLibrary("jpeg");
-+                    System.loadLibrary("javajpeg");
-                     return null;
-                 }
-             });
-diff --git a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
-index 872ffc01..5965a186 100644
---- a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
-+++ b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java
-@@ -56,7 +56,7 @@ public class JPEGImageDecoder extends ImageDecoder {
-         java.security.AccessController.doPrivileged(
-             new java.security.PrivilegedAction<Void>() {
-                 public Void run() {
--                    System.loadLibrary("jpeg");
-+                    System.loadLibrary("javajpeg");
-                     return null;
-                 }
-             });
-diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
-index 7e1d8c99..8cac61da 100644
---- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
-+++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
-@@ -51,7 +51,7 @@
- 
- /* headers from the JPEG library */
- #include <jpeglib.h>
--#include "jerror.h"
-+#include <jerror.h>
- 
- #undef MAX
- #define MAX(a,b)        ((a) > (b) ? (a) : (b))
--- 
-2.16.2
-