Merge branch 'upstream': libx32-libgcrypt 1.6.2-1.1

fantix · Feb 28, 2015 · fa88230 · fa88230
2 parents 075bd5c + 35a6878
commit fa88230
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 4 deletions.
diff --git a/community.svn/pristine/f3/f373d46462042a746e83e5bcf4cd5db255b9bd37.svn-base b/community.svn/pristine/f3/f373d46462042a746e83e5bcf4cd5db255b9bd37.svn-base
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+_pkgbasename=libgcrypt
+pkgname=lib32-$_pkgbasename
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="General purpose cryptographic library based on the code from GnuPG (32-bit)"
+arch=(x86_64)
+url="http://www.gnupg.org"
+license=('LGPL')
+depends=('lib32-libgpg-error>=1.10-2' $_pkgbasename)
+makedepends=(gcc-multilib libtool-multilib)
+source=(ftp://ftp.gnupg.org/gcrypt/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2)
+sha1sums=('cc31aca87e4a3769cb86884a3f5982b2cc8eb7ec')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd ${_pkgbasename}-${pkgver}
+
+  # Use 32-bit assembler
+  sed 's:path="amd64":path="i586 i386":' -i mpi/config.links
+
+  ./configure --prefix=/usr --disable-static --disable-padlock-support \
+              --libdir=/usr/lib32 --enable-shared
+  make
+}
+
+package() {
+  cd ${_pkgbasename}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
+}
diff --git a/community.svn/wc.db b/community.svn/wc.db
diff --git a/libx32-libgcrypt/PKGBUILD b/libx32-libgcrypt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 106864 2014-03-09 12:49:17Z bpiotrowski $
+# $Id: PKGBUILD 117893 2014-08-26 08:57:32Z bluewind $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # x32 Maintainer: Fantix King <fantix.king at gmail.com>
 
 _pkgbasename=libgcrypt
 pkgname=libx32-$_pkgbasename
-pkgver=1.6.1
-pkgrel=1
+pkgver=1.6.2
+pkgrel=1.1
 pkgdesc="General purpose cryptographic library based on the code from GnuPG (x32 ABI)"
 arch=(x86_64)
 url="http://www.gnupg.org"
@@ -15,7 +15,7 @@ makedepends=(gcc-multilib-x32 libtool-multilib)
 source=(ftp://ftp.gnupg.org/gcrypt/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
   libgcrypt-1.4.5-x32.patch
 )
-sha1sums=('f03d9b63ac3b17a6972fc11150d136925b702f02'
+sha1sums=('cc31aca87e4a3769cb86884a3f5982b2cc8eb7ec'
           '0d23f2f17b9f4f6461abb4f8f5115f9db3143841')
 
 build() {