From c463d7ac916d86c4afd50dc5aecf645ff2deeb14 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 13 Sep 2022 00:59:31 +0200 Subject: gnu: OpenJDK@10: Fix build with newer toolchains. * gnu/packages/java.scm (openjdk10)[source](patches): Add two patches. [source](snippet): While here, simplify. * gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch, gnu/packages/patches/openjdk-10-hotspot-stack-size.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/packages/java.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fda361a4a6d..53216cca9d2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1729,12 +1729,12 @@ new Date();")) (base32 "0zywq2203b4hx4jms9vbwvjcj1d3k2v3qpx4s33729fkpmid97r4")) (patches (search-patches - "openjdk-10-idlj-reproducibility.patch")) + "openjdk-10-idlj-reproducibility.patch" + "openjdk-10-hotspot-pointer-comparison.patch" + "openjdk-10-hotspot-stack-size.patch")) (modules '((guix build utils))) (snippet - `(begin - (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) - #t)))) + '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$"))))) (arguments (substitute-keyword-arguments (package-arguments openjdk9) ((#:phases phases) -- cgit v1.3