summaryrefslogtreecommitdiffstats
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:28 +0000
commit27837df35db57f50b8fa7f7c6b3f2e400205deb9 (patch)
treefdfd46d567c9837e6382e28873b98302af2aee9e
parentc8a7fdb2ac37b42a97f666cae6b3f5061a01ad45 (diff)
downloadopenembedded-core-27837df35db57f50b8fa7f7c6b3f2e400205deb9.tar.gz
openembedded-core-27837df35db57f50b8fa7f7c6b3f2e400205deb9.tar.bz2
openembedded-core-27837df35db57f50b8fa7f7c6b3f2e400205deb9.zip
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. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 @@
-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@
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"
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