summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/curl/curl/noldlibpath.patch76
-rw-r--r--meta/recipes-support/curl/curl_7.26.0.bb (renamed from meta/recipes-support/curl/curl_7.24.0.bb)7
2 files changed, 3 insertions, 80 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
diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb
index 832254ff65..f04b4008d6 100644
--- a/meta/recipes-support/curl/curl_7.24.0.bb
+++ b/meta/recipes-support/curl/curl_7.26.0.bb
@@ -8,14 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
8DEPENDS = "zlib gnutls" 8DEPENDS = "zlib gnutls"
9DEPENDS_virtclass-native = "zlib-native openssl-native" 9DEPENDS_virtclass-native = "zlib-native openssl-native"
10DEPENDS_virtclass-nativesdk = "zlib-nativesdk" 10DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
11PR = "r3" 11PR = "r0"
12 12
13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
14 file://noldlibpath.patch \
15 file://pkgconfig_fix.patch" 14 file://pkgconfig_fix.patch"
16 15
17SRC_URI[md5sum] = "f912221d75eb8d8fe08900eaf011b023" 16SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3"
18SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16" 17SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a"
19 18
20inherit autotools pkgconfig binconfig 19inherit autotools pkgconfig binconfig
21 20