diff options
| author | Mauricio Collares <mauricio@collares.org> | 2021-04-21 23:53:20 -0300 |
|---|---|---|
| committer | Masanori Ogino <167209+omasanori@users.noreply.github.com> | 2021-04-22 14:06:56 +0900 |
| commit | 090165d7c17f814cfe458b22026fda026888f78b (patch) | |
| tree | 07c2f224cb1b1cb12f682a6babd165e4c5d33c91 /pkgs/applications/science/math/singular | |
| parent | cd7cf5942b4e366f9058affeb90178dcc4dde858 (diff) | |
singular: disable vspace on aarch64
Diffstat (limited to 'pkgs/applications/science/math/singular')
| -rw-r--r-- | pkgs/applications/science/math/singular/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch | 15 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 9a1d631692121..695af3d17440c 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { # add aarch64 support to cpu-check.m4. copied from redhat. ./redhat-aarch64.patch + # vspace causes hangs in modstd and other libraries on aarch64 + ./disable-vspace-on-aarch64.patch + # the newest version of ax-prog-cc-for-build.m4 seems to trigger # linker errors. see # https://github.com/alsa-project/alsa-firmware/issues/3 for a diff --git a/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch b/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch new file mode 100644 index 0000000000000..3e51b7fb2cec5 --- /dev/null +++ b/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch @@ -0,0 +1,15 @@ +diff --git a/kernel/mod2.h b/kernel/mod2.h +index 867fcae47..2abd84f23 100644 +--- a/kernel/mod2.h ++++ b/kernel/mod2.h +@@ -60,8 +60,10 @@ + + /* define for parallel processes with shared memory */ + #ifndef __CCYGWIN__ ++#ifndef SI_CPU_AARCH64 + #define HAVE_VSPACE 1 + #endif ++#endif + + /*#define PROFILING*/ + #ifdef PROFILING |