guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 99c1e2c5400c2a58cb0ec17c8269da20b81a26fa
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Tue Feb 17 10:05:23 2026 +0900
gnu: jamvm: Fix build on powerpc64.
* gnu/packages/java-bootstrap.scm (jamvm)
[#:modules]: New argument.
[#:configure-flags]: Preserve existing configure flags such as --enable-ffi.
[inputs]: Add libffi.
Relates-to: https://issues.guix.gnu.org/79270
Change-Id: Ie02fd3330b0dd11a794b1549319323b2efcd7177
---
gnu/packages/java-bootstrap.scm | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/java-bootstrap.scm b/gnu/packages/java-bootstrap.scm
index 7a6251611e..f04b1c70d7 100644
--- a/gnu/packages/java-bootstrap.scm
+++ b/gnu/packages/java-bootstrap.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2019 Andrius Štikonas <[email protected]>
;;; Copyright © 2020 Simon South <[email protected]>
;;; Copyright © 2021 Guillaume Le Vaillant <[email protected]>
+;;; Copyright © 2026 Maxim Cournoyer <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -588,7 +589,8 @@ machine.")))
jamvm-1-bootstrap)))))
(define jamvm
- (package (inherit jamvm-1-bootstrap)
+ (package
+ (inherit jamvm-1-bootstrap)
(version "2.0.0")
(source (origin
(method url-fetch)
@@ -608,14 +610,16 @@ machine.")))
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments jamvm-1-bootstrap)
- ((#:configure-flags _)
- '(list (string-append "--with-classpath-install-dir="
- (assoc-ref %build-inputs "classpath"))))))
- (inputs
- `(("classpath" ,classpath-devel)
- ("ecj-javac-wrapper" ,ecj-javac-wrapper)
- ("zip" ,zip)
- ("zlib" ,zlib)))))
+ ((#:modules modules %default-gnu-modules)
+ (append '((srfi srfi-1)
+ (srfi srfi-26))
+ modules))
+ ((#:configure-flags flags)
+ #~(cons (string-append "--with-classpath-install-dir="
+ (assoc-ref %build-inputs "classpath"))
+ (remove (cut string-prefix? "--with-classpath-install-dir" <>)
+ #$flags)))))
+ (inputs (list classpath-devel ecj-javac-wrapper libffi zip zlib))))
(define ecj-javac-wrapper-final
(package (inherit ecj-javac-wrapper)
