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

[Dave Reisner]

    Date: Saturday, April 22, 2017 @ 11:47:08
  Author: dreisner
Revision: 293900

upgpkg: curl 7.54.0-2

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

-------------+
 PKGBUILD    |   15 +++------------
 curlbuild.h |    9 ---------
 2 files changed, 3 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-22 09:51:25 UTC (rev 293899)
+++ PKGBUILD	2017-04-22 11:47:08 UTC (rev 293900)
@@ -7,7 +7,7 @@
 
 pkgname=curl
 pkgver=7.54.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64')
 url="https://curl.haxx.se"
@@ -15,11 +15,9 @@
 depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
 provides=('libcurl.so')
 options=('strip' 'debug')
-source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        'curlbuild.h')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc})
 sha512sums=('57f73a4ffece65f4e12e30b1d4be4f54f434693ba64d32eca0da036830389854b699a6e0ad6c3d9e847eab73981de6d8ebdb1820cc8a40a5d163aec37ab554aa'
-            'SKIP'
-            '4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5')
+            'SKIP')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
               '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
 
@@ -47,13 +45,6 @@
 
   make DESTDIR="$pkgdir" install
 
-  local wordsize=$(cpp -include 'bits/wordsize.h' <<<'__WORDSIZE' | sed '$!d')
-  local _curlbuild=curlbuild-$wordsize.h
-
   # license
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  # devel
-  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
-  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
 }

Deleted: curlbuild.h
===================================================================
--- curlbuild.h	2017-04-22 09:51:25 UTC (rev 293899)
+++ curlbuild.h	2017-04-22 11:47:08 UTC (rev 293900)
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif