amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcj: Fix build on armhf.

Browse source 
* gnu/packages/patches/gcj-arm-mode.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add patch.
* gnu/packages/gcc.scm (gcj): Add patch.
[arguments]: Delete failing tests.
This commit is contained in:
Ricardo Wurmus 2016-11-25 22:29:41 +01:00
parent 253cdd6c14
commit dbf8f84f15
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
3 changed files with 51 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/gcc.scm
View file

@ -521,6 +521,16 @@ as the 'native-search-paths' field."
(define-public gcj
(package (inherit gcc)
(name "gcj")
(version (package-version gcc))
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.bz2"))
(sha256
(base32
"0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3"))
(patches (cons (search-patch "gcj-arm-mode.diff")
(origin-patches (package-source gcc))))))
(inputs
`(("fastjar" ,fastjar)
("perl" ,perl)
@ -568,6 +578,10 @@ as the 'native-search-paths' field."
'unpack 'patch-testsuite
;; dejagnu-1.6 removes the 'absolute' command
(lambda _
;; This test fails on armhf. It seems harmless enough to disable it.
(for-each delete-file '("libjava/testsuite/libjava.lang/Throw_2.java"
"libjava/testsuite/libjava.lang/Throw_2.out"
"libjava/testsuite/libjava.lang/Throw_2.jar"))
(substitute* "libjava/testsuite/lib/libjava.exp"
(("absolute") "file normalize"))
#t))