guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/04: gnu: OpenJDK@{12, 13, 14, 15, 16}: Fix build with glibc 2.34 and


From: guix-commits
Subject: 04/04: gnu: OpenJDK@{12, 13, 14, 15, 16}: Fix build with glibc 2.34 and later.
Date: Tue, 13 Sep 2022 08:55:52 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 513091dbd2eeba138b558f5f9bb1ee6e68eee01d
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Sep 13 01:01:47 2022 +0200

    gnu: OpenJDK@{12,13,14,15,16}: Fix build with glibc 2.34 and later.
    
    * gnu/packages/java.scm (openjdk12, openjdk13, openjdk14, openjdk15,
    openjdk16)[source](patches): Add 'openjdk-10-hotspot-stack-size.patch'.
---
 gnu/packages/java.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 53216cca9d..ce6bc4fe9d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2063,6 +2063,7 @@ new Date();"))
               (sha256
                (base32
                 "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2"))
+              (patches (search-patches "openjdk-10-hotspot-stack-size.patch"))
               (modules '((guix build utils)))
               (snippet
                `(begin
@@ -2115,6 +2116,7 @@ new Date();"))
                     (url "https://github.com/openjdk/jdk13u";)
                     (commit (string-append "jdk-" version "-ga"))))
               (file-name (git-file-name name version))
+              (patches (search-patches "openjdk-10-hotspot-stack-size.patch"))
               (sha256
                (base32
                 "0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp"))
@@ -2159,6 +2161,7 @@ new Date();"))
                     (url "https://github.com/openjdk/jdk14u";)
                     (commit (string-append "jdk-" version "-ga"))))
               (file-name (git-file-name name version))
+              (patches (search-patches "openjdk-10-hotspot-stack-size.patch"))
               (sha256
                (base32
                 "07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6"))
@@ -2211,7 +2214,8 @@ new Date();"))
                (base32
                 "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i"))
               (patches
-                (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
+               (search-patches "openjdk-15-xcursor-no-dynamic.patch"
+                               "openjdk-10-hotspot-stack-size.patch"))))
     (inputs
      (cons `("libxcursor" ,libxcursor) ; for our patch to work
            (package-inputs openjdk14)))
@@ -2238,8 +2242,8 @@ new Date();"))
               (sha256
                (base32
                 "1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f"))
-              (patches
-                (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
+              (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch"
+                                       
"openjdk-10-hotspot-stack-size.patch"))))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("openjdk15:jdk" ,openjdk15 "jdk")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]