lib: add upstream fixes related to uClibc and C only toolchains #7266

ThomasDevoogdt · 2023-04-25T12:23:09Z

! 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

lib: c-ares: fixup static_assert
upstream: sync ax_cxx_compile_stdcxx_11.m4 with upstream c-ares/c-ares#505
lib: msgpack: CMakeLists.txt: CMakeLists.txt: fix build without C++
upstream: Explicitly specify the project is a C project if tests aren't used. msgpack/msgpack-c#1055
lib: cfl: lib/xxhash: do no longer depend on <assert.h> for XXH_STATIC_ASSERT
upstream: lib/xxhash: do no longer depend on <assert.h> for XXH_STATIC_ASSERT cfl#32
lib: wasm: core/iwasm: posix.c: fix POLL{RD,WR}NORM in uClibc
upstream: core/iwasm: posix.c: fix POLL{RD,WR}NORM in uClibc bytecodealliance/wasm-micro-runtime#2069
lib: tutf8e: CMakeLists.txt: fix build without C++
upstream: CMakeLists.txt: fix build without C++ nigels-com/tutf8e#9
lib: lwrb: CMakeLists.txt: fix build without C++
upstream: CMakeLists.txt: fix build without C++ MaJerle/lwrb#26
lib: onigmo: CMakeLists.txt: fix build without C++
upstream: CMakeLists.txt: fix build without C++ onigmo#7
lib: chunkio: CMakeLists.txt: fix build without C++
upstream: CMakeLists.txt: fix build without C++ chunkio#94

Other related PRs:

This PR can be dropped if this one is merged:

fix build without C++ #6893

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:

[N/A] Example configuration file for the change
[N/A] Debug log output from testing the change

[N/A] Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

[N/A] Run local packaging test showing all targets (including any new ones) build.
Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

[N/A] Documentation required for this feature

Backporting

[N/A] Backport to latest stable release.

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.

...ro-runtime-WAMR-1.1.1/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c

cosmo0920

From my side, there is no objections for these changes.

ThomasDevoogdt · 2023-04-26T05:57:46Z

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.

cosmo0920 · 2023-04-26T07:33:36Z

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. 👍

patrick-stephens · 2023-04-26T15:02:29Z

It looks like there are some unit test failures.
I'd also like to ensure we build for all targets to verify it is ok.

ThomasDevoogdt · 2023-04-26T15:19:29Z

It looks like there are some unit test failures. I'd also like to ensure we build for all targets to verify it is ok.

I don't see why. But rebased my branch to see if it still occurs.

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>

ThomasDevoogdt · 2023-05-04T07:37:55Z

Rebased since the commit from #7253 was already merged.

leonardo-albertovich · 2023-05-04T09:28:55Z

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.

ThomasDevoogdt · 2023-05-04T11:32:13Z

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.

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!
Will bump fluent-bit in buildroot at the next release then.

ThomasDevoogdt · 2023-05-08T10:09:36Z

@leonardo-albertovich, kind ping ;)

leonardo-albertovich · 2023-05-08T10:30:30Z

Thanks for reminding me of this @ThomasDevoogdt, I totally forgot about it.

leonardo-albertovich · 2023-05-08T10:31:01Z

And obviously thanks for all the work you've put towards these improvements, it's much appreciated.

Fluent Bit v2.1 is the start of the new stable series of the project. - Release Notes: https://fluentbit.io/announcements/v2.1.0/ https://fluentbit.io/announcements/v2.1.1/ https://fluentbit.io/announcements/v2.1.2/ https://fluentbit.io/announcements/v2.1.3/ - Patches are upstreamed and can be dropped: fluent/fluent-bit#7266 fluent/fluent-bit#7254 https://github.com/fluent/fluent-bit/pull/7253/files Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>

Fluent Bit v2.1 is the start of the new stable series of the project. - Release Notes: https://fluentbit.io/announcements/v2.1.0/ https://fluentbit.io/announcements/v2.1.1/ https://fluentbit.io/announcements/v2.1.2/ No release notes yet for 2.1.3, but contains this list of upstreamed patches: fluent/fluent-bit#7266 fluent/fluent-bit#7254 fluent/fluent-bit#7253 So the old patches can be dropped. Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>

Fluent Bit v2.1 is the start of the new stable series of the project. Release Notes: https://fluentbit.io/announcements/v2.1.0/ https://fluentbit.io/announcements/v2.1.1/ https://fluentbit.io/announcements/v2.1.2/ https://fluentbit.io/announcements/v2.1.3/ Fluent Bit v2.1.3 contains this list of upstreamed patches: fluent/fluent-bit#7266 fluent/fluent-bit#7254 fluent/fluent-bit#7253 So the old patches can be dropped. Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>

Fluent Bit v2.1 is the start of the new stable series of the project. Release Notes: https://fluentbit.io/announcements/v2.1.0/ https://fluentbit.io/announcements/v2.1.1/ https://fluentbit.io/announcements/v2.1.2/ https://fluentbit.io/announcements/v2.1.3/ https://fluentbit.io/announcements/v2.1.4/ Fluent Bit v2.1.4 contains this list of upstreamed patches: fluent/fluent-bit#7266 fluent/fluent-bit#7254 fluent/fluent-bit#7253 So the old patches can be dropped. Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>

