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

fluent-bit: add -fcommon workaround #177147

Merged
merged 1 commit into from
Jun 12, 2022

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jun 10, 2022

Workaround build failure on -fno-common toolchains like upstream
gcc-10 or llvm-11. Otherwise build fails as:

ld: /monkey/mk_tls.h:81: multiple definition of `mk_tls_server_timeout';
  flb_config.c.o:include/monkey/mk_tls.h:81: first defined here
Description of changes
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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

Workaround build failure on -fno-common toolchains like upstream
gcc-10 or llvm-11. Otherwise build fails as:

    ld: /monkey/mk_tls.h:81: multiple definition of `mk_tls_server_timeout';
      flb_config.c.o:include/monkey/mk_tls.h:81: first defined here
@trofi
Copy link
Contributor Author

trofi commented Jun 10, 2022

@ofborg build fluent-bit

@trofi trofi mentioned this pull request Jun 10, 2022
13 tasks
@ofborg ofborg bot requested review from fpletz and samrose June 10, 2022 08:34
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Jun 10, 2022
@marsam marsam merged commit 881810d into NixOS:master Jun 12, 2022
@trofi trofi deleted the workaround-fno-common-for-fluent-bit branch June 12, 2022 06:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants