BUG: fix all RPATHs that start with $ORIGIN

Some library may contain RPATH like '$ORIGIN/../src' and should be fixed as well
Fixes: #509

mesonpy/_rpath.py

@@ -27,8 +27,8 @@ def _set_rpath(filepath: Path, rpath: Iterable[str]) -> None:
 
     def fix_rpath(filepath: Path, libs_relative_path: str) -> None:
         rpath = _get_rpath(filepath)
-        if '$ORIGIN/' in rpath:
-            rpath = [('$ORIGIN/' + libs_relative_path if path == '$ORIGIN/' else path) for path in rpath]
+        if any(path.startswith('$ORIGIN/') for path in rpath):
+            rpath = ['$ORIGIN/' + libs_relative_path] + [path for path in rpath if not path.startswith('$ORIGIN/')]
             _set_rpath(filepath, rpath)
 
 
@@ -46,13 +46,21 @@ def _get_rpath(filepath: Path) -> List[str]:
                 rpath_tag = False
         return rpath
 
-    def _replace_rpath(filepath: Path, old: str, new: str) -> None:
-        subprocess.run(['install_name_tool', '-rpath', old, new, os.fspath(filepath)], check=True)
+    def _replace_rpath(filepath: Path, old_rpaths: Iterable[str], new_rpaths: Iterable[str]) -> None:
+        command = ['install_name_tool']
+        for old in old_rpaths:
+            command.extend(['-delete_rpath', old])
+        for new in new_rpaths:
+            command.extend(['-add_rpath', new])
+        command.append(os.fspath(filepath))
+        subprocess.run(command, check=True)
 
     def fix_rpath(filepath: Path, libs_relative_path: str) -> None:
         rpath = _get_rpath(filepath)
-        if '@loader_path/' in rpath:
-            _replace_rpath(filepath, '@loader_path/', '@loader_path/' + libs_relative_path)
+        if any(path.startswith('@loader_path/') for path in rpath):
+            old_rpath = [path for path in rpath if path.startswith('@loader_path/')]
+            new_rpath = ['@loader_path/' + libs_relative_path]
+            _replace_rpath(filepath, old_rpath, new_rpath)
 
 else:
 

tests/packages/link-against-local-lib/examplemod.c

@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include "examplelib.h"
+#include "lib/examplelib.h"
 
 static PyObject* example_sum(PyObject* self, PyObject *args)
 {

tests/packages/link-against-local-lib/lib/meson.build

@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2022 The meson-python developers
+#
+# SPDX-License-Identifier: MIT
+
+example_lib = shared_library(
+    'example',
+    'examplelib.c',
+    install: true,
+)

tests/packages/link-against-local-lib/meson.build

@@ -4,11 +4,7 @@
 
 project('link-against-local-lib', 'c', version: '1.0.0')
 
-example_lib = shared_library(
-    'example',
-    'examplelib.c',
-    install: true,
-)
+subdir('lib')
 
 py = import('python').find_installation()