From cb6eedeb1f7fa877497e6ff2aa893e8089fe6541 Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Mon, 30 Dec 2019 15:35:59 +0100 Subject: 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 --- ...uginfo-in-favour-of-openembedded-package-.patch | 154 +++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch (limited to 'recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch') diff --git a/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch new file mode 100644 index 0000000..14fccd1 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch @@ -0,0 +1,154 @@ +From a5f2646a9dd0f7191e9e0aa5eba5fdd9d70d1671 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Thu, 2 Jan 2020 13:53:50 +0100 +Subject: [PATCH 09/10] prevent debuginfo in favour of openembedded package + split + +Signed-off-by: Richard Leitner +--- + make/common/NativeCompilation.gmk | 122 ------------------------------ + 1 file changed, 122 deletions(-) + +diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk +index 46a1be9..b4ea2c6 100644 +--- a/make/common/NativeCompilation.gmk ++++ b/make/common/NativeCompilation.gmk +@@ -456,67 +456,6 @@ define SetupNativeCompilation + $(CP) $$< $$@ + endif + +- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X +- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows +- ifeq ($(OPENJDK_TARGET_OS), solaris) +- ifneq ($$($1_STRIP_POLICY), no_strip) +- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. +- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from +- # empty section headers until a fixed $(OBJCOPY) is available. +- # An empty section header has sh_addr == 0 and sh_size == 0. +- # This problem has only been seen on Solaris X64, but we call this tool +- # on all Solaris builds just in case. +- # +- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. +- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. +- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \ +- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) +- $(RM) $$@ +- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< +- $(OBJCOPY) --only-keep-debug $$< $$@ +- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< +- endif +- else # not solaris +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) +- $(RM) $$@ +- $(OBJCOPY) --only-keep-debug $$< $$@ +- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< +- endif +- endif # Touch to not retrigger rule on rebuild +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $(TOUCH) $$@ +- endif +- endif # !windows +- endif # !macosx +- +- ifeq ($(ZIP_DEBUGINFO_FILES), true) +-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet +-ifneq ($$($1_STRIP_POLICY), no_strip) +- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz +- +- ifeq ($(OPENJDK_TARGET_OS), windows) +- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) +- $(CD) $$($1_OBJECT_DIR) \ +- && $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb +- else +- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \ +- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo +- $(CD) $$($1_OBJECT_DIR) \ +- && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo +- endif +-endif # not possible when stripping is disabled +-endif # no MacOS X support yet +- else +- ifeq ($(OPENJDK_TARGET_OS), windows) +- $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \ +- $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb +- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo +- endif +- endif +- endif + endif + endif + +@@ -550,67 +489,6 @@ endif # no MacOS X support yet + $(CP) $$< $$@ + endif + +- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X +- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows +- ifeq ($(OPENJDK_TARGET_OS), solaris) +- ifneq ($$($1_STRIP_POLICY), no_strip) +- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. +- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from +- # empty section headers until a fixed $(OBJCOPY) is available. +- # An empty section header has sh_addr == 0 and sh_size == 0. +- # This problem has only been seen on Solaris X64, but we call this tool +- # on all Solaris builds just in case. +- # +- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. +- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. +- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \ +- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) +- $(RM) $$@ +- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< +- $(OBJCOPY) --only-keep-debug $$< $$@ +- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< +- endif +- else # not solaris +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) +- $(RM) $$@ +- $(OBJCOPY) --only-keep-debug $$< $$@ +- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< +- endif +- endif +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $(TOUCH) $$@ +- endif +- endif # !windows +- endif # !macosx +- +- ifeq ($(ZIP_DEBUGINFO_FILES), true) +-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet +-ifneq ($$($1_STRIP_POLICY), no_strip) +- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz +- +- ifeq ($(OPENJDK_TARGET_OS), windows) +- $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET) +- $(CD) $$($1_OBJECT_DIR) \ +- && $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb +- else +- $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \ +- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo +- $(CD) $$($1_OBJECT_DIR) \ +- && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo +- endif +-endif +-endif # no MacOS X support yet +- else +- ifeq ($(OPENJDK_TARGET_OS), windows) +- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \ +- $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb +- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files +- ifneq ($$($1_STRIP_POLICY), no_strip) +- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo +- endif +- endif +- endif + endif + endif + +-- +2.24.1 + -- cgit v1.2.3-54-g00ecf