Skip to content

mesa3d: fix LLVM 22 build failure due to removed StringMapIterator#59

Merged
jens-maus merged 2 commits into
masterfrom
copilot/fix-snapshot-build-tinkerboard
Jun 11, 2026
Merged

mesa3d: fix LLVM 22 build failure due to removed StringMapIterator#59
jens-maus merged 2 commits into
masterfrom
copilot/fix-snapshot-build-tinkerboard

Conversation

Copilot AI commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Mesa3d 26.1.2 references llvm::StringMapIterator<bool> in lp_bld_misc.cpp which was removed in LLVM 22. The tinkerboard build fails at 1507/1521 compilation steps when the host toolchain is LLVM 22.1.7.

Changes

  • buildroot-external/patches/mesa3d/0001-gallivm-fix-llvm-22-StringMapIterator-removal.patch: Replace the explicit iterator type with auto in lp_build_fill_mattrs():
-   for (llvm::StringMapIterator<bool> f = features.begin();
+   for (auto f = features.begin();

auto resolves to the correct iterator type across all LLVM versions. Same fix applied by OpenWrt for their mesa3d package.

Mesa3d 26.1.2 uses `llvm::StringMapIterator<bool>` in
lp_bld_misc.cpp which was removed in LLVM 22. Replace with
`auto` to fix compilation with LLVM 22.1.7.

Fixes the failing "Snapshot build [tinkerboard]" CI job.
Copilot AI changed the title [WIP] Fix failing GitHub Actions job Snapshot build [tinkerboard] mesa3d: fix LLVM 22 build failure due to removed StringMapIterator Jun 11, 2026
Copilot AI requested a review from jens-maus June 11, 2026 11:32
@jens-maus jens-maus marked this pull request as ready for review June 11, 2026 16:45
@jens-maus jens-maus merged commit 7a632c1 into master Jun 11, 2026
5 checks passed
@jens-maus jens-maus deleted the copilot/fix-snapshot-build-tinkerboard branch June 13, 2026 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants