| Message ID | 20240725153743.101494-1-flavio.tapajos@newtesc.com.br |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] Revert "rsyslog: not available on musl" | expand |
On Thu, 25 Jul 2024 12:37:40 -0300 Flávio Tapajós <flavio.tapajos@newtesc.com.br> wrote: > From: Konstantin Menyaev <KAMenyaev@salutedevices.com> > > This reverts commit cea81b6925de166e2fd2c75a51aea94420f7f06a. > > rsyslog now builds successfully with musl > > Signed-off-by: Konstantin Menyaev <KAMenyaev@salutedevices.com> > Signed-off-by: Flávio Tapajós <flavio.tapajos@newtesc.com.br> > --- > package/rsyslog/Config.in | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Series applied to next. I did some small improvements on PATCH 2/3: simplified the option name, fixed the indentation, improved the commit log. Thanks! Thomas
diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in index 3ba326191a..d9e8b1ab6f 100644 --- a/package/rsyslog/Config.in +++ b/package/rsyslog/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_RSYSLOG depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # modules - depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE # Propagate the exact same dependency from libfastjson, # even though rsyslog already depends on threads for itself: depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS @@ -18,9 +17,8 @@ config BR2_PACKAGE_RSYSLOG http://www.rsyslog.com -comment "rsyslog needs a uClibc or glibc toolchain w/ threads, dynamic library" +comment "rsyslog needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS