auditwheel-emscripten 0.0.16__py3-none-any.whl → 0.1.0__py3-none-any.whl

auditwheel_emscripten/__init__.py

@@ -1,12 +1,12 @@
 from .exports import get_exports
 from .imports import get_imports
-from .repair import copylib, repair, repair_extracted, resolve_sharedlib
+from .repair import copylib, repair, resolve_sharedlib, modify_runtime_path
 from .show import show, show_dylib, show_wheel
 
 __all__ = [
     "repair",
-    "repair_extracted",
     "resolve_sharedlib",
+    "modify_runtime_path",
     "show",
     "show_wheel",
     "show_dylib",

auditwheel_emscripten/cli/main.py

@@ -50,7 +50,7 @@ def _repair(
             wheel_file,
             libdir,
             output_dir,
-            modify_needed_section=False,
+            modify_rpath=True,
         )
         dependencies = show(repaired_wheel)
         pprint(dependencies)

auditwheel_emscripten/emscripten_tools/webassembly.py

@@ -157,6 +157,7 @@ class DylinkType(IntEnum):
     NEEDED = 2
     EXPORT_INFO = 3
     IMPORT_INFO = 4
+    RUNTIME_PATH = 5
 
 
 class InvalidWasmError(BaseException):
@@ -178,6 +179,7 @@ Dylink = namedtuple(
         "needed",
         "export_info",
         "import_info",
+        "runtime_paths",
     ],
 )
 Table = namedtuple("Table", ["elem_type", "limits"])
@@ -332,6 +334,7 @@ class Module:
         needed = []
         export_info = {}
         import_info = {}
+        runtime_paths = []
         self.read_string()  # name
 
         if dylink_section.name == "dylink":
@@ -378,6 +381,12 @@ class Module:
                         import_info.setdefault(module, {})
                         import_info[module][field] = flags
                         count -= 1
+                elif subsection_type == DylinkType.RUNTIME_PATH:
+                    count = self.read_uleb()
+                    while count:
+                        rpath = self.read_string()
+                        runtime_paths.append(rpath)
+                        count -= 1
                 else:
                     print(f"unknown subsection: {subsection_type}")
                     # ignore unknown subsections
@@ -395,6 +404,7 @@ class Module:
             needed,
             export_info,
             import_info,
+            runtime_paths,
         )
 
     @memoize

auditwheel_emscripten/module.py

@@ -76,6 +76,17 @@ class ModuleWritable(webassembly.Module):
         buf.extend(leb128.u.encode(len(subsection_buf)))
         buf.extend(subsection_buf)
 
+        # 5. RUNTIME_PATH
+        subsection_buf = bytearray()
+        subsection_buf.extend(leb128.u.encode(len(dylink.runtime_paths)))
+        for path in dylink.runtime_paths:
+            subsection_buf.extend(leb128.u.encode(len(path.encode())))
+            subsection_buf += path.encode()
+
+        buf.extend(leb128.u.encode(DylinkType.RUNTIME_PATH))
+        buf.extend(leb128.u.encode(len(subsection_buf)))
+        buf.extend(subsection_buf)
+
         section_buf = bytearray()
 
         # custom section
@@ -115,6 +126,29 @@ class ModuleWritable(webassembly.Module):
 
         return patched_module
 
