* Re: [Buildroot] [PATCH 2/2] package/libcgroup: fix build with musl
2023-06-25 12:48 ` [Buildroot] [PATCH 2/2] package/libcgroup: fix build with musl Oleg Lyovin via buildroot
@ 2023-06-25 13:11 ` Arnout Vandecappelle via buildroot
2023-06-25 13:15 ` Yann E. MORIN
2023-06-25 16:51 ` [Buildroot] [PATCH v2] package/libcgroup: allow to " Oleg Lyovin via buildroot
2 siblings, 0 replies; 8+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2023-06-25 13:11 UTC (permalink / raw)
To: Oleg Lyovin, buildroot; +Cc: olegartys, sdfw_system_team
Hi Oleg,
Thank you for your patch! I have a few comments for improvement.
First of all, in the subject line, "fix build with musl" suggest that it
currently fails to build in mainline. That's not the case, because musl is
excluded. So a better subject line would be "allow to build with musl".
On 25/06/2023 14:48, Oleg Lyovin via buildroot wrote:
> libcgroup depends on fts API which is missing in musl libc
> and provided by musl-fts package.
>
> This patch makes libcgroup dependent on musl-fts for
> non-glibc configurations.
>
> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
> ---
> package/libcgroup/Config.in | 7 ++++---
> package/libcgroup/libcgroup.mk | 5 +++++
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
> index 03efa71e6b..75c9accacc 100644
> --- a/package/libcgroup/Config.in
> +++ b/package/libcgroup/Config.in
> @@ -2,7 +2,8 @@ config BR2_PACKAGE_LIBCGROUP
> bool "libcgroup"
> depends on BR2_INSTALL_LIBSTDCPP
> # libcgroup uses <fts.h> which is not included by default in uClibc
> - depends on BR2_TOOLCHAIN_USES_GLIBC
> + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL
> + select BR2_PACKAGE_MUSL_FTS if BR2_TOOLCHAIN_USES_MUSL
If fts really is the only problem, then we don't need a libc exclusion at all,
because musl-fts works for uClibc as well. It's enough to put
select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
If there is a different reason why uClibc doesn't work, then the comment above
should be updated and the dependency should be
depends on !BR2_TOOLCHAIN_UCLIBC
Can you test with uClibc and update the patch accordingly? You can use the
test-pkg script to try out a number of configurations.
I've marked this patch as Changes Requested in patchwork.
Regards,
Arnout
> help
> libcgroup is a library that abstracts the control
> group file system in Linux.
> @@ -18,5 +19,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS
>
> endif
>
> -comment "libcgroup needs a glibc toolchain w/ C++"
> - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
> +comment "libcgroup needs a glibc/musl toolchain w/ C++"
> + depends on !BR2_INSTALL_LIBSTDCPP || !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
> diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
> index fb0b646c51..d67710ec1e 100644
> --- a/package/libcgroup/libcgroup.mk
> +++ b/package/libcgroup/libcgroup.mk
> @@ -36,4 +36,9 @@ else
> LIBCGROUP_CONF_OPTS += --disable-pam
> endif
>
> +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
> +LIBCGROUP_DEPENDENCIES += musl-fts
> +LIBCGROUP_CONF_ENV += LDFLAGS=-lfts
> +endif
> +
> $(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/libcgroup: fix build with musl
2023-06-25 12:48 ` [Buildroot] [PATCH 2/2] package/libcgroup: fix build with musl Oleg Lyovin via buildroot
2023-06-25 13:11 ` Arnout Vandecappelle via buildroot
@ 2023-06-25 13:15 ` Yann E. MORIN
2023-06-25 16:51 ` [Buildroot] [PATCH v2] package/libcgroup: allow to " Oleg Lyovin via buildroot
2 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2023-06-25 13:15 UTC (permalink / raw)
To: Oleg Lyovin; +Cc: olegartys, sdfw_system_team, buildroot
Oleg, All,
On 2023-06-25 15:48 +0300, Oleg Lyovin via buildroot spake thusly:
> libcgroup depends on fts API which is missing in musl libc
> and provided by musl-fts package.
>
> This patch makes libcgroup dependent on musl-fts for
> non-glibc configurations.
>
> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
> ---
[--SNIP--]
> diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
> index fb0b646c51..d67710ec1e 100644
> --- a/package/libcgroup/libcgroup.mk
> +++ b/package/libcgroup/libcgroup.mk
> @@ -36,4 +36,9 @@ else
> LIBCGROUP_CONF_OPTS += --disable-pam
> endif
>
> +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
> +LIBCGROUP_DEPENDENCIES += musl-fts
> +LIBCGROUP_CONF_ENV += LDFLAGS=-lfts
I think it would be better to use LIBS rather than LDFLAGS. Could you
check that works too, and report here? If it works, I can change when
applying; if it does not work, I can apply without changing. ;-)
Regards,
Yann E. MORIN.
> +endif
> +
> $(eval $(autotools-package))
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2] package/libcgroup: allow to build with musl
2023-06-25 12:48 ` [Buildroot] [PATCH 2/2] package/libcgroup: fix build with musl Oleg Lyovin via buildroot
2023-06-25 13:11 ` Arnout Vandecappelle via buildroot
2023-06-25 13:15 ` Yann E. MORIN
@ 2023-06-25 16:51 ` Oleg Lyovin via buildroot
2023-06-25 19:37 ` Arnout Vandecappelle via buildroot
2 siblings, 1 reply; 8+ messages in thread
From: Oleg Lyovin via buildroot @ 2023-06-25 16:51 UTC (permalink / raw)
To: buildroot; +Cc: olegartys, Oleg Lyovin, sdfw_system_team
libcgroup depends on fts API which is missing in musl libc
and provided by musl-fts package.
This patch makes libcgroup dependent on musl-fts for
non-glibc configurations.
Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
---
Changes v1 -> v2:
- remove glibc dependency: checked that libcgroup can be built in all
the configurations: glibc, musl, uClibc, but requires musl-fts
for the last two.
(suggested by Arnout)
- remove LDFLAGS modification: it seems that autoconf
automatically searches for a library that provides 'fts_open'.
(suggested by Yann)
- changed commit-msg (suggsted by Arnout)
and rebased onto 'master' branch
glibc, musl and uClibc builds are approved by 'test-pkg' script:
bootlin-armv5-uclibc [1/3]: OK
bootlin-armv7-glibc [2/3]: OK
bootlin-x86-64-musl [3/3]: OK
Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
---
package/libcgroup/Config.in | 7 +++----
package/libcgroup/libcgroup.mk | 4 ++++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
index 03efa71e6b..546b5f3560 100644
--- a/package/libcgroup/Config.in
+++ b/package/libcgroup/Config.in
@@ -1,8 +1,7 @@
config BR2_PACKAGE_LIBCGROUP
bool "libcgroup"
depends on BR2_INSTALL_LIBSTDCPP
- # libcgroup uses <fts.h> which is not included by default in uClibc
- depends on BR2_TOOLCHAIN_USES_GLIBC
+ select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
help
libcgroup is a library that abstracts the control
group file system in Linux.
@@ -18,5 +17,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS
endif
-comment "libcgroup needs a glibc toolchain w/ C++"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
+comment "libcgroup needs a toolchain w/ C++"
+ depends on !BR2_INSTALL_LIBSTDCPP
\ No newline at end of file
diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
index fb0b646c51..e3de48c561 100644
--- a/package/libcgroup/libcgroup.mk
+++ b/package/libcgroup/libcgroup.mk
@@ -36,4 +36,8 @@ else
LIBCGROUP_CONF_OPTS += --disable-pam
endif
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
+LIBCGROUP_DEPENDENCIES += musl-fts
+endif
+
$(eval $(autotools-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH v2] package/libcgroup: allow to build with musl
2023-06-25 16:51 ` [Buildroot] [PATCH v2] package/libcgroup: allow to " Oleg Lyovin via buildroot
@ 2023-06-25 19:37 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 8+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2023-06-25 19:37 UTC (permalink / raw)
To: Oleg Lyovin, buildroot; +Cc: olegartys, sdfw_system_team
On 25/06/2023 18:51, Oleg Lyovin via buildroot wrote:
> libcgroup depends on fts API which is missing in musl libc
> and provided by musl-fts package.
>
> This patch makes libcgroup dependent on musl-fts for
> non-glibc configurations.
>
> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
Applied to master, thanks. The subject line now should be "allow to build with
musl and uClibc", so I changed that :-)
Regards,
Arnout
>
> ---
> Changes v1 -> v2:
> - remove glibc dependency: checked that libcgroup can be built in all
> the configurations: glibc, musl, uClibc, but requires musl-fts
> for the last two.
> (suggested by Arnout)
> - remove LDFLAGS modification: it seems that autoconf
> automatically searches for a library that provides 'fts_open'.
> (suggested by Yann)
> - changed commit-msg (suggsted by Arnout)
> and rebased onto 'master' branch
>
> glibc, musl and uClibc builds are approved by 'test-pkg' script:
> bootlin-armv5-uclibc [1/3]: OK
> bootlin-armv7-glibc [2/3]: OK
> bootlin-x86-64-musl [3/3]: OK
>
> Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
> ---
> package/libcgroup/Config.in | 7 +++----
> package/libcgroup/libcgroup.mk | 4 ++++
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
> index 03efa71e6b..546b5f3560 100644
> --- a/package/libcgroup/Config.in
> +++ b/package/libcgroup/Config.in
> @@ -1,8 +1,7 @@
> config BR2_PACKAGE_LIBCGROUP
> bool "libcgroup"
> depends on BR2_INSTALL_LIBSTDCPP
> - # libcgroup uses <fts.h> which is not included by default in uClibc
> - depends on BR2_TOOLCHAIN_USES_GLIBC
> + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
> help
> libcgroup is a library that abstracts the control
> group file system in Linux.
> @@ -18,5 +17,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS
>
> endif
>
> -comment "libcgroup needs a glibc toolchain w/ C++"
> - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
> +comment "libcgroup needs a toolchain w/ C++"
> + depends on !BR2_INSTALL_LIBSTDCPP
> \ No newline at end of file
> diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
> index fb0b646c51..e3de48c561 100644
> --- a/package/libcgroup/libcgroup.mk
> +++ b/package/libcgroup/libcgroup.mk
> @@ -36,4 +36,8 @@ else
> LIBCGROUP_CONF_OPTS += --disable-pam
> endif
>
> +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
> +LIBCGROUP_DEPENDENCIES += musl-fts
> +endif
> +
> $(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread