summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.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-28 15:09:31 +0100
commit7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch)
tree398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch
parent19b569281cc30e3aa94e772d6885cd340b1d1724 (diff)
downloadmeta-java-7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14.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" Additionally add UPDATING.md which describes the openjdk8 update process for this layer and update8checksums.sh, a script that updates the openjdk8 source archive checksums in the corresponding .inc files. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch154
1 files changed, 154 insertions, 0 deletions
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 @@
1From a5f2646a9dd0f7191e9e0aa5eba5fdd9d70d1671 Mon Sep 17 00:00:00 2001
2From: Jens Rehsack <rehsack@gmail.com>
3Date: Thu, 2 Jan 2020 13:53:50 +0100
4Subject: [PATCH 09/10] prevent debuginfo in favour of openembedded package
5 split
6
7Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
8---
9 make/common/NativeCompilation.gmk | 122 ------------------------------
10 1 file changed, 122 deletions(-)
11
12diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
13index 46a1be9..b4ea2c6 100644
14--- a/make/common/NativeCompilation.gmk
15+++ b/make/common/NativeCompilation.gmk
16@@ -456,67 +456,6 @@ define SetupNativeCompilation
17 $(CP) $$< $$@
18 endif
19
20- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
21- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
22- ifeq ($(OPENJDK_TARGET_OS), solaris)
23- ifneq ($$($1_STRIP_POLICY), no_strip)
24- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
25- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
26- # empty section headers until a fixed $(OBJCOPY) is available.
27- # An empty section header has sh_addr == 0 and sh_size == 0.
28- # This problem has only been seen on Solaris X64, but we call this tool
29- # on all Solaris builds just in case.
30- #
31- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
32- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
33- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
34- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
35- $(RM) $$@
36- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
37- $(OBJCOPY) --only-keep-debug $$< $$@
38- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
39- endif
40- else # not solaris
41- ifneq ($$($1_STRIP_POLICY), no_strip)
42- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
43- $(RM) $$@
44- $(OBJCOPY) --only-keep-debug $$< $$@
45- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
46- endif
47- endif # Touch to not retrigger rule on rebuild
48- ifneq ($$($1_STRIP_POLICY), no_strip)
49- $(TOUCH) $$@
50- endif
51- endif # !windows
52- endif # !macosx
53-
54- ifeq ($(ZIP_DEBUGINFO_FILES), true)
55-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
56-ifneq ($$($1_STRIP_POLICY), no_strip)
57- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
58-
59- ifeq ($(OPENJDK_TARGET_OS), windows)
60- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
61- $(CD) $$($1_OBJECT_DIR) \
62- && $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb
63- else
64- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \
65- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
66- $(CD) $$($1_OBJECT_DIR) \
67- && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
68- endif
69-endif # not possible when stripping is disabled
70-endif # no MacOS X support yet
71- else
72- ifeq ($(OPENJDK_TARGET_OS), windows)
73- $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
74- $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
75- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
76- ifneq ($$($1_STRIP_POLICY), no_strip)
77- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
78- endif
79- endif
80- endif
81 endif
82 endif
83
84@@ -550,67 +489,6 @@ endif # no MacOS X support yet
85 $(CP) $$< $$@
86 endif
87
88- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
89- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
90- ifeq ($(OPENJDK_TARGET_OS), solaris)
91- ifneq ($$($1_STRIP_POLICY), no_strip)
92- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
93- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
94- # empty section headers until a fixed $(OBJCOPY) is available.
95- # An empty section header has sh_addr == 0 and sh_size == 0.
96- # This problem has only been seen on Solaris X64, but we call this tool
97- # on all Solaris builds just in case.
98- #
99- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
100- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
101- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
102- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
103- $(RM) $$@
104- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
105- $(OBJCOPY) --only-keep-debug $$< $$@
106- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
107- endif
108- else # not solaris
109- ifneq ($$($1_STRIP_POLICY), no_strip)
110- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
111- $(RM) $$@
112- $(OBJCOPY) --only-keep-debug $$< $$@
113- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
114- endif
115- endif
116- ifneq ($$($1_STRIP_POLICY), no_strip)
117- $(TOUCH) $$@
118- endif
119- endif # !windows
120- endif # !macosx
121-
122- ifeq ($(ZIP_DEBUGINFO_FILES), true)
123-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
124-ifneq ($$($1_STRIP_POLICY), no_strip)
125- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
126-
127- ifeq ($(OPENJDK_TARGET_OS), windows)
128- $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET)
129- $(CD) $$($1_OBJECT_DIR) \
130- && $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb
131- else
132- $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \
133- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo
134- $(CD) $$($1_OBJECT_DIR) \
135- && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
136- endif
137-endif
138-endif # no MacOS X support yet
139- else
140- ifeq ($(OPENJDK_TARGET_OS), windows)
141- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
142- $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
143- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
144- ifneq ($$($1_STRIP_POLICY), no_strip)
145- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
146- endif
147- endif
148- endif
149 endif
150 endif
151
152--
1532.24.1
154