[arch-commits] Commit in lib32-libffi/trunk (2 files)

[Laurent Carlier]

    Date: Thursday, June 26, 2014 @ 11:15:49
  Author: lcarlier
Revision: 113590

upgpkg: lib32-libffi 3.1-1

upstream update 3.1

Added:
  lib32-libffi/trunk/0001-Fix-paths-in-libffi.pc.in.patch
Modified:
  lib32-libffi/trunk/PKGBUILD

--------------------------------------+
 0001-Fix-paths-in-libffi.pc.in.patch |   41 +++++++++++++++++++++++++++++++++
 PKGBUILD                             |   22 ++++++++++-------
 2 files changed, 54 insertions(+), 9 deletions(-)

Added: 0001-Fix-paths-in-libffi.pc.in.patch
===================================================================
--- 0001-Fix-paths-in-libffi.pc.in.patch	                        (rev 0)
+++ 0001-Fix-paths-in-libffi.pc.in.patch	2014-06-26 09:15:49 UTC (rev 113590)
@@ -0,0 +1,41 @@
+From ad0d1d239afc7ad09203847793dcc020856d1035 Mon Sep 17 00:00:00 2001
+From: Samuli Suominen <ssuominen at 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-26 09:09:20 UTC (rev 113589)
+++ PKGBUILD	2014-06-26 09:15:49 UTC (rev 113590)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=lib32-libffi
-pkgver=3.0.13
+pkgver=3.1
 pkgrel=1
 pkgdesc="A portable, high level programming interface to various calling conventions (32-bit)"
 arch=('x86_64')
@@ -10,12 +10,18 @@
 url="http://sourceware.org/libffi/"
 depends=('lib32-glibc')
 checkdepends=('dejagnu')
-options=('!libtool')
-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 libffi-${pkgver}
+  patch -p1 -i ../0001-Fix-paths-in-libffi.pc.in.patch
+}
+
 build() {
-  cd "${srcdir}/libffi-${pkgver}"
+  cd libffi-${pkgver}
 
   export CC="gcc -m32"
 
@@ -27,13 +33,11 @@
 }
 
 check() {
-  cd "${srcdir}/libffi-${pkgver}"
-
-  make check
+  make -C libffi-${pkgver} check
 }
 
 package() {
-  cd "${srcdir}/libffi-${pkgver}"
+  cd libffi-${pkgver}
 
   make DESTDIR="${pkgdir}" install