+    def patch_runtime_path(self, runtime_path: Path) -> bytes:
+        curfile = Path(self.filename).resolve()
+
+        relpath = os.path.relpath(runtime_path, curfile.parent)
+        if relpath == ".":
+            realpath_with_prefix = "$ORIGIN"
+        else:
+            realpath_with_prefix = "$ORIGIN/" + Path(relpath).as_posix()
+
+        dylink_section: webassembly.Dylink = self.parse_dylink_section()
+        runtime_paths = dylink_section.runtime_paths
+
+        if realpath_with_prefix not in runtime_paths:
+            runtime_paths = runtime_paths + [realpath_with_prefix]
+
+        patched_dylink_section = dylink_section._replace(
+            runtime_paths=runtime_paths,
+        )
+        encoded_dylink_section = self.encode_dylink_section(patched_dylink_section)
+        patched_module = self.patch_dylink(encoded_dylink_section)
+
+        return patched_module
+
 
 def parse_dylink_section(dylib: Path):
     """
@@ -126,12 +160,9 @@ def parse_dylink_section(dylib: Path):
     return dylink
 
 
-def patch_needed_libs_path(dylib: Path, dep_map: dict[str, Path]):
-    """
-    Patch needed path in dylink section
-    """
+def patch_runtime_path(dylib: Path, runtime_path: Path):
     with ModuleWritable(dylib) as m:
-        patched_module = m.patch_needed_path(dep_map)
+        patched_module = m.patch_runtime_path(runtime_path)
 
     return patched_module
 

auditwheel_emscripten/repair.py

@@ -4,7 +4,7 @@ from collections import deque
 from pathlib import Path
 
 from .lib_utils import get_all_shared_libs_in_dir, libdir_candidates
-from .module import patch_needed_libs_path
+from .module import patch_runtime_path
 from .show import show
 from .wheel_utils import WHEEL_INFO_RE, is_emscripten_wheel, pack, unpack
 
@@ -60,27 +60,33 @@ def copylib(
     return new_dep_map
 
 
-def repair_extracted(
-    wheel_extract_dir: str | Path,
-    dep_map: dict[str, Path],
-    lib_sdir: str,
-) -> dict[str, Path]:
-    dep_map_copied = copylib(wheel_extract_dir, dep_map, lib_sdir)
+def modify_runtime_path(wheel_extract_dir: str | Path, runtime_path: str) -> None:
+    """
+    Patch the runtime path of shared libraries inside the wheel file
+
+    Parameters
+    ----------
+    wheel_extract_dir : str | Path
+        The directory containing the extracted wheel file
+
+    runtime_path : str
+        The target directory name where the shared libraries are located
+    """
+    runtime_path_full = Path(wheel_extract_dir) / runtime_path
+    assert runtime_path_full.exists(), f"lib directory not found: {runtime_path_full}"
 
     shared_libs = get_all_shared_libs_in_dir(wheel_extract_dir)
     for shared_lib in shared_libs:
-        patched_module = patch_needed_libs_path(shared_lib, dep_map_copied)
+        patched_module = patch_runtime_path(shared_lib, runtime_path_full)
         shared_lib.write_bytes(patched_module)
 
-    return dep_map_copied
-
 
 def repair(
     wheel_file: str | Path,
     libdir: str | Path,
     outdir: str | Path | None,
     lib_sdir: str = ".libs",
-    modify_needed_section: bool = False,  # Deprecated
+    modify_rpath: bool = True,
 ) -> Path:
     file = Path(wheel_file)
     if not file.exists():
@@ -101,6 +107,8 @@ def repair(
 
         extract_dir = unpack(str(wheel_file), str(tmpdir))
         copylib(extract_dir, dep_map, lib_sdir)
+        if modify_rpath:
+            modify_runtime_path(extract_dir, lib_sdir)
         pack(str(extract_dir), str(outdir), None)
 
     return outdir / file.name

auditwheel_emscripten/show.py

@@ -21,7 +21,7 @@ def show_wheel_unpacked(wheel_extract_dir: str | Path) -> dict[str, list[str]]:
     shared_libs = get_all_shared_libs_in_dir(wheel_extract_dir)
     for shared_lib in shared_libs:
         deps = show_dylib(shared_lib)
-        dependencies[str(shared_lib.relative_to(wheel_extract_dir))] = deps
+        dependencies[shared_lib.relative_to(wheel_extract_dir).as_posix()] = deps
 
     return dependencies
 

auditwheel_emscripten/wheel_utils.py

@@ -1,13 +1,11 @@
-import io
 import re
-from contextlib import redirect_stdout, contextmanager
-from pathlib import Path
+import subprocess
 import tempfile
+from contextlib import contextmanager
+from pathlib import Path
 from collections.abc import Generator
 
 from packaging.utils import parse_wheel_filename
-from wheel.cli.pack import pack as pack_wheel
-from wheel.cli.unpack import unpack as unpack_wheel
 
 # Copied from auditwheel
 WHEEL_INFO_RE = re.compile(
@@ -61,8 +59,15 @@ def unpack(path: str | Path, dest: str | Path = ".") -> Path:
     path = str(path)
     dest = str(dest)
 
-    with io.StringIO() as buf, redirect_stdout(buf):
-        unpack_wheel(path, dest)
+    result = subprocess.run(
+        ["wheel", "unpack", path, "--dest", dest],
+        check=True,
+        encoding="utf-8",
+        capture_output=True,
+    )
+
+    if result.returncode != 0:
+        raise RuntimeError(f"Failed to unpack wheel: {result.stderr}")
 
     return Path(dest) / parse_wheel_extract_dir(path)
 
@@ -73,9 +78,17 @@ def pack(directory: str | Path, dest_dir: str | Path, build_number: str | None)
     wheel file name can be determined.
     :param directory: The unpacked wheel directory
     :param dest_dir: Destination directory (defaults to the current directory)
+    :param build_number: Optional build number for the wheel
     """
     directory = str(directory)
     dest_dir = str(dest_dir)
 
