curl: drop obsolete pkgconfig_fix.patch

This patch has been carried around in oe-core for a long time.
It contains two unrelated changes and neither seem to be required
any more. Drop the patch.

(From OE-Core rev: 27837df35db57f50b8fa7f7c6b3f2e400205deb9)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy
2016-02-09 11:02:06 -08:00
committed by Richard Purdie
parent 0e62f01559
commit 056d82c7cb
2 changed files with 1 additions and 35 deletions

View File

@@ -1,32 +0,0 @@
Upstream-Status: Inappropriate [packaging]
diff -Nurd curl-7.29.0/configure.ac curl-7.29.0/configure.ac
--- curl-7.29.0/configure.ac 2013-02-06 11:47:19.000000000 +0200
+++ curl-7.29.0/configure.ac 2013-02-16 12:32:22.132327764 +0200
@@ -1883,6 +1883,7 @@
AC_SUBST(USE_GNUTLS, [1])
GNUTLS_ENABLED=1
USE_GNUTLS="yes"
+ GNUTLS_REQUIRED="gnutls"
curl_ssl_msg="enabled (GnuTLS)"
],
[
@@ -1953,6 +1954,8 @@
])
fi
+AC_SUBST(GNUTLS_REQUIRED)
+
dnl ----------------------------------------------------
dnl check for PolarSSL
dnl ----------------------------------------------------
diff -Nurd curl-7.29.0/libcurl.pc.in curl-7.29.0/libcurl.pc.in
--- curl-7.29.0/libcurl.pc.in 2012-12-12 00:32:22.000000000 +0200
+++ curl-7.29.0/libcurl.pc.in 2013-02-16 12:33:27.063844337 +0200
@@ -35,5 +35,5 @@
Description: Library to transfer files with ftp, http, etc.
Version: @CURLVERSION@
Libs: -L${libdir} -lcurl
-Libs.private: @LIBCURL_LIBS@
+Libs.private: -ldl -lz
Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@

View File

@@ -5,9 +5,7 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e664ac"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://pkgconfig_fix.patch \
"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
# curl likes to set -g0 in CFLAGS, so we stop it
# from mucking around with debug options