[arch-commits] Commit in lib32-libffi/repos/multilib-x86_64 (4 files)

Daniel Micay thestinger at archlinux.org
Sat Dec 13 19:31:43 UTC 2014


    Date: Saturday, December 13, 2014 @ 20:31:42
  Author: thestinger
Revision: 123853

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-libffi/repos/multilib-x86_64/0001-Fix-paths-in-libffi.pc.in.patch
    (from rev 123852, lib32-libffi/trunk/0001-Fix-paths-in-libffi.pc.in.patch)
  lib32-libffi/repos/multilib-x86_64/PKGBUILD
    (from rev 123852, lib32-libffi/trunk/PKGBUILD)
Deleted:
  lib32-libffi/repos/multilib-x86_64/0001-Fix-paths-in-libffi.pc.in.patch
  lib32-libffi/repos/multilib-x86_64/PKGBUILD

--------------------------------------+
 0001-Fix-paths-in-libffi.pc.in.patch |   82 ++++++++++++++--------------
 PKGBUILD                             |   95 ++++++++++++++++-----------------
 2 files changed, 89 insertions(+), 88 deletions(-)

Deleted: 0001-Fix-paths-in-libffi.pc.in.patch
===================================================================
--- 0001-Fix-paths-in-libffi.pc.in.patch	2014-12-13 19:31:14 UTC (rev 123852)
+++ 0001-Fix-paths-in-libffi.pc.in.patch	2014-12-13 19:31:42 UTC (rev 123853)
@@ -1,41 +0,0 @@
-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
-

Copied: lib32-libffi/repos/multilib-x86_64/0001-Fix-paths-in-libffi.pc.in.patch (from rev 123852, lib32-libffi/trunk/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-12-13 19:31:42 UTC (rev 123853)
@@ -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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-13 19:31:14 UTC (rev 123852)
+++ PKGBUILD	2014-12-13 19:31:42 UTC (rev 123853)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=lib32-libffi
-pkgver=3.1
-pkgrel=1
-pkgdesc="A portable, high level programming interface to various calling conventions (32-bit)"
-arch=('x86_64')
-license=('MIT')
-url="http://sourceware.org/libffi/"
-depends=('lib32-glibc')
-checkdepends=('dejagnu')
-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 libffi-${pkgver}
-
-  export CC="gcc -m32"
-
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
-    --disable-static
-
-  make
-}
-
-check() {
-  make -C libffi-${pkgver} check
-}
-
-package() {
-  cd libffi-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
-  rm -r "${pkgdir}"/usr/share/{info,man}
-}

Copied: lib32-libffi/repos/multilib-x86_64/PKGBUILD (from rev 123852, lib32-libffi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-12-13 19:31:42 UTC (rev 123853)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=lib32-libffi
+pkgver=3.1
+pkgrel=2
+pkgdesc="A portable, high level programming interface to various calling conventions (32-bit)"
+arch=('x86_64')
+license=('MIT')
+url="http://sourceware.org/libffi/"
+depends=('lib32-glibc')
+checkdepends=('dejagnu')
+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
+  autoreconf -fi
+}
+
+build() {
+  cd libffi-${pkgver}
+
+  export CC="gcc -m32"
+
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
+    --disable-static --enable-pax_emutramp
+
+  make
+}
+
+check() {
+  make -C libffi-${pkgver} check
+}
+
+package() {
+  cd libffi-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
+  rm -r "${pkgdir}"/usr/share/{info,man}
+}



More information about the arch-commits mailing list