curl: Remove patch for disable static libs in pkg-config file

This commit is contained in:
Alexpux
2014-10-23 10:26:34 +04:00
parent 68a8b7d0d1
commit 4f8614cccb
2 changed files with 4 additions and 28 deletions

View File

@@ -1,21 +0,0 @@
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,7 +2,7 @@
pkgname=('curl' 'libcurl' 'libcurl-devel')
pkgver=7.38.0
pkgrel=2
pkgrel=3
pkgdesc="Multi-protocol file transfer utility"
arch=('i686' 'x86_64')
url="http://curl.haxx.se"
@@ -11,17 +11,14 @@ depends=('ca-certificates' 'libcares' 'libcrypt' 'libidn' 'libmetalink' 'libssh2
makedepends=('libmetalink-devel' 'libcares-devel' 'libcrypt-devel' 'libidn-devel' 'libssh2-devel' 'openssl-devel' 'zlib-devel' 'heimdal-devel')
options=('!libtool' 'strip' '!debug')
source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
curl-7.32.0-msys2.patch
7.33.0-libdeps.patch)
curl-7.32.0-msys2.patch)
md5sums=('b6e3ea55bb718f2270489581efa50a8a'
'46a4fd106498d6ccad8f33f9bd15aa70'
'859cee7c1510c581dc924cc7417dd179'
'009c98eea0b41ad0e534f5fac2bddd96')
'SKIP'
'859cee7c1510c581dc924cc7417dd179')
prepare() {
cd "$pkgname-$pkgver"
patch -p1 -i ${srcdir}/curl-7.32.0-msys2.patch
patch -p2 -i ${srcdir}/7.33.0-libdeps.patch
autoreconf -fi
}