diff options
| author | Jens Rehsack <rehsack@gmail.com> | 2015-12-08 14:52:51 +0100 |
|---|---|---|
| committer | Maxin B. John <maxin.john@intel.com> | 2015-12-08 17:43:40 +0200 |
| commit | bac3b9acee5110390d15d38dacdb1622e31b2238 (patch) | |
| tree | 1f39d7b8392576f19f77fb65f470391e2d15c6c1 /recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch | |
| parent | 04d5d0bf414c05ca59618d77f17ff9898aa1c566 (diff) | |
| download | meta-java-bac3b9acee5110390d15d38dacdb1622e31b2238.tar.gz | |
openjdk-8: add recipes for openjdk-8 and openjre-8
This adds openjdk-8 for native and target builds and allows a stripped
openjre-8 being built as well instead of trying to cherry-pick jre
components from jdk-image.
The recipes allow building openjdk-8 with or without:
* x11
* cups
* alsa/pulseaudio
and let packager enable unlimited-crypto, if desired.
To support certificate based java libraries, cacerts is created based on
ca-certificates from OE-core.
Since there can be only one PROVIDES for virtual/java-native and virtual/javac-native,
move the provides to openjdk-8-native (I think everyone agrees it's a better
choice than ecj-bootstrap-native).
Plus: Applying a fix from openjdk-9 repository which fixes build issues using gcc5
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch')
| -rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch new file mode 100644 index 0000000..3a71403 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch | |||
| @@ -0,0 +1,120 @@ | |||
| 1 | --- make/common/NativeCompilation.gmk.orig 2015-09-09 17:15:33.869765681 +0200 | ||
| 2 | +++ make/common/NativeCompilation.gmk 2015-09-09 17:55:26.485774688 +0200 | ||
| 3 | @@ -434,58 +434,6 @@ | ||
| 4 | $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% | ||
| 5 | $(CP) $$< $$@ | ||
| 6 | endif | ||
| 7 | - | ||
| 8 | - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X | ||
| 9 | - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows | ||
| 10 | - ifeq ($(OPENJDK_TARGET_OS), solaris) | ||
| 11 | - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. | ||
| 12 | - # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from | ||
| 13 | - # empty section headers until a fixed $(OBJCOPY) is available. | ||
| 14 | - # An empty section header has sh_addr == 0 and sh_size == 0. | ||
| 15 | - # This problem has only been seen on Solaris X64, but we call this tool | ||
| 16 | - # on all Solaris builds just in case. | ||
| 17 | - # | ||
| 18 | - # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. | ||
| 19 | - # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. | ||
| 20 | - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \ | ||
| 21 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) | ||
| 22 | - $(RM) $$@ | ||
| 23 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< | ||
| 24 | - $(OBJCOPY) --only-keep-debug $$< $$@ | ||
| 25 | - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< | ||
| 26 | - else # not solaris | ||
| 27 | - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) | ||
| 28 | - $(RM) $$@ | ||
| 29 | - $(OBJCOPY) --only-keep-debug $$< $$@ | ||
| 30 | - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< | ||
| 31 | - endif # Touch to not retrigger rule on rebuild | ||
| 32 | - $(TOUCH) $$@ | ||
| 33 | - endif # !windows | ||
| 34 | - endif # !macosx | ||
| 35 | - | ||
| 36 | - ifeq ($(ZIP_DEBUGINFO_FILES), true) | ||
| 37 | -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet | ||
| 38 | - $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz | ||
| 39 | - | ||
| 40 | - ifeq ($(OPENJDK_TARGET_OS), windows) | ||
| 41 | - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) | ||
| 42 | - $(CD) $$($1_OBJECT_DIR) \ | ||
| 43 | - && $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb | ||
| 44 | - else | ||
| 45 | - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \ | ||
| 46 | - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo | ||
| 47 | - $(CD) $$($1_OBJECT_DIR) \ | ||
| 48 | - && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo | ||
| 49 | - endif | ||
| 50 | -endif # no MacOS X support yet | ||
| 51 | - else | ||
| 52 | - ifeq ($(OPENJDK_TARGET_OS), windows) | ||
| 53 | - $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \ | ||
| 54 | - $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb | ||
| 55 | - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files | ||
| 56 | - $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo | ||
| 57 | - endif | ||
| 58 | - endif | ||
| 59 | endif | ||
| 60 | endif | ||
| 61 | |||
| 62 | @@ -518,58 +466,6 @@ | ||
| 63 | $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% | ||
| 64 | $(CP) $$< $$@ | ||
| 65 | endif | ||
| 66 | - | ||
| 67 | - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X | ||
| 68 | - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows | ||
| 69 | - ifeq ($(OPENJDK_TARGET_OS), solaris) | ||
| 70 | - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. | ||
| 71 | - # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from | ||
| 72 | - # empty section headers until a fixed $(OBJCOPY) is available. | ||
| 73 | - # An empty section header has sh_addr == 0 and sh_size == 0. | ||
| 74 | - # This problem has only been seen on Solaris X64, but we call this tool | ||
| 75 | - # on all Solaris builds just in case. | ||
| 76 | - # | ||
| 77 | - # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. | ||
| 78 | - # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. | ||
| 79 | - $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \ | ||
| 80 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) | ||
| 81 | - $(RM) $$@ | ||
| 82 | - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< | ||
| 83 | - $(OBJCOPY) --only-keep-debug $$< $$@ | ||
| 84 | - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< | ||
| 85 | - else # not solaris | ||
| 86 | - $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) | ||
| 87 | - $(RM) $$@ | ||
| 88 | - $(OBJCOPY) --only-keep-debug $$< $$@ | ||
| 89 | - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< | ||
| 90 | - endif | ||
| 91 | - $(TOUCH) $$@ | ||
| 92 | - endif # !windows | ||
| 93 | - endif # !macosx | ||
| 94 | - | ||
| 95 | - ifeq ($(ZIP_DEBUGINFO_FILES), true) | ||
| 96 | -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet | ||
| 97 | - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz | ||
| 98 | - | ||
| 99 | - ifeq ($(OPENJDK_TARGET_OS), windows) | ||
| 100 | - $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET) | ||
| 101 | - $(CD) $$($1_OBJECT_DIR) \ | ||
| 102 | - && $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb | ||
| 103 | - else | ||
| 104 | - $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \ | ||
| 105 | - $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo | ||
| 106 | - $(CD) $$($1_OBJECT_DIR) \ | ||
| 107 | - && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo | ||
| 108 | - endif | ||
| 109 | -endif # no MacOS X support yet | ||
| 110 | - else | ||
| 111 | - ifeq ($(OPENJDK_TARGET_OS), windows) | ||
| 112 | - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \ | ||
| 113 | - $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb | ||
| 114 | - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files | ||
| 115 | - $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo | ||
| 116 | - endif | ||
| 117 | - endif | ||
| 118 | endif | ||
| 119 | endif | ||
| 120 | |||