e2fsprogs: fix w/musl, __GNUC_PREREQ is glibc-ism #45703
Merged
Conversation
This file contains 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
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: e2fsprogs Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: e2fsprogs Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: e2fsprogs Partial log (click to expand)
|
Mic92
reviewed
Aug 28, 2018
| @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { | |||
| nativeBuildInputs = [ pkgconfig texinfo ]; | |||
| buildInputs = [ libuuid gettext ]; | |||
|
|
|||
| preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' | |||
| NIX_CFLAGS_COMPILE+=" -D__GNUC_PREREQ(maj,min)=0" | |||
There was a problem hiding this comment.
Can you add a short explanation here? It looks quite cryptic.
There was a problem hiding this comment.
This can be also done in nix, no?
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl " -D__GNUC_PREREQ(maj,min)=0";There was a problem hiding this comment.
Good call, updated thank you! How's it look now? :)
dtzWill
force-pushed
the
fix/e2fsprogs-musl
branch
from
6c77871
to
6c67dbe
Compare
Mic92
reviewed
Aug 28, 2018
| @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { | |||
| nativeBuildInputs = [ pkgconfig texinfo ]; | |||
| buildInputs = [ libuuid gettext ]; | |||
|
|
|||
| # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc | |||
| # It's safe to use on non-gcc is glibc's features.h is being used. | |||
There was a problem hiding this comment.
It is not clear to me what you mean with:
# It's safe to use on non-gcc is glibc's features.h is being used.
There was a problem hiding this comment.
Typo "is" -> "if"; dropping that line since not really useful.
What I was intending to say was that this is glibc-specific, not (glibc+gcc)-specific, despite checking for a gcc version number. At least it will be defined to something, instead of failing to compile.
For "special reasons" clang defines macros claiming to be GCC 4.2, so this is all a bit confusing anyway 😁.
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: e2fsprogs Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: e2fsprogs Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: e2fsprogs Partial log (click to expand)
|
Fixes compilation on non-glibc at minor cost since these are only used to guard the use of pragmas selectively disabling warnings based on the GCC version used.
dtzWill
force-pushed
the
fix/e2fsprogs-musl
branch
from
6c67dbe
to
a3f8a2c
Compare
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: e2fsprogs Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: e2fsprogs Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: e2fsprogs Partial log (click to expand)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
These are used to guard diagnostic push/pop pragmas
(to selectively quiet warnings).
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)