[arch-commits] Commit in curl/trunk (ChangeLog PKGBUILD curlbuild.h)

[Ionut Biru]

    Date: Sunday, October 17, 2010 @ 16:54:32
  Author: ibiru
Revision: 95264

upgpkg: curl 7.21.2-2
make curl headers multilib friendly FS#21216

Added:
  curl/trunk/curlbuild.h
Modified:
  curl/trunk/PKGBUILD
Deleted:
  curl/trunk/ChangeLog

-------------+
 ChangeLog   |   69 ----------------------------------------------------------
 PKGBUILD    |   52 ++++++++++++++++++++++++-------------------
 curlbuild.h |    9 +++++++
 3 files changed, 38 insertions(+), 92 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-10-17 20:21:07 UTC (rev 95263)
+++ ChangeLog	2010-10-17 20:54:32 UTC (rev 95264)
@@ -1,69 +0,0 @@
-2010-02-09  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.20.0-1
-	* Upstream update
-
-2009-11-04  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.19.7-1
-	* Upstream update
-
-2009-10-03  Robson Peixoto <robsonpeixoto at gmail.com>
-
-	* curl 7.19.6-2
-	* Compile with ca-path like Debian and Gentoo
-
-2009-08-12  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.19.6-1
-	* Upstream update
-
-2009-05-18  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.19.5-1
-	* Upstream update
-
-2009-03-03  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.19.4-1
-	* Upstream update
-
-2009-01-21  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.19.3-1
-	* Upstream update
-
-2008-11-14  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.19.2-1
-	* Upstream update
-
-2008-11-08  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.19.1-1
-	* Upstream update
-
-2008-09-20  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.19.0-1
-	* Upstream update
-
-2008-06-04  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.18.2-1
-	* Upstream update
-	* Switched to the CA Root Certificates provided by the ca-certificates package (close FS#10569)
-	* Removed bundled certificates
-	* Removed perl-libwww makedepends
-
-2008-04-30  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.18.1-2
-	* Added CA Root Certificates (close FS#10129)
-	* Added perl-libwww makedepends
-
-2008-03-31  Eric Belanger  <eric at archlinux.org>
-
-	* curl 7.18.1-1
-	* Upstream update
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-17 20:21:07 UTC (rev 95263)
+++ PKGBUILD	2010-10-17 20:54:32 UTC (rev 95264)
@@ -5,40 +5,46 @@
 
 pkgname=curl
 pkgver=7.21.2
-pkgrel=1
+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=('ca96df88e044c7c25d19692ec8b250b2')
+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
-	make
+    ./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
-	install -Dm644 COPYING \
-		${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-	install -Dm644 docs/libcurl/libcurl.m4 \
-		${pkgdir}/usr/share/aclocal/libcurl.m4
+    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"
 }

Added: curlbuild.h
===================================================================
--- curlbuild.h	                        (rev 0)
+++ curlbuild.h	2010-10-17 20:54:32 UTC (rev 95264)
@@ -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