ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: classpath-jamvm-wrappers: Adjust wrapper for armhf-linux.

Browse source 
This fixes building icedtea-2 on armhf-linux.

* gnu/packages/java-bootstrap.scm (classpath-jamvm-wrappers)[arguments]:
Adjust the flags passed to jamvm in the wrapper script when building for
armhf-linux.

Change-Id: I68a47b0eec761b1be9126ac814693fba7fa7e56e
This commit is contained in:
Efraim Flashner 2024-09-26 15:05:18 +03:00
parent 408a077756
commit 3171ff971c
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/java-bootstrap.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2019 Andrius Štikonas <andrius@stikonas.eu>
@ -492,10 +492,9 @@ (define classpath-jamvm-wrappers
(for-each (lambda (tool)
(with-output-to-file (string-append bin tool)
(lambda _
#$@(if (string-prefix? "armhf" (or (%current-system)
(%current-target-system)))
#$@(if (target-arm32?)
`((format #t "#!~a/bin/sh
~a/bin/jamvm -Xnocompact -classpath ~a/share/classpath/tools.zip \
~a/bin/jamvm -classpath ~a/share/classpath/tools.zip \
gnu.classpath.tools.~a.~a $@"
bash jamvm classpath tool
(if (string=? "native2ascii" tool)