summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl/curl
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2012-07-04 10:31:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:58:56 +0100
commit460119a5b9f03db5b5f3a4668318fc3594ddf36b (patch)
tree1390b139614df0f41c36647c80385318c2e9882d /meta/recipes-support/curl/curl
parentd0900924a6a2e08a200eecab1583a09bb2bd64f0 (diff)
downloadpoky-460119a5b9f03db5b5f3a4668318fc3594ddf36b.tar.gz
curl: upgrade to 7.26.0
Config system changed from 7.24.0 and the noldlibpatch is no longer needed, thus deleted. (From OE-Core rev: 0d2d59420b5924491ccd5c091c823b9c277a6721) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl/curl')
-rw-r--r--meta/recipes-support/curl/curl/noldlibpath.patch76
1 files changed, 0 insertions, 76 deletions
diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch
deleted file mode 100644
index f4c72a1c1c..0000000000
--- a/meta/recipes-support/curl/curl/noldlibpath.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling.
4Since we never run compiled binaries for the target, we should *never* need
5to change LD_LIBRARY_PATH.
6
7RP 9/6/2010
8
9Index: curl-7.20.0/configure.ac
10===================================================================
11--- curl-7.20.0.orig/configure.ac 2010-06-09 11:06:30.000000000 +0100
12+++ curl-7.20.0/configure.ac 2010-06-09 11:04:25.000000000 +0100
13@@ -1461,9 +1461,10 @@
14 dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
15 dnl to prevent further configure tests to fail due to this
16
17- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
18- export LD_LIBRARY_PATH
19- AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
20+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
21+ #export LD_LIBRARY_PATH
22+ #AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
23+ :
24 fi
25 fi
26
27@@ -1684,9 +1686,10 @@
28 dnl LD_LIBRARY_PATH to prevent further configure tests to fail
29 dnl due to this
30
31- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
32- export LD_LIBRARY_PATH
33- AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
34+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
35+ #export LD_LIBRARY_PATH
36+ #AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
37+ :
38 fi
39 fi
40
41@@ -1696,6 +1699,8 @@
42
43 fi dnl OPENSSL != 1
44
45+AC_SUBST(GNUTLS_REQUIRED)
46+
47 dnl ----------------------------------------------------
48 dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
49 dnl ----------------------------------------------------
50@@ -1781,9 +1786,10 @@
51 dnl LD_LIBRARY_PATH to prevent further configure tests to fail
52 dnl due to this
53
54- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"
55- export LD_LIBRARY_PATH
56- AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
57+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"
58+ #export LD_LIBRARY_PATH
59+ #AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
60+ :
61 fi
62
63 fi
64@@ -1881,9 +1887,9 @@
65 dnl libssh2_version is a post 1.0 addition
66 AC_CHECK_FUNCS( libssh2_version )
67
68- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2"
69- export LD_LIBRARY_PATH
70- AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
71+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2"
72+ #export LD_LIBRARY_PATH
73+ #AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
74 fi
75 else
76 dnl no libssh2, revert back to clean variables