diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-21 04:06:16 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-21 04:06:16 +0000 |
| commit | 000001015cbeaabdc2e0f70899a6b810996f98cc (patch) | |
| tree | 6b60a6c85f79811e19dc15e1930872b0c4c74d7b /core/libffi | |
| parent | 2fd06aa8fa3c105c4c9161a060192d85dc3d4559 (diff) | |
Sat Jun 21 04:02:26 UTC 2014
Diffstat (limited to 'core/libffi')
| -rw-r--r-- | core/libffi/0001-Fix-paths-in-libffi.pc.in.patch | 41 | ||||
| -rw-r--r-- | core/libffi/PKGBUILD | 25 |
2 files changed, 57 insertions, 9 deletions
diff --git a/core/libffi/0001-Fix-paths-in-libffi.pc.in.patch b/core/libffi/0001-Fix-paths-in-libffi.pc.in.patch new file mode 100644 index 000000000..a4860a400 --- /dev/null +++ b/core/libffi/0001-Fix-paths-in-libffi.pc.in.patch @@ -0,0 +1,41 @@ +From ad0d1d239afc7ad09203847793dcc020856d1035 Mon Sep 17 00:00:00 2001 +From: Samuli Suominen <ssuominen@gentoo.org> +Date: Thu, 12 Jun 2014 06:30:21 -0400 +Subject: [PATCH] Fix paths in libffi.pc.in + +--- + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4f7fe3f..bbc1a9d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -590,11 +590,11 @@ AC_ARG_ENABLE(purify-safety, + if test "x$GCC" = "xyes"; then + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then +- toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ toolexecdir="${exec_prefix}"/'$(target_alias)' ++ toolexeclibdir="${toolexecdir}"/lib + else +- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +- toolexeclibdir='$(libdir)' ++ toolexecdir="${libdir}"/gcc-lib/'$(target_alias)' ++ toolexeclibdir="${libdir}" + fi + multi_os_directory=`$CC $CFLAGS -print-multi-os-directory` + case $multi_os_directory in +@@ -603,7 +603,7 @@ if test "x$GCC" = "xyes"; then + esac + AC_SUBST(toolexecdir) + else +- toolexeclibdir='$(libdir)' ++ toolexeclibdir="${libdir}" + fi + AC_SUBST(toolexeclibdir) + +-- +2.0.0 + diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD index cd5019c4e..a8d5bd6fb 100644 --- a/core/libffi/PKGBUILD +++ b/core/libffi/PKGBUILD @@ -1,19 +1,27 @@ -# $Id: PKGBUILD 197820 2013-10-30 11:04:33Z allan $ +# $Id: PKGBUILD 215318 2014-06-20 15:20:35Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libffi -pkgver=3.0.13 -pkgrel=4 -pkgdesc="Portable, high level programming interface to various calling conventions" +pkgver=3.1 +pkgrel=1 +pkgdesc='Portable foreign function interface library' arch=('i686' 'x86_64') -url="http://sourceware.org/libffi/" +url='http://sourceware.org/libffi/' license=('MIT') depends=('glibc') checkdepends=('dejagnu') install=libffi.install -source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) -sha1sums=('f5230890dc0be42fb5c58fbf793da253155de106') +source=(ftp://sourceware.org/pub/libffi/libffi-$pkgver.tar.gz + 0001-Fix-paths-in-libffi.pc.in.patch) +sha1sums=('cb373ef2115ec7c57913b84ca72eee14b10ccdc3' + '85b406c5208a7b8fdba9c8a4782ab524f5c5eec4') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../0001-Fix-paths-in-libffi.pc.in.patch +} build() { cd $pkgname-$pkgver @@ -22,8 +30,7 @@ build() { } check() { - cd $pkgname-$pkgver - make check + make -C $pkgname-$pkgver check } package() { |