I'm trying to get icedtea-6 to build on the core-updates-frozen branch. I fixed a few C/C++ related issues, but then I get this error:
--8<---------------cut here---------------start------------->8--- Preload failed: checksum of class list was incorrect. make: *** [Makefile:2746: stamps/add-archive-ecj.stamp] Error 1 --8<---------------cut here---------------end--------------->8--- Does someone know how to solve that? Here's the patch I'm using to get to this point:
From 6767793eccffea3bfddca5c4a0c0cff21abb965b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant <g...@posteo.net> Date: Mon, 13 Sep 2021 14:37:40 +0200 Subject: [PATCH] WIP: gnu: icedtea-6: Fix build. * gnu/packages/java.scm (icedtea-6)[arguments]: Add 'fix-openjdk' phase. --- gnu/packages/java.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 51fc5c60a1..374a9d9cba 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Vincent Legoll <vincent.leg...@gmail.com> ;;; Copyright © 2021 Mike Gerwitz <m...@gnu.org> ;;; Copyright © 2021 Pierre Langlois <pierre.langl...@gmx.com> +;;; Copyright © 2021 Guillaume Le Vaillant <g...@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -907,6 +908,19 @@ machine."))) "patches/hotspot/hs23/drop_unlicensed_test.patch") (("#!/bin/sh") (string-append "#!" (which "sh")))) #t)) + (add-after 'unpack 'fix-openjdk + (lambda _ + (substitute* "openjdk/jdk/make/common/Defs-linux.gmk" + (("CFLAGS_COMMON = -fno-strict-aliasing" all) + (string-append all " -fcommon"))) + (substitute* "openjdk/hotspot/src/share/vm/code/relocInfo.hpp" + (("inline friend relocInfo prefix_relocInfo\\(int datalen = 0\\);") + "inline friend relocInfo prefix_relocInfo(int datalen);")) + (substitute* + '("openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c" + "openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c") + (("#include <sys/sysctl.h>") + "#include <linux/sysctl.h>")))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) ;; buildtree.make generates shell scripts, so we need to replace -- 2.33.0
signature.asc
Description: PGP signature