[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects

Michael Stahl mstahl at redhat.com
Tue Oct 11 17:41:03 UTC 2016


 bin/check-elf-dynamic-objects |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc47854ebd5c3098965dccdc2cadf3a6f01b0576
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 11 18:03:14 2016 +0200

    check-elf-dynamic-objects: OpenSuSE uses DT_RUNPATH, not DT_RPATH
    
    ... like Fedora, so check for either.
    
    Change-Id: I0e88c8e6e7634e7cc483474bc3f654e666c3bab2

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 7d444ee..32cff57 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -130,7 +130,7 @@ local file="$1"
         ;;
     esac
     if test "${skip}" = 0 && readelf -d "${file}" &> /dev/null ; then
-        rpath=$(readelf -d "${file}" | grep '(RPATH)' || true)
+        rpath=$(readelf -d "${file}" | grep '(\(RPATH\|RUNPATH\))' || true)
         neededs=$(readelf -d "${file}" | grep '(NEEDED)' | sed -e 's/.*\[\(.*\)\]$/\1/')
         neededsinternal=
         for needed in ${neededs}


More information about the Libreoffice-commits mailing list