Patchwork [CONSOLIDATED,PULL,07/14] prelink: Add lib64 dirs to prelink.conf

login
register
mail settings
Submitter Saul Wold
Date Aug. 5, 2011, 3:27 p.m.
Message ID <9410dc515e47e9d1d2f2aefbca7e117202c4c653.1312557813.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/9379/
State New, archived
Headers show

Comments

Saul Wold - Aug. 5, 2011, 3:27 p.m.
From: Kumar Gala <galak@kernel.crashing.org>

Handle multlib or cases that baselib is lib64.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/recipes-devtools/prelink/prelink/prelink.conf |    8 ++++----
 meta/recipes-devtools/prelink/prelink_git.bb       |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/recipes-devtools/prelink/prelink/prelink.conf b/meta/recipes-devtools/prelink/prelink/prelink.conf
index c5a4f4a..ed30c28 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
--l /lib
--l /usr/lib
--l /usr/X11R6/lib
+-l /usr/local/lib{,64}
+-l /lib{,64}
+-l /usr/lib{,64}
+-l /usr/X11R6/lib{,64}
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index c653d4d..bb95da7 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 = "ac461e73b17253a4da25c5aafeac7193b553156c"
 PV = "1.0+git${SRCPV}"
-PR = "r4"
+PR = "r5"
 
 #
 # The cron script attempts to re-prelink the system daily -- on