X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=buildtools%2Fwafsamba%2Fsymbols.py;h=3eca3d46bd71cf0780b3c8e36a26b96bd3aa3b83;hb=2291679e2b02e729e34ef848164d6630c5adc546;hp=505c0bac7eac58fa487676ba3ff8b3321a189f09;hpb=4843a27bbc2f2017314ad9508d61ac4c44330e77;p=samba.git diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py index 505c0bac7ea..3eca3d46bd7 100644 --- a/buildtools/wafsamba/symbols.py +++ b/buildtools/wafsamba/symbols.py @@ -120,7 +120,8 @@ def find_ldd_path(bld, libname, binary): # some regular expressions for parsing readelf output re_sharedlib = re.compile(b'Shared library: \[(.*)\]') -re_rpath = re.compile(b'Library rpath: \[(.*)\]') +# output from readelf could be `Library rpath` or `Libray runpath` +re_rpath = re.compile(b'Library (rpath|runpath): \[(.*)\]') def get_libs(bld, binname): '''find the list of linked libraries for any binary or library @@ -147,7 +148,7 @@ def get_libs(bld, binname): m = re_rpath.search(line) if m: # output from Popen is always bytestr even in py3 - rpath.extend(m.group(1).split(b":")) + rpath.extend(m.group(2).split(b":")) ret = set() for lib in libs: