summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-12-30 15:35:59 +0100
committerRichard Leitner <richard.leitner@skidata.com>2020-01-27 11:02:06 +0100
commitcb6eedeb1f7fa877497e6ff2aa893e8089fe6541 (patch)
treeba4b6977735e331c5cb6a7585a185fba895f2dc7 /recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch
parent19b569281cc30e3aa94e772d6885cd340b1d1724 (diff)
downloadmeta-java-cb6eedeb1f7fa877497e6ff2aa893e8089fe6541.tar.gz
openjdk-8: update to latest ga version 242
As OpenJDK-8 is now tagging "ga" versions in addition to the "build" version the recipes are adapted to use those "ga" versions. All existing patches got re-applied and renamed. For better handling Hotspot patches now start at patch number 1001 and jdk patches at 2001. Furthermore architecture dependent patches are prefixed with the architecture they apply on. Following patches/hunks were completely dropped: - 0002-hotspot-fix-compilation-with-security-flags-enabled.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185 - 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch ostream.cpp:112 got fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502 - 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 - 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd - 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c - openjdk8-add-missing-linker-flags.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a - openjdk8-fix-shark-stdc++11.patch fixed in hotspot jdk8u - openjdk8-fix-libpng-neon-build.patch fixed in jdk https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1 - aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u Following patches were newly added: - 0011-autoconf-fix-CC-with-arguments-detection.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" - 0012-autoconf-NativeCompilation-remove-sysroot.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch b/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch
new file mode 100644
index 0000000..8f3d134
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch
@@ -0,0 +1,32 @@
1From 0708dd8e56c1f28c2215561ba3035c8c538acef6 Mon Sep 17 00:00:00 2001
2From: Jens Rehsack <rehsack@gmail.com>
3Date: Thu, 2 Jan 2020 13:25:12 +0100
4Subject: [PATCH 2007/2008] jdk: no genx11 in headless
5
6Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
7---
8 make/GenerateSources.gmk | 8 +++++---
9 1 file changed, 5 insertions(+), 3 deletions(-)
10
11diff --git a/jdk/make/GenerateSources.gmk b/jdk/make/GenerateSources.gmk
12index ba443f7da..2170150ac 100644
13--- a/jdk/make/GenerateSources.gmk
14+++ b/jdk/make/GenerateSources.gmk
15@@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
16 GENSRC += $(GENSRC_OSX_ICONS)
17 endif
18
19- ifneq ($(OPENJDK_TARGET_OS), macosx)
20- include gensrc/GensrcX11Wrappers.gmk
21- GENSRC += $(GENSRC_X11WRAPPERS)
22+ ifndef BUILD_HEADLESS_ONLY
23+ ifneq ($(OPENJDK_TARGET_OS), macosx)
24+ include gensrc/GensrcX11Wrappers.gmk
25+ GENSRC += $(GENSRC_X11WRAPPERS)
26+ endif
27 endif
28 endif
29
30--
312.24.1
32