dev-lang/polyml: Fix build with libffi3

Closes: https://bugs.gentoo.org/667476
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

diff --git a/dev-lang/polyml/files/polyml-5.6-ffi3.patch b/dev-lang/polyml/files/polyml-5.6-ffi3.patch
new file mode 100644 (file)
index 0000000..bf15871
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.6-ffi3.patch
@@ -0,0 +1,18 @@
+--- a/libpolyml/polyffi.cpp    2019-04-05 23:10:23.509729312 +0200
++++ b/libpolyml/polyffi.cpp    2019-04-05 23:10:38.895485058 +0200
+@@ -89,7 +89,6 @@
+ // Unfortunately the ABI entries are enums rather than #defines so we
+ // can't test individual entries.
+ #ifdef X86_WIN32
+-    {"sysv", FFI_SYSV},
+     {"stdcall", FFI_STDCALL},
+     {"thiscall", FFI_THISCALL},
+     {"fastcall", FFI_FASTCALL},
+@@ -97,7 +96,6 @@
+ #elif defined(X86_WIN64)
+     {"win64", FFI_WIN64},
+ #elif defined(X86_ANY)
+-    {"sysv", FFI_SYSV},
+     {"unix64", FFI_UNIX64},
+ #endif
+     { "default", FFI_DEFAULT_ABI}

diff --git a/dev-lang/polyml/polyml-5.6.ebuild b/dev-lang/polyml/polyml-5.6.ebuild
index 1182c2d0766c7437f938e9fac8b42a7cb191539f..f4997ba3dd2d82d6dff67b6e502e2d1e55a2b843 100644 (file)
--- a/dev-lang/polyml/polyml-5.6.ebuild
+++ b/dev-lang/polyml/polyml-5.6.ebuild
@@ -20,7 +20,10 @@ RDEPEND="X? ( x11-libs/motif:0 )
                virtual/libffi"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-configure.patch )
+PATCHES=(
+       "${FILESDIR}"/${P}-configure.patch
+       "${FILESDIR}"/${P}-ffi3.patch
+)
 
 src_prepare() {
        default