Skip to content

Conversation

@ThomasDevoogdt
Copy link
Contributor

Commit 3b04755
"build: lib: Bundle simdutf amalgamation v5.5.0",
added support for simdutf, and enforces CXX support if FLB_UNICODE_ENCODER is selected. Which is the default case, fix that now.

As requested by #9277 (comment).

@patrick-stephens
Copy link
Collaborator

Triggered full build of all targets just to confirm no issues during build with anything so can merge if green.

Commit 3b04755
"build: lib: Bundle simdutf amalgamation v5.5.0",
added support for simdutf, and enforces CXX support if
FLB_UNICODE_ENCODER is selected. Which is the default case,
fix that now.

Signed-off-by: Thomas Devoogdt <[email protected]>
@ThomasDevoogdt ThomasDevoogdt force-pushed the bugfix/only-compile-unicode-encoder-if-cxx-support branch from 29c4de0 to e480328 Compare May 1, 2025 21:41
@ThomasDevoogdt
Copy link
Contributor Author

@cosmo0920 I reworked this PR so that it is functional. How I test it:

Without CXX support:

export CXX=/bin/false
cmake -GNinja -DFLB_PREFER_SYSTEM_LIBS=ON ../

-- Looking for a CXX compiler
-- Looking for a CXX compiler - NOTFOUND
-- CXX compiler not found, disable simdutf.

With CXX support:

export CXX=/usr/bin/c++
cmake -GNinja -DFLB_PREFER_SYSTEM_LIBS=ON ../

-- Looking for a CXX compiler
-- Looking for a CXX compiler - /usr/bin/c++
-- CXX compiler found, enable simdutf.

Copy link
Contributor

@cosmo0920 cosmo0920 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. 👍

ThomasDevoogdt added a commit to ThomasDevoogdt/fluent-bit that referenced this pull request May 2, 2025
Commit 3b04755
"build: lib: Bundle simdutf amalgamation v5.5.0",
added support for simdutf, and enforces CXX support if
FLB_UNICODE_ENCODER is selected. Which is the default case,
fix that now.

See: fluent#10277
Signed-off-by: Thomas Devoogdt <[email protected]>
@edsiper edsiper merged commit 92de130 into fluent:master May 5, 2025
81 of 82 checks passed
@ThomasDevoogdt ThomasDevoogdt deleted the bugfix/only-compile-unicode-encoder-if-cxx-support branch May 5, 2025 19:24
@ThomasDevoogdt
Copy link
Contributor Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docs-required ok-package-test Run PR packaging tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants