Skip to content

deps: don't unity-build Abseil; fix vendored wiiuse include#905

Merged
jcelerier merged 1 commit into
masterfrom
vendoring-fixes
Jun 23, 2026
Merged

deps: don't unity-build Abseil; fix vendored wiiuse include#905
jcelerier merged 1 commit into
masterfrom
vendoring-fixes

Conversation

@jcelerier

Copy link
Copy Markdown
Member

Two integration fixes surfaced when building score against current master with -DCMAKE_UNITY_BUILD=1 and with OSSIA_USE_SYSTEM_LIBRARIES=ON:

  • Abseil + unity build: Abseil's .cc files define file-scope statics (kAsciiToInt, kDigits, ...) that collide when unity-batched (redefinition ... with a different type). deps/abseil.cmake now sets CMAKE_UNITY_BUILD OFF for the in-tree Abseil build, matching what deps/re2.cmake already does for re2.
  • wiiuse fallback: deps: graceful vendored fallback for wiiuse #904 made wiiuse.cmake fall back to the vendored build when a system wiiuse is requested but missing, but ossia_features.cmake still gated the vendored include on the system-libraries flag and skipped it (fatal error: 'wiiuse.h' file not found). It now adds the include whenever the bundled copy is built (keyed on WIIUSE_DIR).

Verified locally: unity SDK build of ossia is clean, and an OSSIA_USE_SYSTEM_wiiuse=ON build (no system wiiuse) falls back to vendored and compiles.

🤖 Generated with Claude Code

Abseil's .cc files have file-scope statics (kAsciiToInt, kDigits, ...) that
collide when unity-batched; disable unity for the in-tree Abseil build.

wiiuse: add the vendored include whenever the bundled copy is built
(keyed on WIIUSE_DIR) rather than on the system-libraries flag, so the
graceful fallback also works when a system wiiuse is requested but absent.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 22, 2026 16:53 — with GitHub Actions Inactive
jcelerier added a commit to ossia/score that referenced this pull request Jun 22, 2026
Points at the libossia fixes branch (ossia/libossia#905) so score builds
clean against current libossia master (unity Abseil + system wiiuse fallback).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
@jcelerier jcelerier merged commit b335062 into master Jun 23, 2026
46 checks passed
@jcelerier jcelerier deleted the vendoring-fixes branch June 23, 2026 10:39
jcelerier added a commit to ossia/score that referenced this pull request Jun 24, 2026
Points at the libossia fixes branch (ossia/libossia#905) so score builds
clean against current libossia master (unity Abseil + system wiiuse fallback).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
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.

1 participant