unifdef: fix build with gcc15, cleanup#445998
Merged
Merged
Conversation
f4e8787 to
a019a68
Compare
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
- add patch from unmerged upstream PR: https://www.github.com/fanf2/unifdef/pull/19 Fixes build failure with gcc15: ``` unifdef.c:205:1: error: 'constexpr' in empty declaration unifdef.c: In function 'eval_unary': unifdef.c:1089:27: error: expected identifier or '(' before '=' token 1089 | constexpr = false; | ^ unifdef.c:1106:27: error: expected identifier or '(' before '=' token 1106 | constexpr = false; | ^ unifdef.c: In function 'ifeval': unifdef.c:1173:19: error: expected identifier or '(' before '=' token 1173 | constexpr = killconsts ? false : true; | ^ unifdef.c:1176:27: error: expected specifier-qualifier-list before '?' token 1176 | return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); | ^ ```
a019a68 to
b06daee
Compare
- replace `rec` with `finalAttrs` - remove `with lib;` from `meta` - replace `sha256` with `hash` nix hash to-sri --type sha256 "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3" sha256-Q84PAuzc3HI7JHVXVWPdsZLpiMiG02gmC8CmOu46xAA=
Member
|
Contributor
|
Want to add yourself to maintainers, @ghpzin? |
Contributor
Author
I would not mind as upstream have not had updates in years, so there is not much to do. |
Contributor
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
unifdef: fix build with gcc15
https://www.github.com/fanf2/unifdef/pull/19
Fixes build failure with gcc15:
unifdef: cleanup
recwithfinalAttrswith lib;frommetasha256withhashnix hash to-sri --type sha256 "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3"
sha256-Q84PAuzc3HI7JHVXVWPdsZLpiMiG02gmC8CmOu46xAA=
Tested build with:
nix-build --expr 'with import ./. {}; unifdef.override { stdenv = gcc15Stdenv; }'Part of fixes for gcc15 update:
#440456
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.