| Message ID | 20200630173435.7828-1-juju@cotds.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS | expand |
Julien, All, On 2020-06-30 19:34 +0200, Julien Olivain spake thusly: > This change is motivated by a misalignment of the Kconfig package and > comment dependencies, introduced in commit 0737f48c5f "package/poco: > disable build for riscv" (BR_riscv was missing in the comment). > Introducing BR2_PACKAGE_POCO_ARCH_SUPPORTS solve this issue. > > Signed-off-by: Julien Olivain <juju@cotds.org> Applied to master, thanks. Yet, I did some minor changes, see below... > --- > Changes v1 -> v2: > Suggested by Thomas: > - introduce _ARCH_SUPPORTS to prevent duplicating dependency conditions > --- > package/poco/Config.in | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/package/poco/Config.in b/package/poco/Config.in > index f8f921de04..13f7b3b0a3 100644 > --- a/package/poco/Config.in > +++ b/package/poco/Config.in > @@ -1,3 +1,8 @@ > +config BR2_PACKAGE_POCO_ARCH_SUPPORTS > + bool > + default y if !(BR2_arc || BR2_microblaze || BR2_mipsel \ > + || BR2_or1k || BR2_riscv || BR2_xtensa) A long list is usally cumbersome to maintain, and in this case, it is easy to split into a sequence of depends: config BR2_PACKAGE_POCO_ARCH_SUPPORTS bool default y depends on !BR2_arc depends on !BR2_microblaze [...] So I've done that, which I find more readable. And makes your patch 3 simpler too. Otherwise, series applied, thanks! Regards, Yann E. MORIN. > config BR2_PACKAGE_POCO > bool "poco" > depends on BR2_INSTALL_LIBSTDCPP > @@ -5,8 +10,7 @@ config BR2_PACKAGE_POCO > # pthread_condattr_setclock > depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > depends on !BR2_STATIC_LIBS # dlopen() > - depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \ > - || BR2_or1k || BR2_riscv || BR2_xtensa) > + depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS > select BR2_PACKAGE_ZLIB > select BR2_PACKAGE_PCRE > help > @@ -85,5 +89,4 @@ endif # BR2_PACKAGE_POCO > comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library" > depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ > || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS > - depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \ > - || BR2_or1k || BR2_xtensa) > + depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS > -- > 2.26.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Julien" == Julien Olivain <juju@cotds.org> writes: > This change is motivated by a misalignment of the Kconfig package and > comment dependencies, introduced in commit 0737f48c5f "package/poco: > disable build for riscv" (BR_riscv was missing in the comment). > Introducing BR2_PACKAGE_POCO_ARCH_SUPPORTS solve this issue. > Signed-off-by: Julien Olivain <juju@cotds.org> > --- > Changes v1 -> v2: > Suggested by Thomas: > - introduce _ARCH_SUPPORTS to prevent duplicating dependency conditions Committed to 2020.02.x and 2020.05.x, thanks.
diff --git a/package/poco/Config.in b/package/poco/Config.in index f8f921de04..13f7b3b0a3 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -1,3 +1,8 @@ +config BR2_PACKAGE_POCO_ARCH_SUPPORTS + bool + default y if !(BR2_arc || BR2_microblaze || BR2_mipsel \ + || BR2_or1k || BR2_riscv || BR2_xtensa) + config BR2_PACKAGE_POCO bool "poco" depends on BR2_INSTALL_LIBSTDCPP @@ -5,8 +10,7 @@ config BR2_PACKAGE_POCO # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() - depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \ - || BR2_or1k || BR2_riscv || BR2_xtensa) + depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_PCRE help @@ -85,5 +89,4 @@ endif # BR2_PACKAGE_POCO comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS - depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \ - || BR2_or1k || BR2_xtensa) + depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS
This change is motivated by a misalignment of the Kconfig package and comment dependencies, introduced in commit 0737f48c5f "package/poco: disable build for riscv" (BR_riscv was missing in the comment). Introducing BR2_PACKAGE_POCO_ARCH_SUPPORTS solve this issue. Signed-off-by: Julien Olivain <juju@cotds.org> --- Changes v1 -> v2: Suggested by Thomas: - introduce _ARCH_SUPPORTS to prevent duplicating dependency conditions --- package/poco/Config.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)