diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-09-19 20:03:20 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-09-19 20:05:38 +0100 |
| commit | 62dc18c5bca16e41f84a61e5f32b8caad7c82cdf (patch) | |
| tree | b7db47fcc4a8334eb80970d81d9865f7b688ab3b /pkgs/development/libraries/libffi | |
| parent | 5fa64c31c54969a1e759fb5d2b64a659994e65a0 (diff) | |
libffi: 3.4.2 -> 3.4.3
Mostly bug fixes and new architectures support. While at it dropped upstream libffi-powerpc64.patch. Changes: https://github.com/libffi/libffi/releases/tag/v3.4.3
Diffstat (limited to 'pkgs/development/libraries/libffi')
| -rw-r--r-- | pkgs/development/libraries/libffi/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/libffi/libffi-powerpc64.patch | 23 |
2 files changed, 2 insertions, 26 deletions
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 4c3e00150abf3..2904e6e45671a 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libffi"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { url = "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "081nx7wpzds168jbr59m34n6s3lyiq6r8zggvqxvlslsc4hvf3sl"; + sha256 = "sha256-RBbdkrauj8tbEEIecRxNPLMSA9d1Iad9hdAQIxHmw7g="; }; # Note: this package is used for bootstrapping fetchurl, and thus @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { # cgit) that are needed here should be included directly in Nixpkgs as # files. patches = [ - ./libffi-powerpc64.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/libffi/libffi-powerpc64.patch b/pkgs/development/libraries/libffi/libffi-powerpc64.patch deleted file mode 100644 index 5748ac0849829..0000000000000 --- a/pkgs/development/libraries/libffi/libffi-powerpc64.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/libffi/libffi/issues/668 ---- a/src/powerpc/linux64.S -+++ b/src/powerpc/linux64.S -@@ -29,6 +29,8 @@ - #include <fficonfig.h> - #include <ffi.h> - -+ .machine altivec -+ - #ifdef POWERPC64 - .hidden ffi_call_LINUX64 - .globl ffi_call_LINUX64 ---- a/src/powerpc/linux64_closure.S -+++ b/src/powerpc/linux64_closure.S -@@ -30,6 +30,8 @@ - - .file "linux64_closure.S" - -+ .machine altivec -+ - #ifdef POWERPC64 - FFI_HIDDEN (ffi_closure_LINUX64) - .globl ffi_closure_LINUX64 |