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
glib,gtk: correct CLAGS for plain buildtype #65850
Conversation
Guess some discussion might be happening upstream |
Looks like we should do Edit: GNOME 3.34 we might want to set this |
ffa497a
to
d45d4df
Compare
# Default for release buildtype but passed manually because | ||
# we're using plain | ||
"-DG_DISABLE_CAST_CHECKS" | ||
] ++ optional stdenv.isSunOS "-DBSD_COMP"; |
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.
Any idea what is this for? It originated in 8ae2a89 but I do not see any mentions in git log -p -SBSD_COMP
in Glib repository.
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.
Yeah I have no idea either, since we've diverged so much from then I think we can just drop it.
Could you add links to relevant sections of Also please describe in the Otherwise, it looks fine. |
Yep, will do all of that. |
Because we're using plain buildtype these have to be passed manually. See: https://gitlab.gnome.org/GNOME/gtk/blob/3.24.10/meson.build#L59 With autotools the mapping for the the options to the defines was: yes: G_ENABLE_DEBUG G_ENABLE_CONSISTENCY_CHECKS minimum: G_ENABLE_DEBUG G_DISABLE_CAST_CHECKS no: G_DISABLE_CAST_CHECKS G_DISABLE_ASSERT G_DISABLE_CHECKS So we're passing the exact ones that would've been used for minimum. Additionally it isn't a good idea to pass the equivalents used for "no" as it eliminates G_ENABLE_DEBUG which disables pre-condition checks and assertions. The actual option only existed to serve people who needed a specific build of GTK for very specific environments. And now they are much better served with meson's plain buildtype and figuring out what to pass themselves.
This is what would have been passed before with the release buildtype. See: https://gitlab.gnome.org/GNOME/glib/blob/2.60.4/meson.build#L208
This is what would have been passed before with the release buildtype. See: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/blob/GNOME_SETTINGS_DAEMON_3_32_1/meson.build#L73
d45d4df
to
3b085b4
Compare
@jtojnar rewritten/revised |
I fail to see where or for what it is useful for.
Motivation for this change
A little fallout from #58310 but this should correct things to what
I believe they were or should have been.
Noticed this fairly quickly because of #65843.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)