tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: jamvm: Fix build on powerpc64.

Browse Source 
* 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
This commit is contained in:
Maxim Cournoyer
2026-02-17 10:05:23 +09:00
parent c6a4533f30
commit 99c1e2c540
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/java-bootstrap.scm
View File

@@ -9,6 +9,7 @@
;;; Copyright © 2019 Andrius Štikonas <andrius@stikonas.eu>
;;; Copyright © 2020 Simon South <simon@simonsouth.net>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2026 Maxim Cournoyer <maxim@guixotic.coop>
;;;
;;; 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)