-    with io.StringIO() as buf, redirect_stdout(buf):
-        pack_wheel(directory, dest_dir, build_number)
+    cmd = ["wheel", "pack", directory, "--dest-dir", dest_dir]
+
+    if build_number is not None:
+        cmd.extend(["--build-number", build_number])
+
+    result = subprocess.run(cmd, check=True, encoding="utf-8", capture_output=True)
+
+    if result.returncode != 0:
+        raise RuntimeError(f"Failed to pack wheel: {result.stderr}")

{auditwheel_emscripten-0.0.16.dist-info → auditwheel_emscripten-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: auditwheel_emscripten
-Version: 0.0.16
+Version: 0.1.0
 Summary: auditwheel-like tool for Pyodide
 Project-URL: Home, https://github.com/ryanking13/auditwheel-emscripten
 Author-email: Gyeongjae Choi <def6488@gmail.com>
@@ -378,7 +378,7 @@ License: Mozilla Public License Version 2.0
           This Source Code Form is "Incompatible With Secondary Licenses", as
           defined by the Mozilla Public License, v. 2.0.
 License-File: LICENSE
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Requires-Dist: leb128
 Requires-Dist: packaging
 Requires-Dist: pyodide-cli
@@ -407,7 +407,7 @@ auditwheel-emscripten is a tiny tool to facilitate the creation of Python wheel
 Python-in-the-browser using Emscripten.
 
 - `pyodide auditwheel show`: shows external shared libraries that the wheel depends on.
-- `pyodide auditwheel repair`: copies these external shared libraries into the wheel itself.
+- `pyodide auditwheel repair`: copies these external shared libraries into the wheel itself, and update the RPATH of the WASM module correspondingly.
 
 ## Usage (CLI)
 

auditwheel_emscripten-0.1.0.dist-info/RECORD

@@ -0,0 +1,22 @@
+auditwheel_emscripten/__init__.py,sha256=JAjlFQMSqCJ8k0kuA2DVuxRuPGWMrrP_HRkXXoTuuTs,371
+auditwheel_emscripten/exports.py,sha256=cB-vj6uYJlF9hLHs04SujDI72zkWBcUGZxeTjRWPMDM,1821
+auditwheel_emscripten/function_type.py,sha256=fE-ogFAhS07M-3LM1t5KCRYJtJq570zc898boO4NOYE,831
+auditwheel_emscripten/imports.py,sha256=YI8KItf1qujmycSLb7c7igpCBXNqJAJVUIH3H8HY-Ns,1821
+auditwheel_emscripten/lib_utils.py,sha256=4qodvz1go0tgHZA803Q3vcIR-QQbOdqSR0p2wo7wjrA,682
+auditwheel_emscripten/module.py,sha256=wwLAzlhGKgGojNvUdommO7FGfME49rWVRZOPRp77qjU,6619
+auditwheel_emscripten/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auditwheel_emscripten/repair.py,sha256=CvTj2SobzAfQjKbXPqvPe7lWRPD9DTHEfJFpHuQD7KY,3755
+auditwheel_emscripten/show.py,sha256=TTulud3juo1QPo7avIa0K_nOR7iYBAVIMpUdXKaLLVI,1714
+auditwheel_emscripten/wasm_utils.py,sha256=-IuAWiPPOkWmPpaW4u3tyxttpP0ZTWeKk0VMh1dj384,220
+auditwheel_emscripten/wheel_utils.py,sha256=_uh8MiKYpjtBcpOE5bG2vEfh9eXlZhz-nMMVo6-Fvl8,2995
+auditwheel_emscripten/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auditwheel_emscripten/cli/main.py,sha256=rhJoQCu8uL_CPevF3vIrZ6c3IsDILTgxW8JNfc5lADY,4043
+auditwheel_emscripten/emscripten_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+auditwheel_emscripten/emscripten_tools/diagnostics.py,sha256=fG8kS7BByJKwC3JJrfJc0TB1EDV4W--LQwcf4fnN0GI,7072
+auditwheel_emscripten/emscripten_tools/utils.py,sha256=sAcW8WaxfN0lNA64y9d0_CsdfYecV_YUcN6nrDrMmMs,3316
+auditwheel_emscripten/emscripten_tools/webassembly.py,sha256=ppyx_lzgtve2hCDn8jQn1Wto_2pGv-Kk-CcOhqUB8NQ,17408
+auditwheel_emscripten-0.1.0.dist-info/METADATA,sha256=6ofoErOVppyKzcdUEdCT_7rftjfEVFSvTjfmY-62o-M,27093
+auditwheel_emscripten-0.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+auditwheel_emscripten-0.1.0.dist-info/entry_points.txt,sha256=Jok5wALksOWKJv8BRV2Riozxts_stW2n-ud9uHTNCB8,62
+auditwheel_emscripten-0.1.0.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+auditwheel_emscripten-0.1.0.dist-info/RECORD,,

{auditwheel_emscripten-0.0.16.dist-info → auditwheel_emscripten-0.1.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

auditwheel_emscripten-0.0.16.dist-info/RECORD

@@ -1,22 +0,0 @@
-auditwheel_emscripten/__init__.py,sha256=wJIPBZjANSL17sOF2-hXWcExAGhGDKPzHHud-yRd-GU,365
-auditwheel_emscripten/exports.py,sha256=cB-vj6uYJlF9hLHs04SujDI72zkWBcUGZxeTjRWPMDM,1821
-auditwheel_emscripten/function_type.py,sha256=fE-ogFAhS07M-3LM1t5KCRYJtJq570zc898boO4NOYE,831
-auditwheel_emscripten/imports.py,sha256=YI8KItf1qujmycSLb7c7igpCBXNqJAJVUIH3H8HY-Ns,1821
-auditwheel_emscripten/lib_utils.py,sha256=4qodvz1go0tgHZA803Q3vcIR-QQbOdqSR0p2wo7wjrA,682
-auditwheel_emscripten/module.py,sha256=9bZ6eEMB5k7QUyOHWb4ni5m_ROPPieGKulseweCbGOk,5353
-auditwheel_emscripten/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auditwheel_emscripten/repair.py,sha256=rvmsx8pJkRX3yFiePOxUpfGIQ7Y18hLzQ41mXDeHD1w,3387
-auditwheel_emscripten/show.py,sha256=x7juLK0AxHZkEpbXIHGK91mC6Z_OFVLcuphBHoW-LHQ,1708
-auditwheel_emscripten/wasm_utils.py,sha256=-IuAWiPPOkWmPpaW4u3tyxttpP0ZTWeKk0VMh1dj384,220
-auditwheel_emscripten/wheel_utils.py,sha256=pp40x9umTCsSyQHygKvkRMlRm9Sx_1S6zzwvriFXwPI,2634
-auditwheel_emscripten/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auditwheel_emscripten/cli/main.py,sha256=IsPyZbiEPNXc3pirHtSL2jA4uip8EzYdcRZznfnnx-E,4053
-auditwheel_emscripten/emscripten_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auditwheel_emscripten/emscripten_tools/diagnostics.py,sha256=fG8kS7BByJKwC3JJrfJc0TB1EDV4W--LQwcf4fnN0GI,7072
-auditwheel_emscripten/emscripten_tools/utils.py,sha256=sAcW8WaxfN0lNA64y9d0_CsdfYecV_YUcN6nrDrMmMs,3316
-auditwheel_emscripten/emscripten_tools/webassembly.py,sha256=qFsTPSCrtVdiCISMF-CPyrGGxxKqN4QW4Bn2UsMEaGc,17027
-auditwheel_emscripten-0.0.16.dist-info/METADATA,sha256=mefeJkMKxCvio9gXhgHbg1ISPGHvj0eNCzWjuMQn_qc,27037
-auditwheel_emscripten-0.0.16.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-auditwheel_emscripten-0.0.16.dist-info/entry_points.txt,sha256=Jok5wALksOWKJv8BRV2Riozxts_stW2n-ud9uHTNCB8,62
-auditwheel_emscripten-0.0.16.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-auditwheel_emscripten-0.0.16.dist-info/RECORD,,