summaryrefslogtreecommitdiff
path: root/gnu/packages/gnuzilla.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2017-03-27 13:28:33 +0300
committerEfraim Flashner <efraim@flashner.co.il>2017-03-28 09:34:44 +0300
commit26f38d313bd4ccece05610f762612daa0746dd44 (patch)
treeb9a4c5519b393885c6cf2e6b625b53655dd61c2e /gnu/packages/gnuzilla.scm
parentb4f67b7ebb44fa0a6c8abeb4d6fc3bb2ac2de329 (diff)
gnu: mozjs@24: Add aarch64-support.
* gnu/packages/gnuzilla.scm (mozjs@24)[source]: Add patch. [arguments]: Add flag for building on aarch64-linux, delete failing test. * gnu/packages/patches/mozjs24-aarch64-support.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
-rw-r--r--gnu/packages/gnuzilla.scm12
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 97fddc2a84..5c892f197a 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -117,16 +117,20 @@ in C/C++.")
(base32
"1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6"))
(modules '((guix build utils)))
+ (patches (search-patches "mozjs24-aarch64-support.patch"))
(snippet
;; Fix incompatibility with Perl 5.22+.
'(substitute* '("js/src/config/milestone.pl")
(("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")))))
(arguments
- '(;; XXX: parallel build fails, lacking:
+ `(;; XXX: parallel build fails, lacking:
;; mkdir -p "system_wrapper_js/"
#:parallel-build? #f
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'delete-timedout-test
+ ;; This test times out on slower hardware
+ (lambda _ (delete-file "js/src/jit-test/tests/basic/bug698584.js")))
(replace
'configure
(lambda* (#:key outputs #:allow-other-keys)
@@ -139,7 +143,11 @@ in C/C++.")
(string-append "--prefix=" out)
"--with-system-nspr"
"--enable-system-ffi"
- "--enable-threadsafe"))))))))
+ "--enable-threadsafe"
+ ,@(if (string=? "aarch64-linux"
+ (%current-system))
+ '("--host=aarch64-unknown-linux-gnu")
+ '())))))))))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)