diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-01-27 06:51:27 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-01-27 15:46:28 +0100 |
commit | 7752e9f862667bb5a72345a788d35ccb1eb7fb85 (patch) | |
tree | 398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/openjdk-8-release-common.inc | |
parent | 412ed460733c6069dcfc5bc1bb3f2803e14185f8 (diff) | |
download | meta-java-7752e9f862667bb5a72345a788d35ccb1eb7fb85.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>
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-release-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-common.inc | 6 |
1 files changed, 6 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 | " |
22 | HOTSPOT_UB_PATCH = "\ | 23 | HOTSPOT_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 | |||
75 | PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch" | 76 | PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch" |
76 | PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch" | 77 | PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch" |
77 | 78 | ||
79 | # remove aarch32 & aarch64 mainlined patches | ||
80 | PATCHES_URI_remove_armv7a = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" | ||
81 | PATCHES_URI_remove_armv7ve = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" | ||
82 | PATCHES_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 |
79 | BUILD_DIR = "openjdk.build" | 85 | BUILD_DIR = "openjdk.build" |
80 | BUILD_DIR_ECJ = "openjdk.build-ecj" | 86 | BUILD_DIR_ECJ = "openjdk.build-ecj" |