lib: add upstream fixes related to uClibc and C only toolchains#7266
Conversation
ThomasDevoogdt
requested review from
edsiper,
fujimotos,
koleini and
leonardo-albertovich
as code owners
ThomasDevoogdt
changed the title
ThomasDevoogdt
force-pushed
the
bugfix/add-upstream-fixes
branch
from
7f104f7 to
5afc696
Compare
cosmo0920
left a comment
cosmo0920
left a comment
There was a problem hiding this comment.
From my side, there is no objections for these changes.
Can you also have a look at the other open PRs, see the list at the top. So that every change is in sync with upstream. |
Got it. I have seen the listed PRs and everything would be nice for merging. 👍 |
|
It looks like there are some unit test failures. |
ThomasDevoogdt
force-pushed
the
bugfix/add-upstream-fixes
branch
from
5afc696 to
43f551f
Compare
I don't see why. But rebased my branch to see if it still occurs. |
|
@patrick-stephens, @cosmo0920, @leonardo-albertovich, @edsiper, can you also merge this PR, or tell me if something else is needed from my side? |
patrick-stephens
temporarily deployed
to
unstable
GitHub Actions
Inactive
patrick-stephens
temporarily deployed
to
pr-package-test
GitHub Actions
Inactive
patrick-stephens
temporarily deployed
to
pr-package-test
GitHub Actions
Inactive
cosmo0920
left a comment
cosmo0920
left a comment
There was a problem hiding this comment.
I have no against from my side. Seems OK for me.
|
@edsiper, all relevant PR's are merged in the upstream repos, so I guess this one can be merged? |
patrick-stephens
left a comment
patrick-stephens
left a comment
There was a problem hiding this comment.
Looks good to me, builds for all targets
chunkio is written in c, so only enforce a c compiler upstream: fluent/chunkio#94 Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
onigmo is written in c, so only enforce a c compiler upstream: fluent/onigmo#7 Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
lwrb is written in c, so only enforce a c compiler upstream: MaJerle/lwrb#26 Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
tutf8e is written in c, so only enforce a c compiler upstream: nigels-com/tutf8e#9 Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
msgpack is written in c, so only enforce a c compiler upstream: msgpack/msgpack-c#1055 Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Not defined in uClibc, so replace them with the equivalent POLL{OUT,IN}.
https://www.man7.org/linux/man-pages/man2/poll.2.html
POLLWRNORM
Equivalent to POLLOUT.
POLLRDNORM
Equivalent to POLLIN.
upstream: bytecodealliance/wasm-micro-runtime#2069
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
…C_ASSERT Use `_Static_assert`, which is part of the C11 language. upstream: fluent/cfl#32 Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
"undefined reference to 'static_assert'" Not defined when using uClibc or if not C++ >= 11. upstream: c-ares/c-ares#504 Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Synced to: https://github.com/arsenm/sanitizers-cmake/tree/c3dc841af4dbf44669e65b82cb68a575864326bd Fix for: CMake Error at cmake/sanitizers-cmake/cmake/sanitize-helpers.cmake:127 (if): if given arguments: "SANITIZE_LINK_STATIC" "AND" "(" "STREQUAL" "GNU" ")" Unknown arguments specified Call Stack (most recent call first): cmake/sanitizers-cmake/cmake/FindASan.cmake:46 (sanitizer_check_compiler_flags) cmake/sanitizers-cmake/cmake/FindSanitizers.cmake:37 (find_package) lib/chunkio/CMakeLists.txt:53 (find_package) -- Configuring incomplete, errors occurred! Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
This is an upstream lib: https://github.com/arsenm/sanitizers-cmake, so shellcheck is not applicable. Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
Rebased since the commit from #7253 was already merged. |
|
I think it's time to merge this PR If @edsiper doesn't have anything against it I'll merge it by the end of the day. The only thing I don't know is, I usually do squash merges because because the PRs I merge are localized patches but this one is all over the place and I was wondering if a commit merge or a rebase merge would be better options. Do you have an opinion on that @ThomasDevoogdt? Thanks for the patience, I really appreciate the effort. |
I personally always prefer clean rebase merges to have a linear tree. I already rebased the PR, so fast forward should also be possible if there are no contributions in between. Thx also! |
|
@leonardo-albertovich, kind ping ;) |
|
Thanks for reminding me of this @ThomasDevoogdt, I totally forgot about it. |
|
And obviously thanks for all the work you've put towards these improvements, it's much appreciated. |
4 participants
! please, also review and merge my upstream PR's !
Main reason for this patch series is the buildroot support that was added 2 months ago:
https://github.com/buildroot/buildroot/tree/master/package/fluent-bit
upstream: sync ax_cxx_compile_stdcxx_11.m4 with upstream c-ares/c-ares#505
upstream: Explicitly specify the project is a C project if tests aren't used. msgpack/msgpack-c#1055
upstream: lib/xxhash: do no longer depend on <assert.h> for XXH_STATIC_ASSERT cfl#32
upstream: core/iwasm: posix.c: fix POLL{RD,WR}NORM in uClibc bytecodealliance/wasm-micro-runtime#2069
upstream: CMakeLists.txt: fix build without C++ nigels-com/tutf8e#9
upstream: CMakeLists.txt: fix build without C++ MaJerle/lwrb#26
upstream: CMakeLists.txt: fix build without C++ onigmo#7
upstream: CMakeLists.txt: fix build without C++ chunkio#94
Other related PRs:
This PR can be dropped if this one is merged:
Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.