urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-24 11:24:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'philip/linux' (#3054)

Browse Source 
* origin/philip/linux:
  libsigsegv: disable stack vma check

Signed-off-by: Philip Monk <phil@pcmonk.me>
This commit is contained in:
Philip Monk 2020-06-26 11:15:31 -07:00
commit c6d536a676
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nix/nixcrpkgs/pkgs/libsigsegv/builder.sh
View File

@ -2,6 +2,21 @@ source $setup
tar -xf $src
cd libsigsegv-$version
patch -p1 << 'HEREDOC'
--- a/src/fault-linux-i386.h 2020-06-25 23:46:02.099235491 +0000
+++ b/src/fault-linux-i386.h 2020-06-25 23:45:48.679156892 +0000
@@ -18,6 +18,7 @@
#include "fault-posix-ucontext.h"
+#define HAVE_STACKVMA 0
#if defined __x86_64__
/* 64 bit registers */
HEREDOC
cd ..
mkdir build
cd build

7
nix/pkgs/urbit/default.nix
View File

@ -16,9 +16,14 @@ let
exe = ''${meta.bin} ${pkgs.lib.strings.concatStringsSep " " meta.flags}'';
};
sigseg =
pkgs.libsigsegv.overrideAttrs (oldAttrs: rec {
patches = [ ./libsigsegv_fix.patch ];
});
deps =
with pkgs;
[ curl gmp libsigsegv ncurses openssl zlib lmdb ];
[ curl gmp sigseg ncurses openssl zlib lmdb ];
vendor =
[ argon2 softfloat3 ed25519 ent ge-additions libaes_siv h2o scrypt uv murmur3 secp256k1 sni ivory-header ca-header ];

10
nix/pkgs/urbit/libsigsegv_fix.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/src/fault-linux-i386.h 2020-06-25 23:46:02.099235491 +0000
+++ b/src/fault-linux-i386.h 2020-06-25 23:45:48.679156892 +0000
@@ -18,6 +18,7 @@
#include "fault-posix-ucontext.h"
+#define HAVE_STACKVMA 0
#if defined __x86_64__
/* 64 bit registers */