-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
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
gfortran11, gnat11: init at 11.1.0 #121759
Conversation
I forgot to add it in NixOS#121115.
Result of 1 package failed to build:1 package built successfully:
Note that build failures may predate this PR, and could be nondeterministic or hardware dependent. Result of 1 package built successfully:
|
I don't have access to an x86_64 machine to check the failure on x86_64-linux. Could somebody look into that for me? |
@@ -59,7 +59,7 @@ LDFLAGS= | ||
CFLAGS=-g | ||
PICFLAG = @PICFLAG@ | ||
GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the difference that was preventing the previous patch from applying:
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 3342e33b4b1..836fcbef400 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -110,7 +110,7 @@ NO_INLINE_ADAFLAGS = -fno-inline
NO_OMIT_ADAFLAGS = -fno-omit-frame-pointer
NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls
NO_REORDER_ADAFLAGS = -fno-toplevel-reorder
-GNATLIBFLAGS = -W -Wall -gnatpg -nostdinc
+GNATLIBFLAGS = -W -Wall -gnatg -nostdinc
GNATLIBCFLAGS = -g -O2
# Pretend that _Unwind_GetIPInfo is available for the target by default. This
# should be autodetected during the configuration of libada and passed down to
Perhaps there's a better way to handle this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's possible to remove the context above, so that the patch would apply in both cases. I think in this case it seems quite safe wrt. possibilities of mis-applying. But your approach seems perfectly fine to me, too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks OK. Both build for me on x86_64-linux
.
Motivation for this change
I forgot to add it in #121115.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)