Date: Friday, May 1, 2015 @ 21:01:58 Author: bluewind Revision: 132617
archrelease: copy trunk to multilib-x86_64 Added: lib32-gnutls/repos/multilib-x86_64/PKGBUILD (from rev 132616, lib32-gnutls/trunk/PKGBUILD) lib32-gnutls/repos/multilib-x86_64/buildfix.diff (from rev 132616, lib32-gnutls/trunk/buildfix.diff) Deleted: lib32-gnutls/repos/multilib-x86_64/PKGBUILD ---------------+ PKGBUILD | 110 ++++++++++++++++++++++++++++++-------------------------- buildfix.diff | 27 +++++++++++++ 2 files changed, 87 insertions(+), 50 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-05-01 19:01:54 UTC (rev 132616) +++ PKGBUILD 2015-05-01 19:01:58 UTC (rev 132617) @@ -1,50 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz <bluew...@xinu.at> -# Contributor: Christoph Vigano <mail at cvigano dot de> -# Contributor: Biru Ionut <io...@archlinux.ro> -# Contributor: Pierre Schmitz <pie...@archlinux.de> -# Contributor: Mikko Seppälä <t-r-...@mbnet.fi> - -_pkgbasename=gnutls -pkgname=lib32-$_pkgbasename -pkgver=3.3.13 -pkgrel=1 -pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)" -arch=('x86_64') -license=('GPL3' 'LGPL2.1') -url="http://gnutls.org/" -depends=('lib32-zlib' 'lib32-nettle' 'lib32-p11-kit' 'lib32-libtasn1' $_pkgbasename) -makedepends=('gcc-multilib' 'lib32-libidn') -source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${_pkgbasename}-${pkgver}.tar.xz{,.sig}) -md5sums=('a7387fe8bf3e604bf518a6da9ab2a4e6' - 'SKIP') -validpgpkeys=(1F42418905D8206AA754CCDC29EE58B996865171) - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - - # build fails without --disable-hardware-acceleration because of assembler errors - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --with-zlib \ - --disable-static \ - --disable-guile \ - --disable-valgrind-tests --disable-hardware-acceleration - make -} - -check() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - #make -k check -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - find $pkgdir - - rm -rf "${pkgdir}"/usr/{bin,include,share} -} Copied: lib32-gnutls/repos/multilib-x86_64/PKGBUILD (from rev 132616, lib32-gnutls/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-05-01 19:01:58 UTC (rev 132617) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Florian Pritz <bluew...@xinu.at> +# Contributor: Christoph Vigano <mail at cvigano dot de> +# Contributor: Biru Ionut <io...@archlinux.ro> +# Contributor: Pierre Schmitz <pie...@archlinux.de> +# Contributor: Mikko Seppälä <t-r-...@mbnet.fi> + +_pkgbasename=gnutls +pkgname=lib32-$_pkgbasename +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)" +arch=('x86_64') +license=('GPL3' 'LGPL2.1') +url="http://gnutls.org/" +depends=('lib32-zlib' 'lib32-nettle' 'lib32-p11-kit' 'lib32-libtasn1' $_pkgbasename) +makedepends=('gcc-multilib' 'lib32-libidn') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${_pkgbasename}-${pkgver}.tar.xz{,.sig} + buildfix.diff) +md5sums=('aa015c2666b031044edfb01b01980d84' + 'SKIP' + 'ffce1bd795445aaecf54100f44299fa7') +validpgpkeys=(1F42418905D8206AA754CCDC29EE58B996865171) + +prepare(){ + cd ${_pkgbasename}-${pkgver} + # buildfix https://gitlab.com/gnutls/gnutls/commit/7e63027a5caafa55dcca65c5b9bff3bf76c5a41c?view=inline + patch -Np1 -i ${srcdir}/buildfix.diff + autoreconf -vfi +} + + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd ${srcdir}/${_pkgbasename}-${pkgver} + + # build fails without --disable-hardware-acceleration because of assembler errors + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --with-zlib \ + --disable-static \ + --disable-guile \ + --disable-valgrind-tests --disable-hardware-acceleration + make +} + +check() { + cd ${srcdir}/${_pkgbasename}-${pkgver} + #make -k check +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install + find $pkgdir + + rm -rf "${pkgdir}"/usr/{bin,include,share} +} Copied: lib32-gnutls/repos/multilib-x86_64/buildfix.diff (from rev 132616, lib32-gnutls/trunk/buildfix.diff) =================================================================== --- buildfix.diff (rev 0) +++ buildfix.diff 2015-05-01 19:01:58 UTC (rev 132617) @@ -0,0 +1,27 @@ +diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am +index 8e793d3..68de757 100644 +--- a/doc/manpages/Makefile.am ++++ b/doc/manpages/Makefile.am +@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3 + APIMANS += gnutls_certificate_get_peers_subkey_id.3 + APIMANS += gnutls_certificate_get_trust_list.3 + APIMANS += gnutls_certificate_get_verify_flags.3 +-APIMANS += gnutls_certificate_get_verify_flags.3 +-APIMANS += gnutls_certificate_get_x509_crt.3 + APIMANS += gnutls_certificate_get_x509_crt.3 + APIMANS += gnutls_certificate_get_x509_key.3 +-APIMANS += gnutls_certificate_get_x509_key.3 + APIMANS += gnutls_certificate_send_x509_rdn_sequence.3 + APIMANS += gnutls_certificate_server_set_request.3 + APIMANS += gnutls_certificate_set_dh_params.3 +@@ -1101,7 +1098,7 @@ compare-makefile: + @echo "******************************************************************************" + @echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am" + @echo "******************************************************************************" +- FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \ ++ FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \ + MANS=""; \ + for i in $$FUNCS; do \ + MANS="$$MANS\nAPIMANS += $$i.3"; \ +-- +libgit2 0.21.4