Skip to content

mesa: Fix -Werror=int-conversion build error on musl.#94207

Merged
nh2 merged 1 commit intoNixOS:masterfrom
nh2:mesa-musl-fix-Werror-int-conversion-errors
Aug 13, 2020
Merged

mesa: Fix -Werror=int-conversion build error on musl.#94207
nh2 merged 1 commit intoNixOS:masterfrom
nh2:mesa-musl-fix-Werror-int-conversion-errors

Conversation

@nh2
Copy link
Copy Markdown
Contributor

@nh2 nh2 commented Jul 30, 2020

Motivation for this change

Fixes build with musl.

Upstream PR I made: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@nh2 nh2 requested review from dtzWill and eadwu July 30, 2020 01:56
@nh2 nh2 self-assigned this Jul 30, 2020
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 30, 2020
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 30, 2020
* include workaround for NixOS/nixpkgs#85924
* musl 1.2.0 (#98 (comment))
* workaround for fontforge execution failure due to wrong RPATH (NixOS/nixpkgs#94126)
* ilmbase musl compilation error (NixOS/nixpkgs#94205)
* mesa: Fix `-Werror=int-conversion` build error on musl (NixOS/nixpkgs#94207)
@nh2 nh2 force-pushed the mesa-musl-fix-Werror-int-conversion-errors branch from 0833e4f to 85d0822 Compare August 12, 2020 01:42
@nh2
Copy link
Copy Markdown
Contributor Author

nh2 commented Aug 12, 2020

Testing this on musl practically requires #95234 because otherwise util-linux (dependency of mesa) does not build.

@nh2
Copy link
Copy Markdown
Contributor Author

nh2 commented Aug 13, 2020

Merging so that mesa builds with musl.

There's still some discussion on the upstream PR https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 of how debug-printing should work exactly for the musl pthread_t, but I think that's a detail that shouldn't block the build.

@nh2 nh2 merged commit e2eb328 into NixOS:master Aug 13, 2020
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 5, 2021
* include fixes for GHC segfaulting: (NixOS/nixpkgs#129247, NixOS/nixpkgs#129289)
* musl 1.2.2, including this important fix from musl 1.2.0:
  #98 (comment)
* workaround for fontforge execution failure due to wrong RPATH:
  NixOS/nixpkgs#94126
* ilmbase musl compilation error:
  NixOS/nixpkgs#94205
* mesa: Fix `-Werror=int-conversion` build error on musl:
  NixOS/nixpkgs#94207
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 6, 2021
* include fixes for GHC segfaulting: (NixOS/nixpkgs#129247, NixOS/nixpkgs#129289)
* musl 1.2.2, including this important fix from musl 1.2.0:
  #98 (comment)
* workaround for fontforge execution failure due to wrong RPATH:
  NixOS/nixpkgs#94126
* ilmbase musl compilation error:
  NixOS/nixpkgs#94205
* mesa: Fix `-Werror=int-conversion` build error on musl:
  NixOS/nixpkgs#94207

survey:

* Update file in which stackage packages are listed.
  See nixpkgs commit

      7f236bd4 - hackage2nix: Split configuration, auto disable hydra builds
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 20, 2021
* include fixes for GHC segfaulting: (NixOS/nixpkgs#129247, NixOS/nixpkgs#129289)
* musl 1.2.2, including this important fix from musl 1.2.0:
  #98 (comment)
* workaround for fontforge execution failure due to wrong RPATH:
  NixOS/nixpkgs#94126
* ilmbase musl compilation error:
  NixOS/nixpkgs#94205
* mesa: Fix `-Werror=int-conversion` build error on musl:
  NixOS/nixpkgs#94207

survey:

* Update file in which stackage packages are listed.
  See nixpkgs commit

      7f236bd4 - hackage2nix: Split configuration, auto disable hydra builds
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant