me
/
guix
Archived
1
0
Fork 0
Code

gnu: openjdk: Arrange patches. 

* gnu/packages/java.scm (openjdk13): Remove patch
openjdk-10-hotspot-stack-size.patch inherited from openjdk12.
(openjdk14): Readd patch.
(openjdk15): Remove patch.
(openjdk16): Readd patch.
(openjdk17): Remove patch.
master
Andreas Enge 2023-02-18 11:45:28 +01:00
parent ad4e7e05ec
commit 0825162a35
No known key found for this signature in database
GPG Key ID: F7D5C9BF765C61E3
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/java.scm
View File

@ -1449,7 +1449,10 @@ blacklisted.certs.pem"
(define-public openjdk13 (define-public openjdk13
(make-openjdk openjdk12 "13.0.13" (make-openjdk openjdk12 "13.0.13"
"0pxf4dlig61k0pg7amg4mi919hzam7nzwckry01avgq1wj8ambji")) "0pxf4dlig61k0pg7amg4mi919hzam7nzwckry01avgq1wj8ambji"
(source (origin
(inherit (package-source base))
(patches '())))))
(define-public openjdk14 (define-public openjdk14
(make-openjdk (make-openjdk
@ -1457,6 +1460,8 @@ blacklisted.certs.pem"
"07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6" "07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6"
(source (origin (source (origin
(inherit (package-source base)) (inherit (package-source base))
(patches
(search-patches "openjdk-10-hotspot-stack-size.patch"))
(snippet ;override snippet (snippet ;override snippet
'(begin '(begin
;; The m4 macro uses 'help' to search for builtins, which is ;; The m4 macro uses 'help' to search for builtins, which is
@ -1474,8 +1479,7 @@ blacklisted.certs.pem"
(modules '()) (modules '())
(snippet #f) (snippet #f)
(patches (patches
(append (search-patches "openjdk-15-xcursor-no-dynamic.patch") (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
(origin-patches (package-source base))))))
(inputs (inputs
(modify-inputs (package-inputs base) (modify-inputs (package-inputs base)
(append libxcursor))) ;for our patch to work (append libxcursor))) ;for our patch to work
@ -1487,12 +1491,19 @@ blacklisted.certs.pem"
(define-public openjdk16 (define-public openjdk16
(make-openjdk openjdk15 "16.0.2" (make-openjdk openjdk15 "16.0.2"
"0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz")) "0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz"
(source (origin
(inherit (package-source base))
(patches
(search-patches "openjdk-10-hotspot-stack-size.patch"))))))
(define-public openjdk17 (define-public openjdk17
(make-openjdk (make-openjdk
openjdk16 "17.0.5" openjdk16 "17.0.5"
"1asnysg6kxdkrmb88y6qihdr12ljsyxv0mg6hlcs7cwxgsdlqkfs" "1asnysg6kxdkrmb88y6qihdr12ljsyxv0mg6hlcs7cwxgsdlqkfs"
(source (origin
(inherit (package-source base))
(patches '())))
(arguments (arguments
(substitute-keyword-arguments (package-arguments openjdk16) (substitute-keyword-arguments (package-arguments openjdk16)
((#:phases phases) ((#:phases phases)