* [Buildroot] [PATCH 1/1] package/re2: propagate libabseil-cpp dependencies
@ 2024-01-18 22:04 Fabrice Fontaine
2024-01-31 9:17 ` Michael Nosthoff via buildroot
2024-02-07 11:50 ` Thomas Petazzoni via buildroot
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2024-01-18 22:04 UTC (permalink / raw)
To: buildroot; +Cc: Giulio Benetti, Julien Corjon, Fabrice Fontaine
Commit fc7606010e4edde7a34c545fac0fe7f82d4a5e18 forgot to propagate
libabseil-cpp dependencies to re2
Fixes:
- No autobuilder failures (yet)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/qt5/qt5webengine/Config.in | 7 +++++--
package/re2/Config.in | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
index cfa5893f41..49c9d0e450 100644
--- a/package/qt5/qt5webengine/Config.in
+++ b/package/qt5/qt5webengine/Config.in
@@ -10,11 +10,12 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
depends on !BR2_BINFMT_FLAT # qt5base-icu
depends on BR2_USE_MMU # libglib2, qt5base-dbus
-comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar"
+comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, dynamic library, threads, wchar"
depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \
- !BR2_HOST_GCC_AT_LEAST_4_9 || \
+ !BR2_HOST_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
comment "qt5webengine needs an OpenGL and EGL-capable backend"
@@ -24,6 +25,8 @@ comment "qt5webengine needs an OpenGL and EGL-capable backend"
config BR2_PACKAGE_QT5WEBENGINE
bool "qt5webengine"
depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # re2
+ depends on !BR2_STATIC_LIBS # re2
depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo
depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2
diff --git a/package/re2/Config.in b/package/re2/Config.in
index 0ac0041f6d..b79e711ad3 100644
--- a/package/re2/Config.in
+++ b/package/re2/Config.in
@@ -1,8 +1,10 @@
config BR2_PACKAGE_RE2
bool "re2"
+ depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14
depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_STATIC_LIBS # libabseil-cpp
select BR2_PACKAGE_LIBABSEIL_CPP
help
RE2 is a fast, safe, thread-friendly alternative
@@ -12,7 +14,8 @@ config BR2_PACKAGE_RE2
https://github.com/google/re2
-comment "re2 needs a toolchain w/ C++, threads, gcc >= 8"
+comment "re2 needs a toolchain w/ C++, threads, dynamic library, gcc >= 8"
+ depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_8
+ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/re2: propagate libabseil-cpp dependencies
2024-01-18 22:04 [Buildroot] [PATCH 1/1] package/re2: propagate libabseil-cpp dependencies Fabrice Fontaine
@ 2024-01-31 9:17 ` Michael Nosthoff via buildroot
2024-02-07 11:50 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Michael Nosthoff via buildroot @ 2024-01-31 9:17 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Giulio Benetti, Julien Corjon, Yann E. MORIN, buildroot
On Thursday, January 18, 2024 23:04 CET, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
Hi Fabrice,
> Commit fc7606010e4edde7a34c545fac0fe7f82d4a5e18 forgot to propagate
> libabseil-cpp dependencies to re2
>
whoops, yes I forgot that.
> Fixes:
> - No autobuilder failures (yet)
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/qt5/qt5webengine/Config.in | 7 +++++--
> package/re2/Config.in | 7 +++++--
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
> index cfa5893f41..49c9d0e450 100644
> --- a/package/qt5/qt5webengine/Config.in
> +++ b/package/qt5/qt5webengine/Config.in
> @@ -10,11 +10,12 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
> depends on !BR2_BINFMT_FLAT # qt5base-icu
> depends on BR2_USE_MMU # libglib2, qt5base-dbus
>
> -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar"
> +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, dynamic library, threads, wchar"
> depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
> + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
> depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \
> !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \
> - !BR2_HOST_GCC_AT_LEAST_4_9 || \
> + !BR2_HOST_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS || \
> !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
>
> comment "qt5webengine needs an OpenGL and EGL-capable backend"
> @@ -24,6 +25,8 @@ comment "qt5webengine needs an OpenGL and EGL-capable backend"
> config BR2_PACKAGE_QT5WEBENGINE
> bool "qt5webengine"
> depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
> + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # re2
> + depends on !BR2_STATIC_LIBS # re2
> depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo
> depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2
> diff --git a/package/re2/Config.in b/package/re2/Config.in
> index 0ac0041f6d..b79e711ad3 100644
> --- a/package/re2/Config.in
> +++ b/package/re2/Config.in
> @@ -1,8 +1,10 @@
> config BR2_PACKAGE_RE2
> bool "re2"
> + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
> depends on BR2_INSTALL_LIBSTDCPP
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14
> depends on BR2_TOOLCHAIN_HAS_THREADS
> + depends on !BR2_STATIC_LIBS # libabseil-cpp
> select BR2_PACKAGE_LIBABSEIL_CPP
> help
> RE2 is a fast, safe, thread-friendly alternative
> @@ -12,7 +14,8 @@ config BR2_PACKAGE_RE2
>
> https://github.com/google/re2
>
> -comment "re2 needs a toolchain w/ C++, threads, gcc >= 8"
> +comment "re2 needs a toolchain w/ C++, threads, dynamic library, gcc >= 8"
> + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
> depends on !BR2_INSTALL_LIBSTDCPP || \
> !BR2_TOOLCHAIN_HAS_THREADS || \
> - !BR2_TOOLCHAIN_GCC_AT_LEAST_8
> + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8
> --
> 2.43.0
LGTM.
Minor: Yann proposed a similar patch [0] recently where he also adds a comment to grpc for !BR2_STATIC_LIBS coming from re2.
Reviewed-by: Michael Nosthoff <buildroot@heine.tech>
[0] https://patchwork.ozlabs.org/project/buildroot/patch/afdc6d0fddd8f45aea24b544612a680bfa241475.1706448055.git.yann.morin.1998@free.fr/
Regards,
Michael
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/re2: propagate libabseil-cpp dependencies
2024-01-18 22:04 [Buildroot] [PATCH 1/1] package/re2: propagate libabseil-cpp dependencies Fabrice Fontaine
2024-01-31 9:17 ` Michael Nosthoff via buildroot
@ 2024-02-07 11:50 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-02-07 11:50 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Giulio Benetti, Julien Corjon, buildroot
On Thu, 18 Jan 2024 23:04:22 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Commit fc7606010e4edde7a34c545fac0fe7f82d4a5e18 forgot to propagate
> libabseil-cpp dependencies to re2
>
> Fixes:
> - No autobuilder failures (yet)
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/qt5/qt5webengine/Config.in | 7 +++++--
> package/re2/Config.in | 7 +++++--
> 2 files changed, 10 insertions(+), 4 deletions(-)
I updated the package/grpc/Config.in package, as Yann did in his patch.
> diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
> index cfa5893f41..49c9d0e450 100644
> --- a/package/qt5/qt5webengine/Config.in
> +++ b/package/qt5/qt5webengine/Config.in
> @@ -10,11 +10,12 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
> depends on !BR2_BINFMT_FLAT # qt5base-icu
> depends on BR2_USE_MMU # libglib2, qt5base-dbus
>
> -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar"
> +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, dynamic library, threads, wchar"
> depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
> + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS
This should have gone into BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS, so I
moved it there.
Thanks, applied with those two changes!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-07 11:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-18 22:04 [Buildroot] [PATCH 1/1] package/re2: propagate libabseil-cpp dependencies Fabrice Fontaine
2024-01-31 9:17 ` Michael Nosthoff via buildroot
2024-02-07 11:50 ` Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox