CVS commit: pkgsrc/lang/polyml

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Thu Aug 13 23:49:20 UTC 2020

Modified Files:
        pkgsrc/lang/polyml: distinfo
Added Files:
        pkgsrc/lang/polyml/patches: patch-libpolyml_polyffi.cpp

Log Message:
Fix broken build on NetBSD amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/polyml/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/polyml/patches/patch-libpolyml_polyffi.cpp

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

Modified files:

Index: pkgsrc/lang/polyml/distinfo
diff -u pkgsrc/lang/polyml/distinfo:1.14 pkgsrc/lang/polyml/distinfo:1.15
--- pkgsrc/lang/polyml/distinfo:1.14    Thu May  2 18:24:58 2019
+++ pkgsrc/lang/polyml/distinfo Thu Aug 13 23:49:20 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2019/05/02 18:24:58 alnsn Exp $
+$NetBSD: distinfo,v 1.15 2020/08/13 23:49:20 dholland Exp $
 
 SHA1 (polyml-5.7.1.tar.gz) = 454d3827263f514004a2465a2db0cd64ebe6e561
 RMD160 (polyml-5.7.1.tar.gz) = cc0061f191783c4749ef08fee33db4c3a2a269c6
@@ -7,4 +7,5 @@ Size (polyml-5.7.1.tar.gz) = 7218131 byt
 SHA1 (patch-configure) = 3df85bb0adac4bfd68fffa32c41944f21eaf8c40
 SHA1 (patch-configure.ac) = 63817ba1fd42bae03da67f74b5b97dda32b02118
 SHA1 (patch-libpolyml_elfexport.cpp) = 3dfde6483eca0778504265a8e92cad8ef86d72d3
+SHA1 (patch-libpolyml_polyffi.cpp) = 2a0ae4ce0e0d1238e79c629b27d4fc4e5363e1c7
 SHA1 (patch-modules_IntInfAsInt_Makefile.in) = f29e43ce8b832abdef73dce1d50a3b3e4db821ba

Added files:

Index: pkgsrc/lang/polyml/patches/patch-libpolyml_polyffi.cpp
diff -u /dev/null pkgsrc/lang/polyml/patches/patch-libpolyml_polyffi.cpp:1.1
--- /dev/null   Thu Aug 13 23:49:20 2020
+++ pkgsrc/lang/polyml/patches/patch-libpolyml_polyffi.cpp      Thu Aug 13 23:49:20 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-libpolyml_polyffi.cpp,v 1.1 2020/08/13 23:49:20 dholland Exp $
+
+Fix build failure on amd64 with current libffi.
+
+--- libpolyml/polyffi.cpp~     2017-11-18 13:45:15.000000000 +0000
++++ libpolyml/polyffi.cpp
+@@ -109,7 +109,9 @@ static struct _abiTable { const char *ab
+ #elif defined(X86_WIN64)
+     {"win64", FFI_WIN64},
+ #elif defined(X86_ANY)
++#if !defined(X86_64)
+     {"sysv", FFI_SYSV},
++#endif
+     {"unix64", FFI_UNIX64},
+ #endif
+     { "default", FFI_DEFAULT_ABI}