From 7752e9f862667bb5a72345a788d35ccb1eb7fb85 Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Mon, 27 Jan 2020 06:51:27 +0100 Subject: openjdk-8: fix jdk linking for non aarch architectures Based on a patch by Jacob Kroon and the aarch32 upstream solution. Signed-off-by: Richard Leitner Cc: Jacob Kroon --- recipes-core/openjdk/openjdk-8-release-common.inc | 6 ++++++ ...-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 recipes-core/openjdk/patches-openjdk-8/2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch (limited to 'recipes-core/openjdk') 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 = "\ file://2006-jdk-disable-backtrace-musl-build-fix.patch \ file://2007-jdk-no-genx11-in-headless.patch \ file://2008-jdk-no-unused-deps.patch \ + file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch \ " HOTSPOT_UB_PATCH = "\ 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 PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch" PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch" +# remove aarch32 & aarch64 mainlined patches +PATCHES_URI_remove_armv7a = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" +PATCHES_URI_remove_armv7ve = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" +PATCHES_URI_remove_aarch64 = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch" + # Name of the directory containing the compiled output BUILD_DIR = "openjdk.build" BUILD_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 @@ +Index: jdk8u-jdk8u242-ga/jdk/make/gensrc/GensrcMisc.gmk +=================================================================== +--- jdk8u-jdk8u242-ga.orig/jdk/make/gensrc/GensrcMisc.gmk ++++ jdk8u-jdk8u242-ga/jdk/make/gensrc/GensrcMisc.gmk +@@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation,BUI + INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \ + LANG := C, \ + CC := $(BUILD_CC), \ +- LDEXE := $(BUILD_LD), \ ++ LDEXE := $(BUILD_CC), \ + OBJECT_DIR := $(GENSRC_SOR_BIN), \ + OUTPUT_DIR := $(GENSRC_SOR_BIN), \ + PROGRAM := genSocketOptionRegistry)) -- cgit v1.2.3-54-g00ecf