[oe] [meta-java][g0hl1n/wip-jdk8u242ga][PATCH] Fix building openjre-8 242

[Richard Leitner]

On Sun, Jan 26, 2020 at 12:10:35PM +0100, Jacob Kroon wrote:
> Hi Richard,
> 
> I need something like this in order to build on my Fedora 31 host.
> I'm using master branches of bitbake, oe-core, meta-openembedded.

Ok, then please just ignore the mail I sent some minutes ago ;-)

> 
> Good thing is the crash I reported earlier seems to be fixed.

Great!

I'll do some tests on my side and give you feedback afterwards.

Is it OK for you if i rename the "fix-build.patch" to something more
meaningful?

regards;rl

> 
> Cheers,
> Jacob
> 
> Signed-off-by: Jacob Kroon <jacob.kroon at gmail.com>
> ---
>  recipes-core/openjdk/openjdk-8-release-common.inc   |  1 +
>  recipes-core/openjdk/openjre-8_242.bb               |  2 +-
>  .../openjdk/patches-openjdk-8/fix-build.patch       | 13 +++++++++++++
>  3 files changed, 15 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-core/openjdk/patches-openjdk-8/fix-build.patch
> 
> diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc
> index a8a653b..bd1b9c0 100644
> --- a/recipes-core/openjdk/openjdk-8-release-common.inc
> +++ b/recipes-core/openjdk/openjdk-8-release-common.inc
> @@ -9,6 +9,7 @@ PATCHES_URI = "\
>      file://0008-autoconf-fix-shark-build-common.patch \
>      file://0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch \
>      file://0010-autoconf-remove-shell-variables-from-autoheader.patch \
> +    file://fix-build.patch \
>      ${HOTSPOT_UB_PATCH} \
>      file://2001-jdk-comparison-between-pointer-and-integer.patch \
>      file://2002-jdk-Allow-using-a-system-installed-libjpeg.patch \
> diff --git a/recipes-core/openjdk/openjre-8_242.bb b/recipes-core/openjdk/openjre-8_242.bb
> index 4ed2e6b..2c8a6a5 100644
> --- a/recipes-core/openjdk/openjre-8_242.bb
> +++ b/recipes-core/openjdk/openjre-8_242.bb
> @@ -11,7 +11,7 @@ do_install() {
>      cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME}
>      chown -R root:root ${D}${JRE_HOME}
>      install -m644 ${WORKDIR}/jvm.cfg  ${D}${JRE_HOME}/lib/${JDK_ARCH}/
> -    find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \;
> +    [ -d ${D}${JDK_HOME} ] && find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \;
>  }
>  
>  FILES_${PN}_append = "\
> diff --git a/recipes-core/openjdk/patches-openjdk-8/fix-build.patch b/recipes-core/openjdk/patches-openjdk-8/fix-build.patch
> new file mode 100644
> index 0000000..e35d0eb
> --- /dev/null
> +++ b/recipes-core/openjdk/patches-openjdk-8/fix-build.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))
> -- 
> 2.24.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel