Skip to content
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

xmlto: fix build with clang 16 #240644

Merged
merged 1 commit into from
Jul 3, 2023
Merged

Conversation

reckenrode
Copy link
Contributor

Description of changes

Fix implicit int on main and static declarations. Clang 16 reports these as errors.

Testing was done building the reworked Darwin stdenv with clang 16, which succeeded.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {

# `libxml2' provides `xmllint', needed at build-time and run-time.
# `libxslt' provides `xsltproc', used by `xmlto' at run-time.
nativeBuildInputs = [ makeWrapper getopt ];
nativeBuildInputs = [ makeWrapper flex getopt ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is flex here mandatory?

Copy link
Contributor Author

@reckenrode reckenrode Jul 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The patch changes a .l file, so flex needs to be run again.

This issue is actually fixed upstream, but there hasn’t been a release. I’ve pushed an updated PR that uses the commits from upstream instead of vendoring the patch.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also added a comment explaining why flex is required.

Fix implicit `int` on `main` and `static` declarations. Clang 16 reports
these as errors.
@wegank wegank merged commit 3136499 into NixOS:staging Jul 3, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants