[oe-commits] [openembedded-core] 12/23: icecc-create-env: Fix RUNPATH files

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit d1e88ad01df9b6419e02f632b1ba288d4cc3b2bf
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Tue Apr 10 21:21:55 2018 -0500

    icecc-create-env: Fix RUNPATH files
    
    Some newer libraries and programs use RUNPATH to specify the library
    search path. These executables were being skipped by the rpath fixup
    code because it was grepping the ELF header for RPATH only. A more
    correct solution is to ask patchelf to report the rpath, as that tool
    will properly report either RPATH or RUNPATH as appropriate.
    
    Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 .../icecc-create-env/icecc-create-env/icecc-create-env                | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
index 074c767..3015f4e 100755
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
+++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
@@ -42,11 +42,13 @@ fix_rpath ()
     if ! is_dynamic_elf "$path"; then
         return
     fi
-    local new_rpath="`readelf -w -d "$path" | grep RPATH | \
+    local old_rpath="`$PATCHELF --print-rpath "$path"`"
+    local new_rpath="`echo "$old_rpath" | \
         sed 's/.*\[\(.*\)\]/\1/g' | \
         sed "s,\\\$ORIGIN,/$origin,g"`"
 
     if test -n "$new_rpath"; then
+        print_debug "Converting RPATH '$old_rpath' -> '$new_rpath'"
         $PATCHELF --set-rpath "$new_rpath" "$path"
     fi
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.