relenv 0.22.0__py3-none-any.whl → 0.22.2__py3-none-any.whl

relenv/pyversions.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Versions utility.
@@ -947,6 +947,54 @@ def python_versions(
     return {version: pyversions[str(version)] for version in versions}
 
 
+def get_default_python_version() -> str:
+    """
+    Get the default Python version to use when none is specified.
+
+    :return: The default Python version string (e.g., "3.10.19")
+    """
+    # Default to latest 3.10 version
+    pyversions = python_versions("3.10")
+    if not pyversions:
+        raise RuntimeError("No 3.10 versions found")
+    latest = sorted(list(pyversions.keys()))[-1]
+    return str(latest)
+
+
+def resolve_python_version(version_spec: str | None = None) -> str:
+    """
+    Resolve a Python version specification to a full version string.
+
+    If version_spec is None, returns the latest Python 3.10 version.
+    If version_spec is partial (e.g., "3.10"), returns the latest micro version.
+    If version_spec is full (e.g., "3.10.19"), returns it as-is after validation.
+
+    :param version_spec: Version specification (None, "3.10", or "3.10.19")
+    :return: Full version string (e.g., "3.10.19")
+    :raises RuntimeError: If the version is not found
+    """
+    if version_spec is None:
+        # Default to latest 3.10 version
+        return get_default_python_version()
+
+    requested = Version(version_spec)
+
+    if requested.micro is not None:
+        # Full version specified - validate it exists
+        pyversions = python_versions()
+        if requested not in pyversions:
+            raise RuntimeError(f"Unknown version {requested}")
+        return str(requested)
+    else:
+        # Partial version (major.minor) - get latest micro
+        pyversions = python_versions(version_spec)
+        if not pyversions:
+            raise RuntimeError(f"Unknown minor version {requested}")
+        # Return the latest version for this major.minor
+        latest = sorted(list(pyversions.keys()))[-1]
+        return str(latest)
+
+
 def setup_parser(
     subparsers: argparse._SubParsersAction[argparse.ArgumentParser],
 ) -> None:

relenv/relocate.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 A script to ensure the proper rpaths are in place for the relenv environment.
@@ -264,6 +264,34 @@ def is_in_dir(
     return os.path.realpath(filepath).startswith(os.path.realpath(directory) + os.sep)
 
 
+def remove_rpath(path: str | os.PathLike[str]) -> bool:
+    """
+    Remove the rpath from a given ELF file.
+
+    :param path: The path to an ELF file
+    :type path: str
+
+    :return: True if successful, False otherwise
+    :rtype: bool
+    """
+    old_rpath = parse_rpath(path)
+    if not old_rpath:
+        # No RPATH to remove
+        return True
+
+    log.info("Remove RPATH from %s (was: %s)", path, old_rpath)
+    proc = subprocess.run(
+        ["patchelf", "--remove-rpath", path],
+        stderr=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+    )
+
+    if proc.returncode:
+        log.error("Failed to remove RPATH from %s: %s", path, proc.stderr.decode())
+        return False
+    return True
+
+
 def patch_rpath(
     path: str | os.PathLike[str],
     new_rpath: str,
@@ -325,6 +353,7 @@ def handle_elf(
         root = libs
     proc = subprocess.run(["ldd", path], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
     needs_rpath = False
+
     for line in proc.stdout.decode().splitlines():
         if line.find("=>") == -1:
             log.debug("Skip ldd output line: %s", line)
@@ -371,7 +400,9 @@ def handle_elf(
         log.info("Adjust rpath of %s to %s", path, relpath)
         patch_rpath(path, relpath)
     else:
-        log.info("Do not adjust rpath of %s", path)
+        # No relenv libraries are linked, so RPATH is not needed
+        # Remove any existing RPATH to avoid security/correctness issues
+        remove_rpath(path)
 
 
 def main(
@@ -420,6 +451,7 @@ def main(
                 if path in processed:
                     continue
                 log.debug("Checking %s", path)
+
                 if is_macho(path):
                     log.info("Found Mach-O %s", path)
                     _ = handle_macho(path, libs_dir, rpath_only)

relenv/runtime.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 This code is run when initializing the python interperter in a Relenv environment.
@@ -1270,3 +1270,8 @@ def bootstrap() -> None:
     setup_crossroot()
     install_cargo_config()
     sys.meta_path = [importer] + sys.meta_path
+
+    # For Python 3.13+, sysconfig became a package so the importer doesn't
+    # intercept it. Manually wrap it here.
+    if sys.version_info >= (3, 13):
+        wrap_sysconfig("sysconfig")

relenv/toolchain.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 The ``relenv toolchain`` command.

{relenv-0.22.0.dist-info → relenv-0.22.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: relenv
-Version: 0.22.0
+Version: 0.22.2
 Project-URL: Source Code, https://github.com/saltstack/relative-environment-for-python
 Project-URL: Documentation, https://relenv.readthedocs.io/en/latest/
 Project-URL: Changelog, https://relenv.readthedocs.io/en/latest/changelog.html

relenv-0.22.2.dist-info/RECORD

@@ -0,0 +1,48 @@
+relenv/__init__.py,sha256=LmJZKtCS7hgyl9VIIT4qiIXj8YX1fJKY0qJUi2UtwgA,325
+relenv/__main__.py,sha256=gLR88_GYmdpyuppoaCq-W0SPetEOQFisQglcQZSGROg,1538
+relenv/buildenv.py,sha256=I7ZyWxO6RZveaCQtqwBPpUW1XdMLwmuPfww5dfzRgwM,4120
+relenv/check.py,sha256=m3KkTS6LQkvRwexVqqGQ4_A7GQU-dAmcF8EQDu_K67c,1133
+relenv/common.py,sha256=ZAOmSh74HYx9CAYA5mnz1EHqsDEa_pwjfctiyt44x00,35826
+relenv/create.py,sha256=6Q3m1MkeYyeH48UM6wYhvTlhHRRA73ZA34LfvNe0Ylk,7934
+relenv/fetch.py,sha256=cnkPJiPlttiWOm7Olt4R23RAu_IzzcUsq1H-yHoPbow,2791
+relenv/manifest.py,sha256=xyMHWao_I3j7gCyweES3I50830efacxZI3KumuPfyvU,1057
+relenv/python-versions.json,sha256=axX8aDQhLwdQn55WRYc5JbQd9_qV9yw6Syue-7ieWh8,14571
+relenv/pyversions.py,sha256=euMZcELZsM612c4D3PD9dad4ScFbh0S54dRnbf7BHJg,43032
+relenv/relocate.py,sha256=gsLMbgvCYqHXGZ5ZDBUsvVEYrefken0D5v9bJ93j-qA,14003
+relenv/runtime.py,sha256=-3CE8v_g6flBHqldMmYM4XCTGAYbDuui3JX-o6dI93M,40035
+relenv/toolchain.py,sha256=vbL79grOsThEsstYpx1fZxo3EuliDj5UHcsTpEgdWXo,929
+relenv/_resources/xz/config.h,sha256=2IofvMqyAa8xBaQb6QGStiUugMmjyUCq_Of5drh7fro,4117
+relenv/_resources/xz/readme.md,sha256=aOs7hz9RhTnTwHUt6gbO-2Sl0xLKIJp8-w6Du4VIFgY,258
+relenv/_scripts/install_vc_build.ps1,sha256=ir1bcz7rNOuFw4E5_AqBidiKS0SpPViXW7zaanRPCoM,7629
+relenv/build/__init__.py,sha256=0Gre5oainAdkw4Bfc54V4Dwrjz4a5_hiICeEil9D-Cw,6157
+relenv/build/darwin.py,sha256=n1ff-NLFlcN3_fqeJUOPnBC6HODT5Y-gvWjQ3UpdXsE,7136
+relenv/build/linux.py,sha256=UD1b-bTri9lF3iaoibOFO2vzF-6GpubO38_65hvmqtY,26161
+relenv/build/windows.py,sha256=-HO2MIxI3P8u3lde92KRBOM-zP4y9zyy8Xp7pULd3Es,16102
+relenv/build/common/__init__.py,sha256=PUAaLAv_1zIGJcGb77jGhSZ1PdawJF6DH4RMRKamh7U,1004
+relenv/build/common/_sysconfigdata_template.py,sha256=NaJkmEKIj8Uhf7Cs82FyrMd2CyZVh-Ri8mE3Pm8jxo0,1955
+relenv/build/common/builder.py,sha256=vFujUxp_cq-miBZD6RLS3yta7158DbiQM0zZg593IDQ,31000
+relenv/build/common/builders.py,sha256=2ajiN3gjjIsQ6TFuEvUCzizL_XKnvx0F9qeuak658ho,4772
+relenv/build/common/download.py,sha256=oFmwYhdRlWvQMPju5ByjCTEsbxmH8ENFXilnZKY7c6U,10479
+relenv/build/common/install.py,sha256=nXFxncnJQKlaell3Ps3LnjmVyGpS8KVuRWSMWrdjJHA,19299
+relenv/build/common/ui.py,sha256=FebuZVSioSHGzTUyOSepFRkZzKN-SxchjXsM5tTLApI,14192
+relenv-0.22.2.dist-info/licenses/LICENSE.md,sha256=T0SRk3vJM1YcAJjDz9vsX9gsCRatAVSBS7LeU0tklRM,9919
+relenv-0.22.2.dist-info/licenses/NOTICE,sha256=Ns0AybPHBsgJKJJfjE6YnGgWEQQ9F7lQ6QNlYLlQT3E,548
+tests/__init__.py,sha256=FdZLbBoaMwwgwYwDI9ozQnuT7FHQ7ae8MhQrsP3tVyQ,70
+tests/_pytest_typing.py,sha256=cOGrU7it8H-2F198AT3bHf1Un8K3PzYvQgDs2PCmFb8,1204
+tests/conftest.py,sha256=tccQCx1DLwftaJCnNLrBkyOmj-a_13nvayUG0KEkSzg,2628
+tests/test_build.py,sha256=KR1jci5fWyA3yWAavnh3QowdPyYF_b0IURkhoe4YA0E,14992
+tests/test_common.py,sha256=CJPpgP0euIOTFatZ2GmrR-TrJ1d2Hv_W8iaVpkNcuAc,18008
+tests/test_create.py,sha256=iW26qyApMHTfOVa_X2LFsWeBIaaGo1pk8m1xaSOhGdA,6849
+tests/test_downloads.py,sha256=A4caZk4HUdMPPS83toxx7FM6sXy4etxMqeKcDDx-gNc,3528
+tests/test_fips_photon.py,sha256=Y39E1LUndDn3_w4Ir9gkYwxAIHlH8fWPvDI1GRNFh_g,1397
+tests/test_module_imports.py,sha256=erwMhcRK-HMFjmVQoewQSLBtjes2KpZfiFAXgvK_Nt4,1354
+tests/test_pyversions_runtime.py,sha256=CTlGySCCLTuk1I4KFftr2S37gnPvpYubNun8oIRv5BU,8978
+tests/test_relocate.py,sha256=eWgocPhQoU9zAItdLN9yp45j0ura6IPsCmmkuLOOCGU,13402
+tests/test_relocate_module.py,sha256=LslZSILgSAgLZ_wSepIlTFqb7AIkXTNGLWiPiNh5ffE,7802
+tests/test_runtime.py,sha256=5anHdx92Je38XBb-_rDxwtAatgLk7U843s_ZFQ2YzTA,71990
+tests/test_verify_build.py,sha256=2PyWNedqgc4RcvmicLhSnWr1GoFbVKh4W9tWUmPw_iQ,67827
+relenv-0.22.2.dist-info/METADATA,sha256=WyqgcOFBqd_9VISxlNR-1Ga2gqyvM41fl0JYkHb6yvg,1360
+relenv-0.22.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+relenv-0.22.2.dist-info/entry_points.txt,sha256=dO66nWPPWl8ALWWnZFlHKAo6mfPFuQid7purYWL2ddc,48
+relenv-0.22.2.dist-info/top_level.txt,sha256=P4Ro6JLZE53ZdsQ76o2OzBcpb0MaVJmbfr0HAn9WF8M,13
+relenv-0.22.2.dist-info/RECORD,,

tests/__init__.py

@@ -1,2 +1,2 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0

tests/_pytest_typing.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Typed helper wrappers for common pytest decorators so mypy understands them.

tests/conftest.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 import logging

tests/test_build.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 import hashlib
 import logging

tests/test_common.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 from __future__ import annotations
 
@@ -464,10 +464,72 @@ def test_makepath_oserror() -> None:
     assert case == os.path.normcase(expected)
 
 
+def test_toolchain_respects_relenv_data(
+    tmp_path: pathlib.Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """
+    Test that RELENV_DATA environment variable controls toolchain location.
+
+    This is a regression test for issue #XXX where RELENV_DATA was ignored
+    in version 0.20.2+ after toolchains were moved to a cache directory.
+    When RELENV_DATA is set (as in saltstack CI pipelines), the toolchain
+    should be found in $RELENV_DATA/toolchain, not in the cache directory.
+    """
+    data_dir = tmp_path / "custom_data"
+    triplet = "x86_64-linux-gnu"
+    toolchain_path = data_dir / "toolchain" / triplet
+    toolchain_path.mkdir(parents=True)
+
+    # Patch sys.platform to simulate Linux
+    monkeypatch.setattr(sys, "platform", "linux")
+    monkeypatch.setattr(
+        relenv.common, "get_triplet", lambda machine=None, plat=None: triplet
+    )
+
+    # Set RELENV_DATA environment variable
+    monkeypatch.setenv("RELENV_DATA", str(data_dir))
+
+    # Patch DATA_DIR to reflect the new RELENV_DATA value
+    monkeypatch.setattr(relenv.common, "DATA_DIR", data_dir)
+
+    # Verify toolchain_root_dir returns DATA_DIR/toolchain
+    from relenv.common import toolchain_root_dir
+
+    result = toolchain_root_dir()
+    assert result == data_dir / "toolchain"
+
+
+def test_toolchain_uses_cache_without_relenv_data(
+    tmp_path: pathlib.Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """
+    Test that toolchain uses cache directory when RELENV_DATA is not set.
+
+    When RELENV_DATA is not set, the toolchain should be stored in the
+    cache directory (~/.cache/relenv/toolchains or $XDG_CACHE_HOME/relenv/toolchains)
+    to allow reuse across different relenv environments.
+    """
+    cache_dir = tmp_path / ".cache" / "relenv" / "toolchains"
+
+    # Patch sys.platform to simulate Linux
+    monkeypatch.setattr(sys, "platform", "linux")
+
+    # Remove RELENV_DATA if set
+    monkeypatch.delenv("RELENV_DATA", raising=False)
+
+    # Set XDG_CACHE_HOME to control cache location
+    monkeypatch.setenv("XDG_CACHE_HOME", str(tmp_path / ".cache"))
+
+    from relenv.common import toolchain_root_dir
+
+    result = toolchain_root_dir()
+    assert result == cache_dir
+
+
 def test_copyright_headers() -> None:
     """Verify all Python source files have the correct copyright header."""
     expected_header = (
-        "# Copyright 2022-2025 Broadcom.\n" "# SPDX-License-Identifier: Apache-2.0\n"
+        "# Copyright 2022-2026 Broadcom.\n" "# SPDX-License-Identifier: Apache-2.0\n"
     )
 
     # Find all Python files in relenv/ and tests/

tests/test_create.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 import os

tests/test_downloads.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 import pathlib
 import subprocess

tests/test_fips_photon.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 import os

tests/test_module_imports.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 from __future__ import annotations

tests/test_pyversions_runtime.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 from __future__ import annotations
@@ -175,3 +175,80 @@ def test_detect_xz_versions(monkeypatch: pytest.MonkeyPatch) -> None:
     assert "5.6.3" in versions
     # Verify sorting (latest first)
     assert versions[0] == "5.8.1"
+
+
+def test_resolve_python_version_none_defaults_to_latest_310() -> None:
+    """Test that None resolves to the latest 3.10 version."""
+    result = pyversions.resolve_python_version(None)
+    assert result.startswith("3.10.")
+    # Verify it's a valid version in the registry
+    versions = pyversions.python_versions("3.10")
+    assert pyversions.Version(result) in versions
+    # Verify it's the latest 3.10 version
+    latest = sorted(list(versions.keys()))[-1]
+    assert result == str(latest)
+
+
+def test_resolve_python_version_partial_minor() -> None:
+    """Test that partial versions (3.10) resolve to latest micro."""
+    result = pyversions.resolve_python_version("3.10")
+    assert result.startswith("3.10.")
+    # Verify it resolves to the latest micro version
+    versions = pyversions.python_versions("3.10")
+    latest = sorted(list(versions.keys()))[-1]
+    assert result == str(latest)
+
+
+def test_resolve_python_version_different_minors() -> None:
+    """Test resolution works for different minor versions."""
+    result_311 = pyversions.resolve_python_version("3.11")
+    assert result_311.startswith("3.11.")
+
+    result_313 = pyversions.resolve_python_version("3.13")
+    assert result_313.startswith("3.13.")
+
+    # Verify they're different
+    assert result_311 != result_313
+
+    # Verify each is the latest for its minor version
+    versions_311 = pyversions.python_versions("3.11")
+    latest_311 = sorted(list(versions_311.keys()))[-1]
+    assert result_311 == str(latest_311)
+
+    versions_313 = pyversions.python_versions("3.13")
+    latest_313 = sorted(list(versions_313.keys()))[-1]
+    assert result_313 == str(latest_313)
+
+
+def test_resolve_python_version_full_version() -> None:
+    """Test that full versions are validated and returned as-is."""
+    # Get any valid version from the registry
+    all_versions = pyversions.python_versions()
+    some_version = str(next(iter(all_versions)))
+
+    result = pyversions.resolve_python_version(some_version)
+    assert result == some_version
+
+
+def test_resolve_python_version_invalid_full_version() -> None:
+    """Test that invalid full versions raise RuntimeError."""
+    with pytest.raises(RuntimeError, match="Unknown version"):
+        pyversions.resolve_python_version("3.10.999")
+
+
+def test_resolve_python_version_invalid_minor_version() -> None:
+    """Test that invalid minor versions raise RuntimeError."""
+    with pytest.raises(RuntimeError, match="Unknown minor version"):
+        pyversions.resolve_python_version("3.99")
+
+
+def test_resolve_python_version_consistency() -> None:
+    """Test that resolve_python_version is idempotent for full versions."""
+    # Get a valid full version from the registry
+    all_versions = pyversions.python_versions()
+    some_version = str(next(iter(all_versions)))
+
+    # Resolving a full version twice should give the same result
+    first = pyversions.resolve_python_version(some_version)
+    second = pyversions.resolve_python_version(first)
+    assert first == second

tests/test_relocate.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 import pathlib
 import shutil
@@ -16,6 +16,7 @@ from relenv.relocate import (
     main,
     parse_readelf_d,
     patch_rpath,
+    remove_rpath,
 )
 
 pytestmark = [
@@ -276,3 +277,87 @@ def test_handle_elf_rpath_only(tmp_path: pathlib.Path) -> None:
                 assert not (proj.libs_dir / "fake.so.2").exists()
                 assert patch_rpath_mock.call_count == 1
                 patch_rpath_mock.assert_called_with(str(pybin), "$ORIGIN/../lib")
+
+
+def test_remove_rpath_with_existing_rpath(tmp_path: pathlib.Path) -> None:
+    """Test that remove_rpath removes an existing RPATH."""
+    path = str(tmp_path / "test.so")
+    with patch("subprocess.run", return_value=MagicMock(returncode=0)):
+        with patch(
+            "relenv.relocate.parse_rpath",
+            return_value=["/some/absolute/path"],
+        ):
+            assert remove_rpath(path) is True
+
+
+def test_remove_rpath_no_existing_rpath(tmp_path: pathlib.Path) -> None:
+    """Test that remove_rpath succeeds when there's no RPATH to remove."""
+    path = str(tmp_path / "test.so")
+    with patch("relenv.relocate.parse_rpath", return_value=[]):
+        assert remove_rpath(path) is True
+
+
+def test_remove_rpath_failed(tmp_path: pathlib.Path) -> None:
+    """Test that remove_rpath returns False when patchelf fails."""
+    path = str(tmp_path / "test.so")
+    with patch("subprocess.run", return_value=MagicMock(returncode=1)):
+        with patch(
+            "relenv.relocate.parse_rpath",
+            return_value=["/some/absolute/path"],
+        ):
+            assert remove_rpath(path) is False
+
+
+def test_handle_elf_removes_rpath_when_no_relenv_libs(tmp_path: pathlib.Path) -> None:
+    """Test that handle_elf removes RPATH for binaries linking only to system libs."""
+    proj = LinuxProject(tmp_path / "proj")
+    module = proj.add_simple_elf("array.so", "lib", "python3.10", "lib-dynload")
+
+    # ldd output showing only system libraries
+    ldd_ret = """
+    linux-vdso.so.1 => linux-vdso.so.1 (0x0123456789)
+    libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x0123456789)
+    libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x0123456789)
+    """.encode()
+
+    with proj:
+        with patch("subprocess.run", return_value=MagicMock(stdout=ldd_ret)):
+            with patch("relenv.relocate.remove_rpath") as remove_rpath_mock:
+                with patch("relenv.relocate.patch_rpath") as patch_rpath_mock:
+                    handle_elf(
+                        str(module), str(proj.libs_dir), True, str(proj.root_dir)
+                    )
+                    # Should remove RPATH, not patch it
+                    assert remove_rpath_mock.call_count == 1
+                    assert patch_rpath_mock.call_count == 0
+                    remove_rpath_mock.assert_called_with(str(module))
+
+
+def test_handle_elf_sets_rpath_when_relenv_libs_present(tmp_path: pathlib.Path) -> None:
+    """Test that handle_elf sets RPATH for binaries linking to relenv libs."""
+    proj = LinuxProject(tmp_path / "proj")
+    module = proj.add_simple_elf("_ssl.so", "lib", "python3.10", "lib-dynload")
+    libssl = proj.libs_dir / "libssl.so.3"
+    libssl.touch()
+
+    # ldd output showing relenv-built library
+    ldd_ret = """
+    linux-vdso.so.1 => linux-vdso.so.1 (0x0123456789)
+    libssl.so.3 => {libssl} (0x0123456789)
+    libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x0123456789)
+    libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x0123456789)
+    """.format(
+        libssl=libssl
+    ).encode()
+
+    with proj:
+        with patch("subprocess.run", return_value=MagicMock(stdout=ldd_ret)):
+            with patch("relenv.relocate.remove_rpath") as remove_rpath_mock:
+                with patch("relenv.relocate.patch_rpath") as patch_rpath_mock:
+                    handle_elf(
+                        str(module), str(proj.libs_dir), True, str(proj.root_dir)
+                    )
+                    # Should patch RPATH, not remove it
+                    assert patch_rpath_mock.call_count == 1
+                    assert remove_rpath_mock.call_count == 0
+                    patch_rpath_mock.assert_called_with(str(module), "$ORIGIN/../..")

tests/test_relocate_module.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 from __future__ import annotations