ThomasDevoogdt requested review from edsiper, leonardo-albertovich, fujimotos and koleini as code owners April 25, 2023 12:23

github-actions bot added the docs-required label Apr 25, 2023

ThomasDevoogdt temporarily deployed to pr April 25, 2023 12:23 — with GitHub Actions Inactive

ThomasDevoogdt changed the title ~~Bugfix/add upstream fixes~~ add upstream fixes Apr 25, 2023

ThomasDevoogdt changed the title ~~add upstream fixes~~ lib: add upstream fixes Apr 25, 2023

ThomasDevoogdt temporarily deployed to pr April 25, 2023 12:45 — with GitHub Actions Inactive

ThomasDevoogdt changed the title ~~lib: add upstream fixes~~ lib: add upstream fixes related to uClibc and C only toolchains Apr 25, 2023

ThomasDevoogdt mentioned this pull request Apr 25, 2023

Bug-fixing related to Buildroot cross platform compiling #6884

Closed

ThomasDevoogdt force-pushed the bugfix/add-upstream-fixes branch from 7f104f7 to 5afc696 Compare April 25, 2023 18:55

ThomasDevoogdt temporarily deployed to pr April 25, 2023 18:56 — with GitHub Actions Inactive

ThomasDevoogdt temporarily deployed to pr April 25, 2023 19:17 — with GitHub Actions Inactive

cosmo0920 requested changes Apr 26, 2023

View reviewed changes

...ro-runtime-WAMR-1.1.1/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c Show resolved Hide resolved

ThomasDevoogdt requested a review from cosmo0920 April 26, 2023 05:05

cosmo0920 previously approved these changes Apr 26, 2023

View reviewed changes

ThomasDevoogdt dismissed cosmo0920’s stale review via 43f551f April 26, 2023 15:18

ThomasDevoogdt force-pushed the bugfix/add-upstream-fixes branch from 5afc696 to 43f551f Compare April 26, 2023 15:18

ThomasDevoogdt requested a review from cosmo0920 April 26, 2023 15:19

ThomasDevoogdt temporarily deployed to pr April 26, 2023 15:24 — with GitHub Actions Inactive

ThomasDevoogdt added 7 commits May 4, 2023 09:22

lib: tutf8e: CMakeLists.txt: fix build without C++

3aefa31

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>

lib: msgpack: CMakeLists.txt: CMakeLists.txt: fix build without C++

cd51901

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>

lib: cfl: lib/xxhash: do no longer depend on <assert.h> for XXH_STATI…

3b0399b

…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>

lib: c-ares: fixup static_assert

8610e84

"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>

workflows: ignore cmake/sanitizers-cmake shellcheck failures

e398b67

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>

ThomasDevoogdt force-pushed the bugfix/add-upstream-fixes branch from b958b5b to e398b67 Compare May 4, 2023 07:34

ThomasDevoogdt temporarily deployed to pr May 4, 2023 07:35 — with GitHub Actions Inactive

ThomasDevoogdt temporarily deployed to pr May 4, 2023 07:36 — with GitHub Actions Inactive

ThomasDevoogdt temporarily deployed to pr May 4, 2023 07:58 — with GitHub Actions Inactive

leonardo-albertovich approved these changes May 4, 2023

View reviewed changes

ThomasDevoogdt mentioned this pull request May 4, 2023

fix build without C++ #6893

Closed

leonardo-albertovich merged commit e35b58f into fluent:master May 8, 2023

ThomasDevoogdt deleted the bugfix/add-upstream-fixes branch May 8, 2023 10:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

lib: add upstream fixes related to uClibc and C only toolchains #7266

lib: add upstream fixes related to uClibc and C only toolchains #7266

ThomasDevoogdt commented Apr 25, 2023 •

edited

Loading

cosmo0920 left a comment

ThomasDevoogdt commented Apr 26, 2023

cosmo0920 commented Apr 26, 2023

patrick-stephens commented Apr 26, 2023

ThomasDevoogdt commented Apr 26, 2023

ThomasDevoogdt commented May 4, 2023

leonardo-albertovich commented May 4, 2023

ThomasDevoogdt commented May 4, 2023

ThomasDevoogdt commented May 8, 2023

leonardo-albertovich commented May 8, 2023

leonardo-albertovich commented May 8, 2023

lib: add upstream fixes related to uClibc and C only toolchains #7266

lib: add upstream fixes related to uClibc and C only toolchains #7266

Conversation

ThomasDevoogdt commented Apr 25, 2023 • edited Loading

cosmo0920 left a comment

Choose a reason for hiding this comment

ThomasDevoogdt commented Apr 26, 2023

cosmo0920 commented Apr 26, 2023

patrick-stephens commented Apr 26, 2023

ThomasDevoogdt commented Apr 26, 2023

ThomasDevoogdt commented May 4, 2023

leonardo-albertovich commented May 4, 2023

ThomasDevoogdt commented May 4, 2023

ThomasDevoogdt commented May 8, 2023

leonardo-albertovich commented May 8, 2023

leonardo-albertovich commented May 8, 2023

ThomasDevoogdt commented Apr 25, 2023 •

edited

Loading