diff options
| author | park <sk7.park@samsung.com> | 2016-08-30 22:34:32 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-08-30 22:34:32 -0700 |
| commit | c2aa542a8723381a336e4e3ecdc7ccbe764013da (patch) | |
| tree | 569ff4f29d08269625f2a9c438e866fc5e19d875 | |
| parent | cf46d13badfe863ff0243162f9704c68108bda9f (diff) | |
| parent | a3b33f5dbe43d8b16b4ede2d459184ed693541b3 (diff) | |
| download | icecream-c2aa542a8723381a336e4e3ecdc7ccbe764013da.tar.gz icecream-c2aa542a8723381a336e4e3ecdc7ccbe764013da.tar.bz2 icecream-c2aa542a8723381a336e4e3ecdc7ccbe764013da.zip | |
Merge "icecc-create-env: execute ldd on original files" into tizen_base
| -rwxr-xr-x | client/icecc-create-env | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/client/icecc-create-env b/client/icecc-create-env index 718e55c..e185636 100755 --- a/client/icecc-create-env +++ b/client/icecc-create-env @@ -42,6 +42,11 @@ add_file () # Only call ldd when it makes sense if file -L "$path" | grep 'ELF' > /dev/null 2>&1; then if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then + # Tizen + binarypath=$path + if [[ $binarypath == /emul* ]]; then + binarypath=$name + fi # ldd now outputs ld as /lib/ld-linux.so.xx on current nptl based glibc # this regexp parse the outputs like: # ldd /usr/bin/gcc @@ -49,7 +54,7 @@ add_file () # libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000) # /lib/ld-linux.so.2 (0xb7fe8000) # covering both situations ( with => and without ) - for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do + for lib in `ldd "$binarypath" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do test -f "$lib" || continue # Check wether the same library also exists in the parent directory, # and prefer that on the assumption that it is a more generic one. |