CVS commit: pkgsrc/lang/ecl

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri May 22 01:18:33 UTC 2020

Modified Files:
        pkgsrc/lang/ecl: distinfo
Added Files:
        pkgsrc/lang/ecl/patches: patch-src_c_ffi.d

Log Message:
Fix build with newer libffi


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/ecl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ecl/patches/patch-src_c_ffi.d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ecl/distinfo
diff -u pkgsrc/lang/ecl/distinfo:1.20 pkgsrc/lang/ecl/distinfo:1.21
--- pkgsrc/lang/ecl/distinfo:1.20       Fri Mar  1 13:30:52 2019
+++ pkgsrc/lang/ecl/distinfo    Fri May 22 01:18:33 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.20 2019/03/01 13:30:52 leot Exp $
+$NetBSD: distinfo,v 1.21 2020/05/22 01:18:33 joerg Exp $
 
 SHA1 (ecl-16.1.3.tgz) = a0db6c435dcc33404b0a2a4a402e1f2edc169e95
 RMD160 (ecl-16.1.3.tgz) = 320e93e4abe62fa1fe9e36688ba040eef8ae8923
 SHA512 (ecl-16.1.3.tgz) = 5d743f422f6bc24671abf4c739cde8273d08f056906a1ef8aed5145c703b6d52c7fa4b5e0be8c125f32240c20ce053007786bb3ae81cc34d47791f6fae0819c1
 Size (ecl-16.1.3.tgz) = 7459212 bytes
+SHA1 (patch-src_c_ffi.d) = ae94ffc5b3ad70890b9d4f71d9c84a39f5526059

Added files:

Index: pkgsrc/lang/ecl/patches/patch-src_c_ffi.d
diff -u /dev/null pkgsrc/lang/ecl/patches/patch-src_c_ffi.d:1.1
--- /dev/null   Fri May 22 01:18:34 2020
+++ pkgsrc/lang/ecl/patches/patch-src_c_ffi.d   Fri May 22 01:18:33 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_c_ffi.d,v 1.1 2020/05/22 01:18:33 joerg Exp $
+
+Match what libffi actually provides.
+
+--- src/c/ffi.d.orig   2020-05-22 00:18:58.780386592 +0000
++++ src/c/ffi.d
+@@ -132,7 +132,10 @@ static struct {
+   {@':stdcall', FFI_STDCALL},
+ #elif defined(X86_WIN64)
+   {@':win64', FFI_WIN64},
+-#elif defined(X86_ANY) || defined(X86) || defined(X86_64)
++#elif defined(X86_64) || (defined (__x86_64__) && defined (X86_DARWIN))
++  {@':cdecl', FFI_UNIX64},
++  {@':unix64', FFI_UNIX64},
++#elif defined(X86_ANY) || defined(X86)
+   {@':cdecl', FFI_SYSV},
+   {@':sysv', FFI_SYSV},
+   {@':unix64', FFI_UNIX64},