diff options
| author | Michael Hanson <hansonorders@verizon.net> | 2010-11-30 23:38:29 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verizon.net> | 2010-11-30 23:38:29 (GMT) |
| commit | f8e22efeb03466e92cdb35e5a075a47a9d1430dd (patch) | |
| tree | 40a7d6b1ed110f2cb29ce9621164c002a245f6aa | |
| parent | 0849ad4af73e37f61342bf0567aeb2433ee37ada (diff) | |
| download | linhes_pkgbuild-f8e22efeb03466e92cdb35e5a075a47a9d1430dd.zip linhes_pkgbuild-f8e22efeb03466e92cdb35e5a075a47a9d1430dd.tar.gz linhes_pkgbuild-f8e22efeb03466e92cdb35e5a075a47a9d1430dd.tar.bz2 | |
curl: upgrade
| -rw-r--r-- | abs/core/curl/PKGBUILD | 56 | ||||
| -rw-r--r-- | abs/core/curl/curlbuild.h | 9 |
2 files changed, 40 insertions, 25 deletions
diff --git a/abs/core/curl/PKGBUILD b/abs/core/curl/PKGBUILD index ba286a5..99f1f10 100644 --- a/abs/core/curl/PKGBUILD +++ b/abs/core/curl/PKGBUILD @@ -1,44 +1,50 @@ -# $Id: PKGBUILD 87558 2010-08-16 20:27:57Z dgriffiths $ +# $Id: PKGBUILD 95264 2010-10-17 20:54:32Z ibiru $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.21.1 -pkgrel=1 +pkgver=7.21.2 +pkgrel=2 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') depends=('zlib' 'openssl' 'bash' 'ca-certificates') options=('!libtool') -source=("http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('eafde5b933bce1c1dca82d1054c8d967') +source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 + curlbuild.h) +md5sums=('ca96df88e044c7c25d19692ec8b250b2' + '751bd433ede935c8fae727377625a8ae') +[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h +[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - ./configure \ - --with-random=/dev/urandom \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-dependency-tracking \ - --enable-ipv6 \ - --disable-ldaps \ - --disable-ldap \ - --enable-manual \ - --enable-versioned-symbols \ - --with-ca-path=/etc/ssl/certs \ - --without-libidn || return 1 - make || return 1 + ./configure \ + --with-random=/dev/urandom \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --enable-ipv6 \ + --disable-ldaps \ + --disable-ldap \ + --enable-manual \ + --enable-versioned-symbols \ + --with-ca-path=/etc/ssl/certs \ + --without-libidn + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - install -Dm644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1 - install -Dm644 docs/libcurl/libcurl.m4 \ - ${pkgdir}/usr/share/aclocal/libcurl.m4 || return 1 + make DESTDIR=${pkgdir} install + install -Dm644 COPYING \ + ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + install -Dm644 docs/libcurl/libcurl.m4 \ + ${pkgdir}/usr/share/aclocal/libcurl.m4 + mv "${pkgdir}/usr/include/curl/curlbuild.h" "${pkgdir}/usr/include/curl/${_curlbuild}" + install -m 644 ${srcdir}/curlbuild.h "${pkgdir}/usr/include/curl/curlbuild.h" } diff --git a/abs/core/curl/curlbuild.h b/abs/core/curl/curlbuild.h new file mode 100644 index 0000000..b488626 --- /dev/null +++ b/abs/core/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif |