summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-01-03 14:59:30 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-04 11:55:02 +0000
commitc02b9de25b405c81da0f7bebd07423e8cee14eb7 (patch)
tree1e47e9f22a578a9df2a398ff7eae7bd98b02c9dc /meta
parent6a6b78180d2d7f8dbab02e96927de5a049c9a3ed (diff)
downloadopenembedded-core-c02b9de25b405c81da0f7bebd07423e8cee14eb7.tar.gz
openembedded-core-c02b9de25b405c81da0f7bebd07423e8cee14eb7.tar.bz2
openembedded-core-c02b9de25b405c81da0f7bebd07423e8cee14eb7.tar.xz
openembedded-core-c02b9de25b405c81da0f7bebd07423e8cee14eb7.zip
prelink: also look at nonstandard lib paths
Prelinking for x32 image showed that it was ignoring libraries located at locations like /usr/libx32. Like that mips n32 has library locations set as lib32 This commit modifies prelink.conf to look at libraries also located at libx32 & lib32 locations. Thanks to Mark Hatle for suggesting the fix. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/prelink/prelink/prelink.conf8
-rw-r--r--meta/recipes-devtools/prelink/prelink_git.bb2
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/prelink/prelink/prelink.conf b/meta/recipes-devtools/prelink/prelink/prelink.conf
index ed30c286f..562f23c59 100644
--- a/meta/recipes-devtools/prelink/prelink/prelink.conf
+++ b/meta/recipes-devtools/prelink/prelink/prelink.conf
@@ -12,7 +12,7 @@
-l /usr/bin
-l /usr/X11R6/bin
-l /usr/games
--l /usr/local/lib{,64}
--l /lib{,64}
--l /usr/lib{,64}
--l /usr/X11R6/lib{,64}
+-l /usr/local/lib{,32,64,x32}
+-l /lib{,32,64,x32}
+-l /usr/lib{,32,64,x32}
+-l /usr/X11R6/lib{,32,64,x32}
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index 31c22efe5..17141e9b0 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
SRCREV = "bb1b660c5e3859b6c5a2ac8d739713e9989a4dd7"
PV = "1.0+git${SRCPV}"
-PR = "r7"
+PR = "r8"
#
# The cron script attempts to re-prelink the system daily -- on