Skip to content

deps: vendor Abseil and update re2 to 2025-11-05#891

Merged
jcelerier merged 4 commits into
masterfrom
claude/re2-version-update-4541hw
Jun 20, 2026
Merged

deps: vendor Abseil and update re2 to 2025-11-05#891
jcelerier merged 4 commits into
masterfrom
claude/re2-version-update-4541hw

Conversation

@jcelerier

@jcelerier jcelerier commented Jun 10, 2026

Copy link
Copy Markdown
Member

re2 was pinned to c9cba76 (~2023-06-01), the last release before re2
migrated its codebase onto Abseil. Our in-tree build compiles re2's
sources directly rather than through its own CMake, so we couldn't move
past that version without providing Abseil.

This vendors abseil-cpp (20250512.1, the version re2 2025-11-05 declares in
its MODULE.bazel) as a submodule and builds it via add_subdirectory, like
the other CMake-based dependencies (rubberband, libremidi). re2 is bumped to
2025-11-05 and now links the Abseil targets listed in its own ABSL_DEPS.
stringpiece.cc is dropped (removed upstream; re2::StringPiece is now an
alias for absl::string_view).

Changes

  • New submodule 3rdparty/abseil-cpp @ 76bb24329 (20250512.1)
  • 3rdparty/re2 bumped c9cba76 → 927f5d53 (2025-11-05)
  • cmake/deps/abseil.cmake: build Abseil in-tree (or find system absl),
    headers treated as system, install/export gated on
    OSSIA_INSTALL_STATIC_DEPENDENCIES
  • cmake/deps/re2.cmake: link the Abseil targets, drop stringpiece.cc
  • cmake/OssiaDeps.cmake / .gitmodules: register the new submodule

Generated by Claude Code

@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 06:11 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 06:11 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 06:11 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 06:11 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 06:11 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 06:11 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 06:11 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 06:11 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:24 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:24 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:24 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:35 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:35 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:35 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:36 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:46 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:46 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:46 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:46 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:47 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:47 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:47 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:47 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:47 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 10, 2026 08:47 — with GitHub Actions Inactive
claude added 4 commits June 20, 2026 04:52
@claude @jcelerier
deps: vendor Abseil and update re2 to 2025-11-05
2c2eaf3 
re2 was pinned to c9cba76 (~2023-06-01), the last release before re2
migrated its codebase onto Abseil. Our in-tree build compiles re2's
sources directly rather than through its own CMake, so we couldn't move
past that version without providing Abseil.

Vendor abseil-cpp (20250512.1, the version re2 2025-11-05 declares in its
MODULE.bazel) as a submodule and build it via add_subdirectory, like the
other CMake-based dependencies (rubberband, libremidi). re2 is bumped to
2025-11-05 and now links the Abseil targets listed in its own ABSL_DEPS.
stringpiece.cc is dropped (removed upstream; re2::StringPiece is now an
alias for absl::string_view).
@claude @jcelerier
deps: rename span target to ossia_span to avoid Abseil clash
9eb0995 
When ABSL_ENABLE_INSTALL is ON (static-dependency installs), Abseil drops
its absl_ prefix and registers a bare "span" target (alias absl::span),
which collided with libossia's own imported "span" target and broke all
OSSIA_STATIC configure runs. Rename the backing target to ossia_span and
keep the span::span alias that consumers actually use.
@claude @jcelerier
deps: make static install of re2/Abseil export-consistent
b88123f 
The static matrix (OSSIA_STATIC -> OSSIA_INSTALL_STATIC_DEPENDENCIES) failed
at CMake generate time:

  export called with target "re2" which requires target "strings"
  that is not in any export set.

Three fixes:
- re2.cmake: drop the build-tree export(EXPORT re2-exports). re2 links Abseil
  publicly and Abseil only ships install(EXPORT) rules, not a build-tree
  export(), so the build-tree export of re2 cannot be generated. Only the
  installed re2 export is consumed (ossiaConfig.cmake.in).
- abseil.cmake: don't add the Abseil subdir with EXCLUDE_FROM_ALL when
  installing static dependencies - CMake skips install() rules of such
  subdirs, so Abseil's libs/headers/config were never installed, leaving the
  installed re2 export dangling.
- ossiaConfig.cmake.in: find_dependency(absl) before including the re2 export
  so downstream static consumers resolve absl::*.
@claude @jcelerier
deps: match Abseil's MSVC runtime to ossia's
4f126a6 
Abseil's CMakeLists overrides CMAKE_MSVC_RUNTIME_LIBRARY from its own
ABSL_MSVC_STATIC_RUNTIME option (default OFF -> /MD dynamic), ignoring the
runtime selected by the enclosing build. Static ossia builds (Max/PD/Python/
Unity) force the static /MT runtime, so Abseil's /MD objects fail to link:

  absl_*.lib(...) : error LNK2038: mismatch detected for 'RuntimeLibrary':
  value 'MD_DynamicRelease' doesn't match value 'MT_StaticRelease'

Set ABSL_MSVC_STATIC_RUNTIME to mirror CMAKE_MSVC_RUNTIME_LIBRARY so the two
agree.
@jcelerier jcelerier force-pushed the claude/re2-version-update-4541hw branch from b069ea2 to 4f126a6 Compare June 20, 2026 03:52
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier temporarily deployed to Apple Certificate June 20, 2026 03:52 — with GitHub Actions Inactive
@jcelerier jcelerier merged commit 3327acd into master Jun 20, 2026
46 checks passed
@jcelerier jcelerier deleted the claude/re2-version-update-4541hw branch June 20, 2026 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jcelerier @claude