summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-01-27 05:51:27 (GMT)
committerRichard Leitner <richard.leitner@skidata.com>2020-01-27 14:46:28 (GMT)
commit7752e9f862667bb5a72345a788d35ccb1eb7fb85 (patch)
tree398a12e3addb7470622d4cb2f98e7ad2dda02c5c
parent412ed460733c6069dcfc5bc1bb3f2803e14185f8 (diff)
downloadmeta-java-g0hl1n/wip-jdk8u242ga.tar.gz
openjdk-8: fix jdk linking for non aarch architecturesg0hl1n/wip-jdk8u242ga
Based on a patch by Jacob Kroon and the aarch32 upstream solution. Signed-off-by: Richard Leitner <richard.leitner@skidata.com> Cc: Jacob Kroon <jacob.kroon@gmail.com>
-rw-r--r--recipes-core/openjdk/openjdk-8-release-common.inc6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch13
2 files changed, 19 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc
index a8a653b..bd3092f 100644
--- a/recipes-core/openjdk/openjdk-8-release-common.inc
+++ b/recipes-core/openjdk/openjdk-8-release-common.inc
@@ -18,6 +18,7 @@ PATCHES_URI = "\
18 file://2006-jdk-disable-backtrace-musl-build-fix.patch \ 18 file://2006-jdk-disable-backtrace-musl-build-fix.patch \
19 file://2007-jdk-no-genx11-in-headless.patch \ 19 file://2007-jdk-no-genx11-in-headless.patch \
20 file://2008-jdk-no-unused-deps.patch \ 20 file://2008-jdk-no-unused-deps.patch \
21 file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch \
21" 22"
22HOTSPOT_UB_PATCH = "\ 23HOTSPOT_UB_PATCH = "\
23 file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \ 24 file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \
@@ -75,6 +76,11 @@ PATCHES_URI_append_libc-musl_armv7a = " file://aarch32-hotspot-remaining-musl-fi
75PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch" 76PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch"
76PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch" 77PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch"
77 78
79# remove aarch32 & aarch64 mainlined patches
80PATCHES_URI_remove_armv7a = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch"
81PATCHES_URI_remove_armv7ve = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch"
82PATCHES_URI_remove_aarch64 = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch"
83
78# Name of the directory containing the compiled output 84# Name of the directory containing the compiled output
79BUILD_DIR = "openjdk.build" 85BUILD_DIR = "openjdk.build"
80BUILD_DIR_ECJ = "openjdk.build-ecj" 86BUILD_DIR_ECJ = "openjdk.build-ecj"
diff --git a/recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch
new file mode 100644
index 0000000..e35d0eb
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch
@@ -0,0 +1,13 @@
1Index: jdk8u-jdk8u242-ga/jdk/make/gensrc/GensrcMisc.gmk
2===================================================================
3--- jdk8u-jdk8u242-ga.orig/jdk/make/gensrc/GensrcMisc.gmk
4+++ jdk8u-jdk8u242-ga/jdk/make/gensrc/GensrcMisc.gmk
5@@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation,BUI
6 INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
7 LANG := C, \
8 CC := $(BUILD_CC), \
9- LDEXE := $(BUILD_LD), \
10+ LDEXE := $(BUILD_CC), \
11 OBJECT_DIR := $(GENSRC_SOR_BIN), \
12 OUTPUT_DIR := $(GENSRC_SOR_BIN), \
13 PROGRAM := genSocketOptionRegistry))