[arch-commits] Commit in polyml/repos (4 files)

[Felix Yan]

    Date: Thursday, April 9, 2020 @ 01:26:31
  Author: felixonmars
Revision: 612878

archrelease: copy trunk to community-staging-x86_64

Added:
  polyml/repos/community-staging-x86_64/
  polyml/repos/community-staging-x86_64/PKGBUILD
    (from rev 612877, polyml/trunk/PKGBUILD)
  polyml/repos/community-staging-x86_64/polyml.install
    (from rev 612877, polyml/trunk/polyml.install)
  polyml/repos/community-staging-x86_64/remove-FFI_SYSV-from-abi-table.patch
    (from rev 612877, polyml/trunk/remove-FFI_SYSV-from-abi-table.patch)

--------------------------------------+
 PKGBUILD                             |   46 +++++++++++++++++++++++++++++++++
 polyml.install                       |    7 +++++
 remove-FFI_SYSV-from-abi-table.patch |   32 ++++++++++++++++++++++
 3 files changed, 85 insertions(+)

Copied: polyml/repos/community-staging-x86_64/PKGBUILD (from rev 612877, polyml/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-04-09 01:26:31 UTC (rev 612878)
@@ -0,0 +1,46 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Mort Yao <soi at mort.ninja>
+# Contributor: Alex Merry <dev at randomguy3.me.uk>
+
+pkgname=polyml
+pkgver=5.8
+pkgrel=2
+pkgdesc='Standard ML compiler originally written in the experimental language Poly'
+arch=(x86_64)
+url='https://polyml.org/'
+license=(LGPL)
+conflicts=('mesa-demos') # /usr/bin/poly
+options=(!libtool)
+depends=(gmp libffi)
+install=polyml.install
+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
+
+  ./configure \
+    --prefix=/usr \
+    --enable-shared \
+    --with-system-libffi \
+    --with-gmp
+  make
+}
+
+check() {
+  make -C $pkgname-$pkgver -k check
+}
+
+package() {
+  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+}
+
+# getver: polyml.org
+# vim: ts=2 sw=2 et:

Copied: polyml/repos/community-staging-x86_64/polyml.install (from rev 612877, polyml/trunk/polyml.install)
===================================================================
--- community-staging-x86_64/polyml.install	                        (rev 0)
+++ community-staging-x86_64/polyml.install	2020-04-09 01:26:31 UTC (rev 612878)
@@ -0,0 +1,7 @@
+post_upgrade() {
+  cat << EOF
+If you compile executables using Poly/ML, you should use
+the new polyc script, as this automatically passes the
+correct libraries to the linker.
+EOF
+}

Copied: polyml/repos/community-staging-x86_64/remove-FFI_SYSV-from-abi-table.patch (from rev 612877, polyml/trunk/remove-FFI_SYSV-from-abi-table.patch)
===================================================================
--- community-staging-x86_64/remove-FFI_SYSV-from-abi-table.patch	                        (rev 0)
+++ community-staging-x86_64/remove-FFI_SYSV-from-abi-table.patch	2020-04-09 01:26:31 UTC (rev 612878)
@@ -0,0 +1,32 @@
+From ad32de7f181acaffaba78d5c3d9e5aa6b84a741c Mon Sep 17 00:00:00 2001
+From: David Matthews <dm at 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}