diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-03-25 22:15:57 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-25 00:01:52 +0200 |
| commit | ed74fcf14b477bdf2d96fd80e514cd17c54fbdfe (patch) | |
| tree | b04fed8a134215e06df9f7a5307b0eba302e42b5 /pkgs/development/libraries/libsigsegv | |
| parent | c909f1b18e9c5deecdfe6d46c7e9901fe3e6cf83 (diff) | |
libsigsegv: Add Aarch64 patch
Diffstat (limited to 'pkgs/development/libraries/libsigsegv')
| -rw-r--r-- | pkgs/development/libraries/libsigsegv/aarch64.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/libsigsegv/default.nix | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libsigsegv/aarch64.patch b/pkgs/development/libraries/libsigsegv/aarch64.patch new file mode 100644 index 000000000000..7bb48a230cee --- /dev/null +++ b/pkgs/development/libraries/libsigsegv/aarch64.patch @@ -0,0 +1,12 @@ +diff --git a/configure b/configure +index 6c4e868..0298e19 100755 +--- a/configure ++++ b/configure +@@ -14501,6 +14501,7 @@ else + + case "$host_cpu" in + a29k | \ ++ aarch64* | \ + alpha* | \ + arc | \ + arm* | strongarm* | xscale* | \ diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index be3cbe39a302..3353fbf9e8d9 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"; }; + # Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch + # but applied directly to configure since we can't use autoreconf while bootstrapping. + patches = if stdenv.isAarch64 || stdenv.cross.arch or "" == "aarch64" + then [ ./aarch64.patch ] + else null; # TODO: change to lib.optional on next mass rebuild + # https://github.com/NixOS/nixpkgs/issues/6028 doCheck = false; |