curl: Add patches from cygwin.

This commit is contained in:
Alexpux
2013-12-05 14:37:01 +04:00
parent 80a88e6ffd
commit 717efee8f1
3 changed files with 48 additions and 8 deletions

View File

@@ -0,0 +1,10 @@
--- origsrc/curl-7.33.0/configure.ac 2013-09-08 17:21:11.000000000 -0500
+++ src/curl-7.33.0/configure.ac 2013-11-13 19:25:11.634655400 -0600
@@ -1065,6 +1065,7 @@ AC_HELP_STRING([--disable-ipv6],[Disable
AC_TRY_RUN([ /* is AF_INET6 available? */
#include <sys/types.h>
#include <sys/socket.h>
+#include <stdlib.h> /* for exit() */
main()
{
if (socket(AF_INET6, SOCK_STREAM, 0) < 0)

21
curl/7.33.0-libdeps.patch Normal file
View File

@@ -0,0 +1,21 @@
These are needed only for static linking, but we build with --disable-static
--- origsrc/curl-7.33.0/curl-config.in 2013-09-08 17:11:15.000000000 -0500
+++ src/curl-7.33.0/curl-config.in 2013-11-13 20:43:10.231255800 -0600
@@ -147,7 +147,7 @@ while test $# -gt 0; do
else
CURLLIBDIR=""
fi
- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
+ if test "X@REQUIRE_LIB_DEPS@" = "Xnothanks"; then
echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
else
echo ${CURLLIBDIR}-lcurl
--- origsrc/curl-7.33.0/libcurl.pc.in 2013-09-08 17:11:15.000000000 -0500
+++ src/curl-7.33.0/libcurl.pc.in 2013-11-13 20:42:48.656021800 -0600
@@ -35,5 +35,4 @@ URL: http://curl.haxx.se/
Description: Library to transfer files with ftp, http, etc.
Version: @CURLVERSION@
Libs: -L${libdir} -lcurl
-Libs.private: @LIBCURL_LIBS@
Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@

View File

@@ -2,24 +2,32 @@
pkgname=('curl' 'libcurl' 'libcurl-devel')
pkgver=7.33.0
pkgrel=1
pkgrel=2
pkgdesc="Multi-protocol file transfer utility"
arch=('i686' 'x86_64')
url="http://curl.haxx.se"
license=('MIT')
depends=('ca-certificates' 'libidn' 'libmetalink' 'libssh2' 'openssl' 'zlib')
makedepends=('libmetalink-devel' 'libidn-devel' 'libssh2-devel' 'openssl-devel' 'zlib-devel')
depends=('ca-certificates' 'libidn' 'libmetalink' 'libssh2' 'openssl' 'zlib' 'heimdal-libs')
makedepends=('libmetalink-devel' 'libidn-devel' 'libssh2-devel' 'openssl-devel' 'zlib-devel' 'heimdal-devel')
#provides=('libcurl.so')
options=('!libtool' 'strip' '!debug')
source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
curl-7.32.0-msys2.patch)
curl-7.32.0-msys2.patch
7.33.0-libdeps.patch
7.33.0-Wimplicit-decls.patch)
md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93'
'SKIP'
'255b3bf8fe8704adfb95222865589d16')
'255b3bf8fe8704adfb95222865589d16'
'009c98eea0b41ad0e534f5fac2bddd96'
'663783cdd842d658123d4063d81a0217')
prepare() {
cd "$pkgname-$pkgver"
patch -p1 -i ${srcdir}/curl-7.32.0-msys2.patch
patch -p2 -i ${srcdir}/7.33.0-libdeps.patch
patch -p2 -i ${srcdir}/7.33.0-Wimplicit-decls.patch
autoreconf -fi
}
build() {
@@ -30,10 +38,10 @@ build() {
--prefix=/usr \
--enable-debug \
--enable-optimize \
--enable-ipv6 \
--disable-hidden-symbols \
--disable-ares \
--with-gssapi \
--without-krb4 \
--with-libidn \
--with-libmetalink \
--without-librtmp \
@@ -41,7 +49,8 @@ build() {
--without-spnego \
--with-ssl \
--with-zlib \
--with-ca-bundle=/usr/ssl/certs/ca-bundle.crt
--with-ca-bundle=/usr/ssl/certs/ca-bundle.crt \
ac_cv_func_setmode=yes
make
make DESTDIR="${srcdir}/dest" install
@@ -61,7 +70,7 @@ package_curl() {
package_libcurl() {
pkgdesc="Multi-protocol file transfer library (runtime)"
depends=('ca-certificates' 'libidn' 'libmetalink' 'libssh2' 'openssl' 'zlib')
depends=('ca-certificates' 'heimdal-libs' 'libidn' 'libmetalink' 'libssh2' 'openssl' 'zlib')
groups=('libraries')
mkdir -p ${pkgdir}/usr/bin