Correct relative paths in patchelf --set-rpath

Author: mhsmith

cibuildwheel/platforms/android.py

@@ -8,6 +8,7 @@
 import subprocess
 from collections.abc import Iterable, Iterator
 from dataclasses import dataclass
+from os.path import relpath
 from pathlib import Path
 from pprint import pprint
 from runpy import run_path
@@ -513,7 +514,7 @@ def repair_default(
             call(
                 "patchelf",
                 "--set-rpath",
-                f"${{ORIGIN}}/{libs_dir.relative_to(path.parent)}",
+                f"${{ORIGIN}}/{relpath(libs_dir, path.parent)}",
                 path,
             )
         call("wheel", "pack", unpacked_dir, "-d", repaired_wheel_dir)

pyproject.toml

@@ -45,8 +45,8 @@ dependencies = [
     "filelock",
     "humanize",
     "packaging>=20.9",
-    "pyelftools>=0.29",
     "platformdirs",
+    "pyelftools>=0.29",
     "wheel>=0.33.6",
 ]