fix: always set RPATH or clear RUNPATH/RPATH for grafted libraries

src/auditwheel/elfutils.py

@@ -5,8 +5,6 @@
 from elftools.common.exceptions import ELFError
 from elftools.elf.elffile import ELFFile
 
-from auditwheel.lddtree import parse_ld_paths
-
 if TYPE_CHECKING:
     from collections.abc import Iterable, Iterator
     from pathlib import Path
@@ -106,24 +104,6 @@ def elf_is_python_extension(fn: Path, elf: ELFFile) -> tuple[bool, int | None]:
     return False, None
 
 
-def elf_read_rpaths(fn: Path) -> dict[str, list[str]]:
-    result: dict[str, list[str]] = {"rpaths": [], "runpaths": []}
-
-    with fn.open("rb") as f:
-        elf = ELFFile(f)
-        section = elf.get_section_by_name(".dynamic")
-        if section is None:
-            return result
-
-        for t in section.iter_tags():
-            if t.entry.d_tag == "DT_RPATH":
-                result["rpaths"] = parse_ld_paths(t.rpath, root="/", path=str(fn))
-            elif t.entry.d_tag == "DT_RUNPATH":
-                result["runpaths"] = parse_ld_paths(t.runpath, root="/", path=str(fn))
-
-    return result
-
-
 def get_undefined_symbols(path: Path) -> set[str]:
     undef_symbols = set()
     with path.open("rb") as f:

src/auditwheel/patcher.py

@@ -26,6 +26,9 @@ def set_rpath(self, file_name: Path, rpath: str) -> None:
     def get_rpath(self, file_name: Path) -> str:
         raise NotImplementedError
 
+    def clear_rpath(self, file_name: Path) -> None:
+        raise NotImplementedError
+
 
 def _verify_patchelf() -> None:
     """This function looks for the ``patchelf`` external binary in the PATH,
@@ -74,8 +77,12 @@ def set_soname(self, file_name: Path, new_so_name: str) -> None:
         check_call(["patchelf", "--set-soname", new_so_name, file_name])
 
     def set_rpath(self, file_name: Path, rpath: str) -> None:
+        # we only want an RPATH, remove RUNPATH/RPATH altogether in a 1st pass
         check_call(["patchelf", "--remove-rpath", file_name])
         check_call(["patchelf", "--force-rpath", "--set-rpath", rpath, file_name])
 
     def get_rpath(self, file_name: Path) -> str:
         return check_output(["patchelf", "--print-rpath", file_name]).decode("utf-8").strip()
+
+    def clear_rpath(self, file_name: Path) -> None:
+        check_call(["patchelf", "--remove-rpath", file_name])

src/auditwheel/repair.py

@@ -11,7 +11,7 @@
 from subprocess import check_call
 from typing import TYPE_CHECKING
 
-from auditwheel.elfutils import elf_read_dt_needed, elf_read_rpaths
+from auditwheel.elfutils import elf_read_dt_needed
 from auditwheel.hashfile import hashfile
 from auditwheel.lddtree import LIBPYTHON_RE
 from auditwheel.policy import get_replace_platforms
@@ -112,14 +112,18 @@ def repair_wheel(
         # they may have internal dependencies (DT_NEEDED) on one another, so
         # we need to update those records so each now knows about the new
         # name of the other.
+        # we also clear or set RPATH depending on the presence of internal dependencies
         for _, path in soname_map.values():
-            needed = elf_read_dt_needed(path)
+            needed = elf_read_dt_needed(path)  # TODO perf, we already read those at some point
             replacements = []
             for n in needed:
                 if n in soname_map:
                     replacements.append((n, soname_map[n][0]))
             if replacements:
+                patcher.set_rpath(path, "$ORIGIN")
                 patcher.replace_needed(path, *replacements)
+            else:
+                patcher.clear_rpath(path)
 
         if update_tags:
             output_wheel = add_platforms(ctx, abis, get_replace_platforms(abis[0]))
@@ -156,8 +160,6 @@ def copylib(src_path: Path, dest_dir: Path, patcher: ElfPatcher) -> tuple[str, P
 
     1) Copy the file from src_path to dest_dir/
     2) Rename the shared object from soname to soname.<unique>
-    3) If the library has a RUNPATH/RPATH, clear it and set RPATH to point to
-    its new location.
     """
     # Copy the a shared library from the system (src_path) into the wheel
     # if the library has a RUNPATH/RPATH we clear it and set RPATH to point to
@@ -175,17 +177,13 @@ def copylib(src_path: Path, dest_dir: Path, patcher: ElfPatcher) -> tuple[str, P
         return new_soname, dest_path
 
     logger.debug("Grafting: %s -> %s", src_path, dest_path)
-    rpaths = elf_read_rpaths(src_path)
     shutil.copy2(src_path, dest_path)
     statinfo = dest_path.stat()
     if not statinfo.st_mode & stat.S_IWRITE:
         dest_path.chmod(statinfo.st_mode | stat.S_IWRITE)
 
     patcher.set_soname(dest_path, new_soname)
 
-    if any(itertools.chain(rpaths["rpaths"], rpaths["runpaths"])):
-        patcher.set_rpath(dest_path, "$ORIGIN")
-
     return new_soname, dest_path
 
 

tests/unit/test_elfutils.py

@@ -11,7 +11,6 @@
     elf_find_ucs2_symbols,
     elf_find_versioned_symbols,
     elf_read_dt_needed,
-    elf_read_rpaths,
     elf_references_pyfpe_jbuf,
     get_undefined_symbols,
 )
@@ -231,20 +230,6 @@ def test_elf_references_pyfpe_jbuf_no_section(self):
         assert elf_references_pyfpe_jbuf(elf) is False
 
 
-@patch("auditwheel.elfutils.ELFFile")
-class TestElfReadRpaths:
-    def test_missing_dynamic_section(self, elffile_mock, tmp_path):
-        fake = tmp_path / "fake.so"
-
-        # GIVEN
-        fake.touch()
-        elffile_mock.return_value.get_section_by_name.return_value = None
-
-        # THEN
-        result = elf_read_rpaths(fake)
-        assert result == {"rpaths": [], "runpaths": []}
-
-
 @patch("auditwheel.elfutils.ELFFile")
 class TestGetUndefinedSymbols:
     def test_missing_dynsym_section(self, elffile_mock, tmp_path):