diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-23 08:57:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-26 17:56:43 +0100 |
commit | 9fe66fd8e2f1feccef1e2c0d6f6d7e117e06507e (patch) | |
tree | 6f6fb0d30c144782090c73d18d272f56aa68c27f /meta | |
parent | d39c6738df4b7e8ef22f2a7154274c1d08b1d51f (diff) | |
download | poky-9fe66fd8e2f1feccef1e2c0d6f6d7e117e06507e.tar.gz |
autotools.bbclass: Set the dynamic linker search path for libtool correctly
libtool obtains the search path from /etc/ld.so.conf and hardcodes /usr/lib
and /lib. This results in host contamination and variable sets of RPATH
values ending up in binaries.
By exporting the correct values for all autotools recipes we avoid this.
(From OE-Core rev: 93e595d5c89ebacdb8d1e6fcfe6f58fe2d30de28)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/autotools.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/native.bbclass | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 8f65b709fd..f213c18bf5 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass | |||
@@ -31,6 +31,8 @@ export CONFIG_SITE = "${@siteinfo_get_files(d)}" | |||
31 | acpaths = "default" | 31 | acpaths = "default" |
32 | EXTRA_AUTORECONF = "--exclude=autopoint" | 32 | EXTRA_AUTORECONF = "--exclude=autopoint" |
33 | 33 | ||
34 | export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}" | ||
35 | |||
34 | def autotools_set_crosscompiling(d): | 36 | def autotools_set_crosscompiling(d): |
35 | if not bb.data.inherits_class('native', d): | 37 | if not bb.data.inherits_class('native', d): |
36 | return " cross_compiling=yes" | 38 | return " cross_compiling=yes" |
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 9a41f19dc6..5e45aed37b 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
@@ -69,6 +69,9 @@ exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" | |||
69 | 69 | ||
70 | libdir = "${STAGING_DIR_NATIVE}${libdir_native}" | 70 | libdir = "${STAGING_DIR_NATIVE}${libdir_native}" |
71 | 71 | ||
72 | # Libtool's default paths are correct for the native machine | ||
73 | lt_cv_sys_lib_dlsearch_path_spec[unexport] = "1" | ||
74 | |||
72 | NATIVE_PACKAGE_PATH_SUFFIX = "" | 75 | NATIVE_PACKAGE_PATH_SUFFIX = "" |
73 | bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" | 76 | bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" |
74 | libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" | 77 | libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" |