tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1For 5.7 the copyright header is different.
2
3From ad32de7f181acaffaba78d5c3d9e5aa6b84a741c Mon Sep 17 00:00:00 2001
4From: David Matthews <dm@prolingua.co.uk>
5Date: Sun, 7 Apr 2019 13:41:33 +0100
6Subject: [PATCH] Remove FFI_SYSV from abi table for X86/64 Unix. It appears
7 that this has been removed in upstream versions of libffi and causes problems
8 when building using the system libffi.
9
10---
11 libpolyml/polyffi.cpp | 3 +--
12 1 file changed, 1 insertion(+), 2 deletions(-)
13
14diff --git a/libpolyml/polyffi.cpp b/libpolyml/polyffi.cpp
15index 5424dd84..3dc9cc7c 100644
16--- a/libpolyml/polyffi.cpp
17+++ b/libpolyml/polyffi.cpp
18@@ -1,7 +1,7 @@
19 /*
20 Title: New Foreign Function Interface
21
22- Copyright (c) 2015 David C.J. Matthews
23+ Copyright (c) 2015, 2019 David C.J. Matthews
24
25 This library is free software; you can redistribute it and/or
26 modify it under the terms of the GNU Lesser General Public
27@@ -109,7 +109,6 @@ static struct _abiTable { const char *abiName; ffi_abi abiCode; } abiTable[] =
28 #elif defined(X86_WIN64)
29 {"win64", FFI_WIN64},
30 #elif defined(X86_ANY)
31- {"sysv", FFI_SYSV},
32 {"unix64", FFI_UNIX64},
33 #endif
34 { "default", FFI_DEFAULT_ABI}