guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 5967499f88989dba7de1e86838f52e2df8712919
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Fri Oct 23 21:06:55 2026 +0900
gnu: openjdk15: Cleanup package.
* gnu/packages/java.scm (openjdk15) [#:implicit-inputs?]: Delete.
[#:configure-flags]: Fix default value.
[native-inputs]: Delete.
* gnu/packages/java.scm (openjdk17) [#:impicit-inputs?]: Delete.
[native-inputs]: Delete.
---
gnu/packages/java.scm | 31 +++++--------------------------
1 file changed, 5 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index bbc35c4b9fa..3fedcec4e71 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1498,28 +1498,12 @@ blacklisted.certs.pem"
"openjdk-15-xcursor-no-dynamic.patch"))))
(inputs
(modify-inputs inputs
- (append libxcursor))) ;for our patch to work
+ (append libxcursor))) ;for the xcursor patch
(arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:implicit-inputs? _ #t)
- ;; This is necessary to avoid include ordering errors when adding a
- ;; lower GCC to native-inputs to avoid errors like "error: 'fesetround'
- ;; was not declared in this scope; did you mean 'setreuid'?"
- #f)
- ((#:configure-flags flags '%standard-phases)
+ (substitute-keyword-arguments arguments
+ ((#:configure-flags flags ''())
#~(cons "--without-gtest" ;this replaces...
- (delete "--disable-hotspot-gtest" #$flags))))) ;... this
- (native-inputs
- (append (modify-inputs native-inputs
- (delete "make" ;remove old gnu-make-4.2
- "openjdk") ;to remove non-jdk output
- (append `(,openjdk14 "jdk")))
- ;; On powerpc64le at least, GCC 14 cannot be used otherwise JDK 15
- ;; fails to bootstrap JDK 16, with incomprehensible errors like:
- ;; src/java.base/share/classes/java/lang/reflect/Proxy.java:1311:
- ;; error: integer number too large.
- (modify-inputs (%final-inputs)
- (replace "gcc" gcc-11))))))
+ (delete "--disable-hotspot-gtest" #$flags))))))) ;... this
(define-public openjdk16
(make-openjdk
@@ -1539,7 +1523,6 @@ blacklisted.certs.pem"
(patches (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
(arguments
(substitute-keyword-arguments arguments
- ((#:implicit-inputs? _ #t) #t) ;restore default
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
(replace 'adjust-for-bootstrap-version
@@ -1556,11 +1539,7 @@ blacklisted.certs.pem"
(lambda _
;; 'blacklisted' was renamed back to 'blocked'.
(substitute* "make/data/blockedcertsconverter/blocked.certs.pem"
- (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))
- (native-inputs
- ;; Resume using the implicit inputs, including the current GCC.
- (fold alist-delete (package-native-inputs base)
- (map first (%final-inputs))))))
+ (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))))
(define-public openjdk18
(make-openjdk openjdk17 "18.0.2.1"