diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-04-07 16:07:31 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-04-07 19:23:29 +0000 |
| commit | 7d2f3b126580e4f6e12e82c2ee2431e9fb2757cf (patch) | |
| tree | fdec51cbb5c8d4e9fcc556265c4cc0a3ac6a89d5 /testing/polyml | |
| parent | 0c3cd9977d6fa8444649cfe9469d3cea88fe2301 (diff) | |
| download | aports-7d2f3b126580e4f6e12e82c2ee2431e9fb2757cf.tar.bz2 aports-7d2f3b126580e4f6e12e82c2ee2431e9fb2757cf.tar.xz | |
testing/polyml: fix build with libff>=3.3-r0
Diffstat (limited to 'testing/polyml')
| -rw-r--r-- | testing/polyml/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/polyml/fix-build-libffi-3.3.patch | 19 |
2 files changed, 25 insertions, 11 deletions
diff --git a/testing/polyml/APKBUILD b/testing/polyml/APKBUILD index 7721ba191b..eef15e8bd4 100644 --- a/testing/polyml/APKBUILD +++ b/testing/polyml/APKBUILD @@ -7,13 +7,11 @@ pkgdesc="ML97 compatible Standard ML implementation" url="https://www.polyml.org/" arch="all !aarch64 !ppc64le !s390x" license="LGPL-2.1-only" -depends="" -depends_dev="" -makedepends="$depends_dev gmp-dev libffi-dev" -install="" +makedepends="gmp-dev libffi-dev" subpackages="$pkgname-dev $pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/polyml/polyml/archive/v$pkgver.tar.gz + fix-build-libffi-3.3.patch + " # FIXME: https://github.com/polyml/polyml/issues/110 case "$CARCH" in @@ -21,8 +19,6 @@ armhf|armv7) options="!check" ;; esac build() { - cd "$builddir" - # Compiling poly as a dynamically linked position independent # executable causes it to segfault. Since Alpine's GCC enables # PIE by default we need to explicitly disable it. @@ -39,13 +35,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="50baed79b50b14bd87acc637de93fd6d0f05e61fe0f03682a12a1d2c5f382313488d48f84b49ad915b01acc5a3a5769fb05fcaa7b24499c56402ddd3ba393930 polyml-5.8.tar.gz" +sha512sums="50baed79b50b14bd87acc637de93fd6d0f05e61fe0f03682a12a1d2c5f382313488d48f84b49ad915b01acc5a3a5769fb05fcaa7b24499c56402ddd3ba393930 polyml-5.8.tar.gz +40dbacbf573d63ed8eb75365c2bef2d54887d819321379b08b8dac9f526d2d3323bf2627964e65af273160d16129bf16e6dc389d47f653022882d28b7f98a0fe fix-build-libffi-3.3.patch" diff --git a/testing/polyml/fix-build-libffi-3.3.patch b/testing/polyml/fix-build-libffi-3.3.patch new file mode 100644 index 0000000000..56b957bcf5 --- /dev/null +++ b/testing/polyml/fix-build-libffi-3.3.patch @@ -0,0 +1,19 @@ +--- 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} + |