summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-15 15:00:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-15 16:31:59 (GMT)
commitf562e2a393d69312281ceda1d2b2b0af03a8c8b5 (patch)
tree5a09baf756dc6f17a11f60793d4661a418eae110 /meta/recipes-devtools
parent5c006a460ff9c838523a35f198b8746bd8719ab2 (diff)
downloadpoky-f562e2a393d69312281ceda1d2b2b0af03a8c8b5.tar.gz
pseudo: Ensure the correct libraries are used at runtime
There can be a conflict between the nativesdk libc and the host system's libc. It is assumed the nativesdk version is of an equal or higher version. This is a particular issue for pseudo if its loading a system binary since the system's libc might be used of an older verison which would then confuse libpseudo.so when loaded as a preload. To avoid this, set LD_LIBRARY_PATH so the nativesdk libc is always used. Since we now use --without-rpath, we can remove the MAKEOPTS RPATH workaround. [YOCTO #2299] (From OE-Core rev: a481fe3b9883aa744be3253e2b4b27e6e46eb059) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/pseudo/pseudo.inc5
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.3.bb2
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb2
3 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index d710058..6ac1301 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -13,10 +13,7 @@ FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/p
13FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug" 13FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
14PROVIDES += "virtual/fakeroot" 14PROVIDES += "virtual/fakeroot"
15 15
16# In the nativesdk case, we'll already search the searchpaths
17# pseudo tries to build in so override RPATH
18MAKEOPTS = "" 16MAKEOPTS = ""
19MAKEOPTS_virtclass-nativesdk = "'RPATH='"
20 17
21inherit siteinfo 18inherit siteinfo
22 19
@@ -78,6 +75,8 @@ do_install_append_virtclass-nativesdk () {
78 mkdir -p ${D}${prefix}/lib/pseudo/lib 75 mkdir -p ${D}${prefix}/lib/pseudo/lib
79 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. 76 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
80 fi 77 fi
78
79 create_wrapper ${D}${bindir}/pseudo LD_LIBRARY_PATH=${base_libdir}:${libdir}
81} 80}
82 81
83BBCLASSEXTEND = "native nativesdk" 82BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.3.bb b/meta/recipes-devtools/pseudo/pseudo_1.3.bb
index 080b739..b16b2d9 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.3.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_1.3.bb
@@ -1,6 +1,6 @@
1require pseudo.inc 1require pseudo.inc
2 2
3PR = "r8" 3PR = "r9"
4 4
5SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" 5SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
6 6
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 7857275..5771295 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -2,7 +2,7 @@ require pseudo.inc
2 2
3SRCREV = "f0375c9aaefbccfd41aebbf6d332bb4d9e8f980c" 3SRCREV = "f0375c9aaefbccfd41aebbf6d332bb4d9e8f980c"
4PV = "1.3+git${SRCPV}" 4PV = "1.3+git${SRCPV}"
5PR = "r23" 5PR = "r24"
6 6
7DEFAULT_PREFERENCE = "-1" 7DEFAULT_PREFERENCE = "-1"
8 8