Skip to content
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.

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

boulder: Fix emul32 incompatibility with dlang boulder #223

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Conversation

ReillyBrogan
Copy link
Contributor

The Rust elf library returns EM_386 for x86 ELF objects, while we used x86 as the ISA with the dlang boulder. This results in emul32 packages that are not compatible with packages already in the volatile repo.

To "Fix" this make sure we use x86 for all dependencies, while also adding each dependency twice as both x86 and 386. This ensures that newly built packages are compatible with existing ones while also allowing us to switch fully to 386 once every existing emul32 package has been rebuilt. We can also just drop the duplicate 386 provide if we decide to use x86 instead without any repo issues.

The Rust elf library returns `EM_386` for x86 ELF objects, while we used `x86` as the ISA with the dlang boulder. This results in emul32 packages that are not compatible with packages already in the volatile repo.

To "Fix" this make sure we use `x86` for all dependencies, while also adding each dependency twice as both `x86` and `386`. This ensures that newly built packages are compatible with existing ones while also allowing us to switch fully to `386` once every existing emul32 package has been rebuilt. We can also just drop the duplicate `386` provide if we decide to use `x86` instead without any repo issues.

Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
@ermo ermo added this to the oxide-prealpha1 milestone May 14, 2024
@ermo ermo added status: help wanted Need an extra set of eyes on this. type: enhancement New feature or request labels May 14, 2024
Copy link
Member

@ikeycode ikeycode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually really nicely done, thanks!

@ikeycode ikeycode merged commit 94b525d into main Jul 15, 2024
2 checks passed
@ikeycode ikeycode deleted the emul32-isa branch July 15, 2024 20:40
joebonrichie added a commit that referenced this pull request Aug 25, 2024
emul32 libs will now depend on 386 variants of the provided emul32 libs
instead of x86.

Part of #223.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: help wanted Need an extra set of eyes on this. type: enhancement New feature or request
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants