diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2016-12-03 20:34:55 -0500 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-25 00:01:54 +0200 |
| commit | 15b63749183c3de4bcf077669c447bc01a7cd3c4 (patch) | |
| tree | 40def9ffe8f6d68b5b3508b1cdd88b062fab58b3 /pkgs/development/interpreters | |
| parent | 2a82be9af1a3032810052a94093e040b7a32510c (diff) | |
| download | nixlib-15b63749183c3de4bcf077669c447bc01a7cd3c4.tar nixlib-15b63749183c3de4bcf077669c447bc01a7cd3c4.tar.gz nixlib-15b63749183c3de4bcf077669c447bc01a7cd3c4.tar.bz2 nixlib-15b63749183c3de4bcf077669c447bc01a7cd3c4.tar.lz nixlib-15b63749183c3de4bcf077669c447bc01a7cd3c4.tar.xz nixlib-15b63749183c3de4bcf077669c447bc01a7cd3c4.tar.zst nixlib-15b63749183c3de4bcf077669c447bc01a7cd3c4.zip | |
spidermonkey_17: add AArch64 support patch
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/17.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix index a2ecfb2ef97a..1b6eb98b49da 100644 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { postPatch = '' # Fixes an issue with version detection under perl 5.22.x sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl + '' + stdenv.lib.optionalString stdenv.isAarch64 '' + patch -p1 -d ../.. < ${./aarch64-double-conversion.patch} ''; preConfigure = '' diff --git a/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch b/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch new file mode 100644 index 000000000000..bf41ce0a8a21 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch @@ -0,0 +1,13 @@ +diff -ru mozjs17.0.0-orig/mfbt/double-conversion/utils.h mozjs17.0.0/mfbt/double-conversion/utils.h +--- mozjs17.0.0-orig/mfbt/double-conversion/utils.h 2013-02-11 17:33:28.000000000 -0500 ++++ mozjs17.0.0/mfbt/double-conversion/utils.h 2016-12-03 20:39:07.915042988 -0500 +@@ -58,7 +58,8 @@ + defined(__mips__) || defined(__powerpc__) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ +- defined(_MIPS_ARCH_MIPS32R2) ++ defined(_MIPS_ARCH_MIPS32R2) || \ ++ defined(__AARCH64EL__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) |