Date: Thursday, April 9, 2020 @ 01:24:30 Author: foutrelis Revision: 612876
Fix build with libffi 3.3 Added: polyml/trunk/remove-FFI_SYSV-from-abi-table.patch Modified: polyml/trunk/PKGBUILD --------------------------------------+ PKGBUILD | 11 +++++++++-- remove-FFI_SYSV-from-abi-table.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-09 01:13:44 UTC (rev 612875) +++ PKGBUILD 2020-04-09 01:24:30 UTC (rev 612876) @@ -13,9 +13,16 @@ options=(!libtool) depends=(gmp libffi) install=polyml.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz") -sha256sums=('6bcc2c5af91f361ef9e0bb28f39ce20171b0beae73b4db3674df6fc793cec8bf') +source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz" + remove-FFI_SYSV-from-abi-table.patch) +sha256sums=('6bcc2c5af91f361ef9e0bb28f39ce20171b0beae73b4db3674df6fc793cec8bf' + 'cea28038a37c646ce7f6601443726411587bfb4ace2d6179b99ef247f6ac795b') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../remove-FFI_SYSV-from-abi-table.patch +} + build() { cd $pkgname-$pkgver Added: remove-FFI_SYSV-from-abi-table.patch =================================================================== --- remove-FFI_SYSV-from-abi-table.patch (rev 0) +++ remove-FFI_SYSV-from-abi-table.patch 2020-04-09 01:24:30 UTC (rev 612876) @@ -0,0 +1,32 @@ +From ad32de7f181acaffaba78d5c3d9e5aa6b84a741c Mon Sep 17 00:00:00 2001 +From: David Matthews <d...@prolingua.co.uk> +Date: Sun, 7 Apr 2019 13:41:33 +0100 +Subject: [PATCH] Remove FFI_SYSV from abi table for X86/64 Unix. It appears + that this has been removed in upstream versions of libffi and causes problems + when building using the system libffi. + +--- + libpolyml/polyffi.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libpolyml/polyffi.cpp b/libpolyml/polyffi.cpp +index 5424dd84..3dc9cc7c 100644 +--- a/libpolyml/polyffi.cpp ++++ b/libpolyml/polyffi.cpp +@@ -1,7 +1,7 @@ + /* + Title: New Foreign Function Interface + +- Copyright (c) 2015, 2018 David C.J. Matthews ++ Copyright (c) 2015, 2018, 2019 David C.J. Matthews + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -111,7 +111,6 @@ static struct _abiTable { const char *abiName; ffi_abi abiCode; } abiTable[] = + #elif defined(X86_WIN64) + {"win64", FFI_WIN64}, + #elif defined(X86_ANY) +- {"sysv", FFI_SYSV}, + {"unix64", FFI_UNIX64}, + #endif + { "default", FFI_DEFAULT_ABI}