[gentoo-commits] repo/gentoo:master commit in: dev-lang/polyml/, dev-lang/polyml/files/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/polyml/, dev-lang/polyml/files/

[Alfredo Tupone]

commit:     890d180619f0e9262834d5d2e79f7fc0a24a394f
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  5 21:14:49 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 21:14:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=890d1806

dev-lang/polyml: Fix build with libffi3

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

 dev-lang/polyml/files/polyml-5.6-ffi3.patch | 18 ++++++++++++++++++
 dev-lang/polyml/polyml-5.6.ebuild           |  5 ++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

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
index 00000000000..bf15871d274
--- /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 1182c2d0766..f4997ba3dd2 100644
--- 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