aboutsummaryrefslogtreecommitdiffstats
path: root/main/libffi
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-01-12 20:41:12 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2016-01-12 20:44:42 +0100
commitd836f6e8fb1d5165bf70839a7c953a56568848d7 (patch)
treee410209102f2b9de370878dda756fbcfa0a7446a /main/libffi
parentc0fde8677310bd3478c6887ab15b173446c367aa (diff)
downloadaports-d836f6e8fb1d5165bf70839a7c953a56568848d7.tar.bz2
aports-d836f6e8fb1d5165bf70839a7c953a56568848d7.tar.xz
main/libff: actually apply the fix for #4275
Diffstat (limited to 'main/libffi')
-rw-r--r--main/libffi/APKBUILD20
-rw-r--r--main/libffi/gnu-linux-define.patch6
2 files changed, 19 insertions, 7 deletions
diff --git a/main/libffi/APKBUILD b/main/libffi/APKBUILD
index 4f3fea4310..6064f7cdfd 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=1
+pkgrel=2
pkgdesc="A portable, high level programming interface to various calling conventions."
url="http://sourceware.org/libffi"
arch="all"
@@ -11,9 +11,19 @@ makedepends="texinfo"
install=
subpackages="$pkgname-dev $pkgname-doc"
source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
- gnu-linux-define.patch"
+ gnu-linux-define.patch
+ "
_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
+}
+
build () {
cd "$_builddir"
./configure \
@@ -32,8 +42,8 @@ package() {
install -m644 LICENSE ""$pkgdir"/usr/share/licenses/$pkgname/" || return 1
}
md5sums="83b89587607e3eb65c70d361f13bab43 libffi-3.2.1.tar.gz
-1e89123c6ba2f75706df876697f9ae2e gnu-linux-define.patch"
+b0eb843f9e54403066f476f762149be5 gnu-linux-define.patch"
sha256sums="d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 libffi-3.2.1.tar.gz
-1c0cc06272bd65a23efb98a3627d11639a84e0f1cbe7c399e0a7584e2693e09d gnu-linux-define.patch"
+28cb523fb8d3ece0c34ad161e3c91c1b025fde0c6b62adf4966047f2abf7d670 gnu-linux-define.patch"
sha512sums="980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 libffi-3.2.1.tar.gz
-1e32f6e81a6308387743505aad2d58a109cab30ce11261cb21e7aa941587b01e0efad0eac22dbbe9a37d05c1c50a11bf4564b8affaccf6385b9e968a167b783f gnu-linux-define.patch"
+264af568ae5388d50f647f891a406945c73cc358692266f65ad341787c0bf5f6bf31203b86c39fa1b338101c1a6d2f4fec60f95a90d379951ff5153f8f9e178f gnu-linux-define.patch"
diff --git a/main/libffi/gnu-linux-define.patch b/main/libffi/gnu-linux-define.patch
index 483be78e35..8dcae738ba 100644
--- a/main/libffi/gnu-linux-define.patch
+++ b/main/libffi/gnu-linux-define.patch
@@ -1,7 +1,9 @@
+http://bugs.alpinelinux.org/issues/4275
+
diff --git a/closures.c.orig b/closures.c
index 721ff00..22a699c 100644
---- a/closures.c.orig
-+++ b/closures.c
+--- a/src/closures.c.orig
++++ b/src/closures.c
@@ -34,7 +34,7 @@
#include <ffi_common.h>