aboutsummaryrefslogtreecommitdiffstats
path: root/main/libffi
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2015-07-20 12:50:17 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2015-07-20 12:50:17 +0000
commit81070afb94cd7454dd87cadfb0d0faed7e556de8 (patch)
tree30baa1808c0cf43fb38bcc00ab53689c9b8999d1 /main/libffi
parent22306dd8b975a07820c207fb80d20ee431350b0d (diff)
downloadaports-81070afb94cd7454dd87cadfb0d0faed7e556de8.tar.bz2
aports-81070afb94cd7454dd87cadfb0d0faed7e556de8.tar.xz
main/libffi: added patch which fixes #4275
Diffstat (limited to 'main/libffi')
-rw-r--r--main/libffi/APKBUILD14
-rw-r--r--main/libffi/gnu-linux-define.patch13
2 files changed, 22 insertions, 5 deletions
diff --git a/main/libffi/APKBUILD b/main/libffi/APKBUILD
index 8dd24e49a5..81fd19517f 100644
--- a/main/libffi/APKBUILD
+++ b/main/libffi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libffi
pkgver=3.2.1
-pkgrel=0
+pkgrel=1
pkgdesc="A portable, high level programming interface to various calling conventions."
url="http://sourceware.org/libffi"
arch="all"
@@ -10,7 +10,8 @@ depends=
makedepends="texinfo"
install=
subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.gz"
+source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
+ gnu-linux-define.patch"
_builddir="$srcdir"/$pkgname-$pkgver
build () {
@@ -31,6 +32,9 @@ package() {
install -m755 -d ""$pkgdir"/usr/share/licenses/$pkgname"
install -m644 LICENSE ""$pkgdir"/usr/share/licenses/$pkgname/" || return 1
}
-md5sums="83b89587607e3eb65c70d361f13bab43 libffi-3.2.1.tar.gz"
-sha256sums="d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 libffi-3.2.1.tar.gz"
-sha512sums="980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 libffi-3.2.1.tar.gz"
+md5sums="83b89587607e3eb65c70d361f13bab43 libffi-3.2.1.tar.gz
+1e89123c6ba2f75706df876697f9ae2e gnu-linux-define.patch"
+sha256sums="d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 libffi-3.2.1.tar.gz
+1c0cc06272bd65a23efb98a3627d11639a84e0f1cbe7c399e0a7584e2693e09d gnu-linux-define.patch"
+sha512sums="980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 libffi-3.2.1.tar.gz
+1e32f6e81a6308387743505aad2d58a109cab30ce11261cb21e7aa941587b01e0efad0eac22dbbe9a37d05c1c50a11bf4564b8affaccf6385b9e968a167b783f gnu-linux-define.patch"
diff --git a/main/libffi/gnu-linux-define.patch b/main/libffi/gnu-linux-define.patch
new file mode 100644
index 0000000000..483be78e35
--- /dev/null
+++ b/main/libffi/gnu-linux-define.patch
@@ -0,0 +1,13 @@
+diff --git a/closures.c.orig b/closures.c
+index 721ff00..22a699c 100644
+--- a/closures.c.orig
++++ b/closures.c
+@@ -34,7 +34,7 @@
+ #include <ffi_common.h>
+
+ #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
+-# if __gnu_linux__ && !defined(__ANDROID__)
++# if __linux__ && !defined(__ANDROID__)
+ /* This macro indicates it may be forbidden to map anonymous memory
+ with both write and execute permission. Code compiled when this
+ option is defined will attempt to map such pages once, but if it