summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-09 11:02:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:48 +0000
commit056d82c7cbf40c100cafe7a2138dd8cad3ffc8fb (patch)
tree003c447fda5cc373a64b4dc8ef8d2af28d641c01 /meta
parent0e62f01559fc9ceeeeb46cc143d34785f17c225c (diff)
downloadpoky-056d82c7cbf40c100cafe7a2138dd8cad3ffc8fb.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/curl/curl/pkgconfig_fix.patch32
-rw-r--r--meta/recipes-support/curl/curl_7.47.1.bb4
2 files changed, 1 insertions, 35 deletions
diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch
deleted file mode 100644
index 5d8769d522..0000000000
--- a/meta/recipes-support/curl/curl/pkgconfig_fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Inappropriate [packaging]
2
3diff -Nurd curl-7.29.0/configure.ac curl-7.29.0/configure.ac
4--- curl-7.29.0/configure.ac 2013-02-06 11:47:19.000000000 +0200
5+++ curl-7.29.0/configure.ac 2013-02-16 12:32:22.132327764 +0200
6@@ -1883,6 +1883,7 @@
7 AC_SUBST(USE_GNUTLS, [1])
8 GNUTLS_ENABLED=1
9 USE_GNUTLS="yes"
10+ GNUTLS_REQUIRED="gnutls"
11 curl_ssl_msg="enabled (GnuTLS)"
12 ],
13 [
14@@ -1953,6 +1954,8 @@
15 ])
16 fi
17
18+AC_SUBST(GNUTLS_REQUIRED)
19+
20 dnl ----------------------------------------------------
21 dnl check for PolarSSL
22 dnl ----------------------------------------------------
23diff -Nurd curl-7.29.0/libcurl.pc.in curl-7.29.0/libcurl.pc.in
24--- curl-7.29.0/libcurl.pc.in 2012-12-12 00:32:22.000000000 +0200
25+++ curl-7.29.0/libcurl.pc.in 2013-02-16 12:33:27.063844337 +0200
26@@ -35,5 +35,5 @@
27 Description: Library to transfer files with ftp, http, etc.
28 Version: @CURLVERSION@
29 Libs: -L${libdir} -lcurl
30-Libs.private: @LIBCURL_LIBS@
31+Libs.private: -ldl -lz
32 Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb
index f2fa37ccf4..210147c4c8 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -5,9 +5,7 @@ SECTION = "console/network"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e664ac" 6LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e664ac"
7 7
8SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 8SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
9 file://pkgconfig_fix.patch \
10 "
11 9
12# curl likes to set -g0 in CFLAGS, so we stop it 10# curl likes to set -g0 in CFLAGS, so we stop it
13# from mucking around with debug options 11# from mucking around with debug options