diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-02-15 17:01:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-16 09:04:22 +0000 |
commit | 73e53e453ecfe3565720c7201b8c0b3fc92759cd (patch) | |
tree | 0d85d527d9a42a39e0a8d03357031a1f35613f5a /meta | |
parent | 6e4e9f7856389cb711e3cb587625c55b0ee51fac (diff) | |
download | poky-73e53e453ecfe3565720c7201b8c0b3fc92759cd.tar.gz |
nss: define RPATH variable for nss-native
Otherwise the nss libs do not get any RPATH/RUNPATH. Consequently, the
.so dependencies of nss libs are always searched from the base lib
directories of the host (i.e. /lib/ and /usr/lib). This causes problems
with nss-native where the .so's should be searched from the base lib
directories of the sysroot instead of the host file system.
This particular problem has probably been unnoticed as most users are
likely to have nss libraries installed on their host system. In this
case everything most likely work as expected.
[YOCTO #9041]
(From OE-Core rev: f78664219503cc176ca1c10a4397ca8a2883eb71)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/nss/nss_3.21.bb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-support/nss/nss_3.21.bb b/meta/recipes-support/nss/nss_3.21.bb index 552fd6c77d..d2e24112de 100644 --- a/meta/recipes-support/nss/nss_3.21.bb +++ b/meta/recipes-support/nss/nss_3.21.bb | |||
@@ -55,6 +55,11 @@ do_compile_prepend_class-nativesdk() { | |||
55 | export LDFLAGS="" | 55 | export LDFLAGS="" |
56 | } | 56 | } |
57 | 57 | ||
58 | do_compile_prepend_class-native() { | ||
59 | # Need to set RPATH so that chrpath will do its job correctly | ||
60 | RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" | ||
61 | } | ||
62 | |||
58 | do_compile() { | 63 | do_compile() { |
59 | export CROSS_COMPILE=1 | 64 | export CROSS_COMPILE=1 |
60 | export NATIVE_CC="gcc" | 65 | export NATIVE_CC="gcc" |
@@ -96,7 +101,8 @@ do_compile() { | |||
96 | # | 101 | # |
97 | export CC="${CC} -g" | 102 | export CC="${CC} -g" |
98 | make -C ./nss CCC="${CXX} -g" \ | 103 | make -C ./nss CCC="${CXX} -g" \ |
99 | OS_TEST=${OS_TEST} | 104 | OS_TEST=${OS_TEST} \ |
105 | RPATH="${RPATH}" | ||
100 | } | 106 | } |
101 | 107 | ||
102 | 108 | ||