Skip to content

Commit

Permalink
backends: Add rpath for libraries with versioned soname
Browse files Browse the repository at this point in the history
  • Loading branch information
xclaesse committed Nov 25, 2019
1 parent bbaacc0 commit 14af612
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions mesonbuild/backend/backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,10 @@ def rpaths_for_bundled_shared_libraries(self, target, exclude_system=True):
# No point in adding system paths.
continue
# Windows doesn't support rpaths, but we use this function to
# emulate rpaths by setting PATH, so also accept DLLs here
if os.path.splitext(libpath)[1] not in ['.dll', '.lib', '.so', '.dylib']:
# emulate rpaths by setting PATH, so also accept DLLs here.
# Also match soname in the form libfoo.so[.X[.Y[.Z]]]
if os.path.splitext(libpath)[1] not in ['.dll', '.lib', '.dylib'] and \
not re.match(r'.*\.so(\.[0-9]+)?(\.[0-9]+)?(\.[0-9]+)?$', libpath):
continue
if libdir.startswith(self.environment.get_source_dir()):
rel_to_src = libdir[len(self.environment.get_source_dir()) + 1:]
Expand Down

0 comments on commit 14af612

Please sign in to comment.