diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:11 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:57 +0100 |
commit | d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch) | |
tree | f36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-support/curl/curl/noldlibpath.patch | |
parent | caab7fc509bf27706ff3248689f6afd04225cfda (diff) | |
download | poky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz |
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/curl/curl/noldlibpath.patch')
-rw-r--r-- | meta/recipes-support/curl/curl/noldlibpath.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch new file mode 100644 index 0000000000..a3319a23e3 --- /dev/null +++ b/meta/recipes-support/curl/curl/noldlibpath.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling. | ||
2 | Since we never run compiled binaries for the target, we should *never* need | ||
3 | to change LD_LIBRARY_PATH. | ||
4 | |||
5 | RP 9/6/2010 | ||
6 | |||
7 | Index: curl-7.20.0/configure.ac | ||
8 | =================================================================== | ||
9 | --- curl-7.20.0.orig/configure.ac 2010-06-09 11:06:30.000000000 +0100 | ||
10 | +++ curl-7.20.0/configure.ac 2010-06-09 11:04:25.000000000 +0100 | ||
11 | @@ -1461,9 +1461,10 @@ | ||
12 | dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH | ||
13 | dnl to prevent further configure tests to fail due to this | ||
14 | |||
15 | - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" | ||
16 | - export LD_LIBRARY_PATH | ||
17 | - AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) | ||
18 | + #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" | ||
19 | + #export LD_LIBRARY_PATH | ||
20 | + #AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) | ||
21 | + : | ||
22 | fi | ||
23 | fi | ||
24 | |||
25 | @@ -1684,9 +1686,10 @@ | ||
26 | dnl LD_LIBRARY_PATH to prevent further configure tests to fail | ||
27 | dnl due to this | ||
28 | |||
29 | - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" | ||
30 | - export LD_LIBRARY_PATH | ||
31 | - AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) | ||
32 | + #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" | ||
33 | + #export LD_LIBRARY_PATH | ||
34 | + #AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) | ||
35 | + : | ||
36 | fi | ||
37 | fi | ||
38 | |||
39 | @@ -1696,6 +1699,8 @@ | ||
40 | |||
41 | fi dnl OPENSSL != 1 | ||
42 | |||
43 | +AC_SUBST(GNUTLS_REQUIRED) | ||
44 | + | ||
45 | dnl ---------------------------------------------------- | ||
46 | dnl NSS. Only check if GnuTLS and OpenSSL are not enabled | ||
47 | dnl ---------------------------------------------------- | ||
48 | @@ -1781,9 +1786,10 @@ | ||
49 | dnl LD_LIBRARY_PATH to prevent further configure tests to fail | ||
50 | dnl due to this | ||
51 | |||
52 | - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff" | ||
53 | - export LD_LIBRARY_PATH | ||
54 | - AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH]) | ||
55 | + #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff" | ||
56 | + #export LD_LIBRARY_PATH | ||
57 | + #AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH]) | ||
58 | + : | ||
59 | fi | ||
60 | |||
61 | fi | ||
62 | @@ -1881,9 +1887,9 @@ | ||
63 | dnl libssh2_version is a post 1.0 addition | ||
64 | AC_CHECK_FUNCS( libssh2_version ) | ||
65 | |||
66 | - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2" | ||
67 | - export LD_LIBRARY_PATH | ||
68 | - AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH]) | ||
69 | + #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2" | ||
70 | + #export LD_LIBRARY_PATH | ||
71 | + #AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH]) | ||
72 | fi | ||
73 | else | ||
74 | dnl no libssh2, revert back to clean variables | ||