From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Tue, 3 Jan 2012 22:59:30 +0000 (-0800)
Subject: prelink: also look at nonstandard lib paths
X-Git-Tag: 2015-4~12183
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c02b9de25b405c81da0f7bebd07423e8cee14eb7;p=openembedded-core.git

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>
---

diff --git a/meta/recipes-devtools/prelink/prelink/prelink.conf b/meta/recipes-devtools/prelink/prelink/prelink.conf
index ed30c286f2..562f23c59d 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 31c22efe51..17141e9b06 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