tjh.dev
Making spidermonkey_185 build on ARM, and so also polkit.
+16
-1
pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
+16
-1
pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
···
20
20
export LIBXUL_DIST=$out
21
21
'';
22
22
23
-
configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ];
23
+
# Explained below in configureFlags for ARM
24
+
patches = stdenv.lib.optionals stdenv.isARM [
25
+
./findvanilla.patch
26
+
];
27
+
28
+
patchFlags = "-p3";
29
+
30
+
# On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in
31
+
# "make check". Disabling tracejit makes it work, but then it needs the
32
+
# patch findvanilla.patch do disable a checker about allocator safety. In case
33
+
# of polkit, which is what matters most, it does not override the allocator
34
+
# so the failure of that test does not matter much.
35
+
configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++
36
+
stdenv.lib.optionals stdenv.isArm [
37
+
"--with-cpu-arch=armv5t"
38
+
"--disable-tracejit" ];
24
39
25
40
# hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
26
41
preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
+19
pkgs/development/interpreters/spidermonkey/findvanilla.patch
+19
pkgs/development/interpreters/spidermonkey/findvanilla.patch
···
1
+
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
2
+
index a85e055..92ef441 100644
3
+
--- a/js/src/Makefile.in
4
+
+++ b/js/src/Makefile.in
5
+
@@ -580,14 +580,6 @@ check-valgrind::
6
+
$(check-sync-dirs) $(srcdir)/build $(MOZ_SYNC_BUILD_FILES)/build
7
+
endif
8
+
9
+
-# The "find any vanilla new/new[] calls" script is tailored to Linux, so
10
+
-# only run it there. That should be enough to catch any such calls that
11
+
-# creep in.
12
+
-ifeq ($(OS_ARCH),Linux)
13
+
-check::
14
+
- $(srcdir)/config/find_vanilla_new_calls $(LIBRARY)
15
+
-endif
16
+
-
17
+
ifdef ENABLE_TRACEJIT
18
+
ifndef WINCE
19
+
JITFLAGS = ,m,j,mj,mjp,am,amj,amjp,amd