OVMF: fix buils against openssl-3.0.13
#287266
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Without the change the build fails on `staging-next` as https://hydra.nixos.org/build/248863953/nixlog/2/tail: /build/edk2-unvendored-src/CryptoPkg/Library/OpensslLib/openssl/crypto/property/property_parse.c:107:19: error: ‘INT64_MAX’ undeclared (first use in this function) 107 | if (v > ((INT64_MAX - (*s - '0')) / 10)) { | ^~~~~~~~~ The unbundled version of `openssl` `nixpkgs` injects into `edk2` started using `INT64_MAX` that `edk2`'s `<stdint.h>` does not provide and relies on `openssl` to define as a fallback. Let's pull in `openssl`'s own definition of those.
ofborg
bot
added
10.rebuild-darwin: 1-10
|
|
||
| # Fix missing INT64_MAX include that edk2 explicitly does not provide | ||
| # via it's own <stdint.h>. Let's pull in openssl's definition instead: | ||
| sed -i $out/CryptoPkg/Library/OpensslLib/openssl/crypto/property/property_parse.c \ |
RaitoBezarius
approved these changes
Feb 8, 2024
delroth
added
the
12.approvals: 1
Contributor
|
@ofborg test incus.virtual-machine |
adamcstephens
approved these changes
Feb 8, 2024
delroth
added
12.approvals: 2
Contributor
|
Successfully created backport PR for |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Without the change the build fails on
staging-nextas https://hydra.nixos.org/build/248863953/nixlog/2/tail:The unbundled version of
opensslnixpkgsinjects intoedk2started usingINT64_MAXthatedk2's<stdint.h>does not provide and relies onopensslto define as a fallback.Let's pull in
openssl's own definition of those.Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.