| Message ID | AS1P250MB0608E0ED4F12B037E2A86AE8A9F82@AS1P250MB0608.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] package/libzenoh-c: add GLIBC and aarch64, x86_64 and arm dependencies | expand |
On 04/06/2024 10:19, Michel Alex wrote: > The manual of zenoh-c says that: > > zenoh-c only have support for following targets: > aarch64-unknown-linux-gnu, x86_64-unknown-linux-gnu, arm-unknown-linux-gnueabi > > This patch provides a blind option BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS, > which is default y for above architectures. Additionally adds a dependency on > GLIBC because one of the autobuilders had a problem with MUSL. Moved also the > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS from package's dependency > list to the BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS option. > > Fixes: > http://autobuild.buildroot.net/results/680f25769526e5eef43d254a10a525b165846c75 > http://autobuild.buildroot.net/results/31ed69cb2ffe8e9bc13a27c3fda16c27e9855b56 > http://autobuild.buildroot.net/results/fdc74b8a42388b51cc4197c38b552559b97cbb8c > http://autobuild.buildroot.net/results/6e7ad53d44b417f6aa62acd8b2396720f5a14e82 > http://autobuild.buildroot.net/results/c85927b1dd25a84981adc5cc537eb07d02da40bc > http://autobuild.buildroot.net/results/5389ac0174791b3d899fda7769b4f0f2dfeb805b > http://autobuild.buildroot.net/results/285bd8f5aa338dbaf9ac0e5f78593b10bd54cbb5 > > --- > Changes v1 -> v2 (suggested by Yann E. MORIN): > - dependency of the C library moved from _ARCH_SUPPORTS symbol to the > package's dependency list > - show comment if architecture is supported but the C library is not > > Signed-off-by: Alex Michel <alex.michel@wiedemann-group.com> This sign-off should come above the --- line, because everything below the --- line is stripped from the commit message. Also, please make sure that your name in the From address is the same as the Signed-off-by. git commit -s will make sure author and signoff have the same name, git send-email normally takes care of setting From to the author, although it's possible that your MTA messes it up again... Applied to master with that fixed. Regards, Arnout > --- > package/libzenoh-c/Config.in | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/package/libzenoh-c/Config.in b/package/libzenoh-c/Config.in > index d22807c047..c0028bec6f 100644 > --- a/package/libzenoh-c/Config.in > +++ b/package/libzenoh-c/Config.in > @@ -1,9 +1,21 @@ > +config BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS > + bool > + default y if BR2_aarch64 > + default y if BR2_arm > + default y if BR2_x86_64 > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > + > config BR2_PACKAGE_LIBZENOH_C > bool "libzenoh-c" > - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > + depends on BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_USES_GLIBC > select BR2_PACKAGE_HOST_RUSTC > help > This package provides a C binding based on the main > Zenoh implementation written in Rust. > > https://github.com/eclipse-zenoh/zenoh-c > + > +comment "libzenoh-c needs a glibc toolchain" > + depends on BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS > + depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/libzenoh-c/Config.in b/package/libzenoh-c/Config.in index d22807c047..c0028bec6f 100644 --- a/package/libzenoh-c/Config.in +++ b/package/libzenoh-c/Config.in @@ -1,9 +1,21 @@ +config BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_x86_64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + config BR2_PACKAGE_LIBZENOH_C bool "libzenoh-c" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HOST_RUSTC help This package provides a C binding based on the main Zenoh implementation written in Rust. https://github.com/eclipse-zenoh/zenoh-c + +comment "libzenoh-c needs a glibc toolchain" + depends on BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC
The manual of zenoh-c says that: zenoh-c only have support for following targets: aarch64-unknown-linux-gnu, x86_64-unknown-linux-gnu, arm-unknown-linux-gnueabi This patch provides a blind option BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS, which is default y for above architectures. Additionally adds a dependency on GLIBC because one of the autobuilders had a problem with MUSL. Moved also the BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS from package's dependency list to the BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS option. Fixes: http://autobuild.buildroot.net/results/680f25769526e5eef43d254a10a525b165846c75 http://autobuild.buildroot.net/results/31ed69cb2ffe8e9bc13a27c3fda16c27e9855b56 http://autobuild.buildroot.net/results/fdc74b8a42388b51cc4197c38b552559b97cbb8c http://autobuild.buildroot.net/results/6e7ad53d44b417f6aa62acd8b2396720f5a14e82 http://autobuild.buildroot.net/results/c85927b1dd25a84981adc5cc537eb07d02da40bc http://autobuild.buildroot.net/results/5389ac0174791b3d899fda7769b4f0f2dfeb805b http://autobuild.buildroot.net/results/285bd8f5aa338dbaf9ac0e5f78593b10bd54cbb5 --- Changes v1 -> v2 (suggested by Yann E. MORIN): - dependency of the C library moved from _ARCH_SUPPORTS symbol to the package's dependency list - show comment if architecture is supported but the C library is not Signed-off-by: Alex Michel <alex.michel@wiedemann-group.com> --- package/libzenoh-c/Config.in | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)