summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-23 08:57:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-30 16:37:49 +0000
commit9dcb176dc80a0c1b2a12e433b93fd11640cf8e80 (patch)
treebcc1150c382f5bd0339d9262014bef545668d673 /meta/classes
parent64ba74deff7fdefcd4a493084a834d825eb1945d (diff)
downloadpoky-9dcb176dc80a0c1b2a12e433b93fd11640cf8e80.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) (From OE-Core rev: 5e41e0973a9be890ac310e1bbf465fcd08b0add5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/autotools.bbclass2
-rw-r--r--meta/classes/native.bbclass3
2 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index da32f1ded8..c05ab4b0a0 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -31,6 +31,8 @@ export CONFIG_SITE = "${@siteinfo_get_files(d)}"
31acpaths = "default" 31acpaths = "default"
32EXTRA_AUTORECONF = "--exclude=autopoint" 32EXTRA_AUTORECONF = "--exclude=autopoint"
33 33
34export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}"
35
34def autotools_set_crosscompiling(d): 36def 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
70libdir = "${STAGING_DIR_NATIVE}${libdir_native}" 70libdir = "${STAGING_DIR_NATIVE}${libdir_native}"
71 71
72# Libtool's default paths are correct for the native machine
73lt_cv_sys_lib_dlsearch_path_spec[unexport] = "1"
74
72NATIVE_PACKAGE_PATH_SUFFIX = "" 75NATIVE_PACKAGE_PATH_SUFFIX = ""
73bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 76bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
74libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 77libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"