Skip to content

Revert "feat(xim): persist declared xpkg exports (#351)" #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sunrisepeak merged 1 commit into from
Jul 7, 2026
Merged

Revert "feat(xim): persist declared xpkg exports (#351)" #352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions src/core/xim/installer.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1600,28 +1600,6 @@ public:
executor.apply_install_stamp_if_empty(ctx);
}

// Persist declared exports next to the payload
// (<install_dir>/.xpkg-exports.json) so downstream consumers
// (e.g. mcpp's toolchain link model) read the DECLARED runtime
// metadata (loader/abi/libdirs) instead of re-deriving it by
// convention. Paths are written in their declared RELATIVE form —
// consumers join against the payload root, so the file stays
// valid across copies and symlink inheritance. Idempotent; also
// written for already-installed payloads so existing installs
// gain the file on their next resolve.
if (!node.exports.loader.empty() || !node.exports.abi.empty()
|| !node.exports.libdirs.empty()) {
nlohmann::json rt;
if (!node.exports.loader.empty()) rt["loader"] = node.exports.loader;
if (!node.exports.abi.empty()) rt["abi"] = node.exports.abi;
if (!node.exports.libdirs.empty()) rt["libdirs"] = node.exports.libdirs;
nlohmann::json j;
j["runtime"] = std::move(rt);
std::ofstream exportsOs(ctx.install_dir / ".xpkg-exports.json");
if (exportsOs) exportsOs << j.dump(2) << "\n";
else log::debug("{}: could not write .xpkg-exports.json", node.name);
}

// Apply elfpatch auto-patching if the install hook enabled it
if (!payloadInstalled) {
// Ensure binDir is in PATH so elfpatch can find patchelf
Expand Down
Loading