[Buildroot] [PATCH v1 1/4] package/qt5: enable for nios2

[Buildroot] [PATCH v1 1/4] package/qt5: enable for nios2

[Peter Seiderer]

The double-conversion support for nios2 is already enabled
by commit [1], so drop dependency on !BR2_nios2.

[1] https://git.buildroot.net/buildroot/commit/?id=e2fdb41f711db8894f9c5c83f32250728d4c3aa9

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/qt5/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index e257b92b99..b2cbf336bd 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -13,7 +13,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 
 comment "Qt5 needs a toolchain w/ gcc >= 4.8, wchar, NPTL, C++, dynamic library"
 	depends on !BR2_ARM_CPU_ARMV4
-	depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa
+	depends on !BR2_arc && !BR2_xtensa
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
@@ -26,7 +26,7 @@ menuconfig BR2_PACKAGE_QT5
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
 	# no built-in double-conversion support
-	depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa
+	depends on !BR2_arc && !BR2_xtensa
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_QT5BASE
 	help
-- 
2.25.1

[Buildroot] [PATCH v1 2/4] package/qt5: enable for xtensa

[Peter Seiderer]

Add upstream patch to fix double-conversion compile for xtensa
and drop dependency on !BR_xtensa.

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/qt5/Config.in                         |  4 +--
 ...-double-conversion-enable-for-xtensa.patch | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index b2cbf336bd..b59c38aa7c 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -13,7 +13,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 
 comment "Qt5 needs a toolchain w/ gcc >= 4.8, wchar, NPTL, C++, dynamic library"
 	depends on !BR2_ARM_CPU_ARMV4
-	depends on !BR2_arc && !BR2_xtensa
+	depends on !BR2_arc
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
@@ -26,7 +26,7 @@ menuconfig BR2_PACKAGE_QT5
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
 	# no built-in double-conversion support
-	depends on !BR2_arc && !BR2_xtensa
+	depends on !BR2_arc
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_QT5BASE
 	help
diff --git a/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch b/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch
new file mode 100644
index 0000000000..769a34da24
--- /dev/null
+++ b/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch
@@ -0,0 +1,27 @@
+From cfac9a39658906b06f28208ee1d129f042760416 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Tue, 10 Mar 2020 09:01:31 +0100
+Subject: [PATCH] double-conversion: enable for xtensa
+
+[Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa]
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ .../double-conversion/include/double-conversion/utils.h         | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
+index 55ca5bf5..95b08a4e 100644
+--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
+@@ -96,7 +96,7 @@ int main(int argc, char** argv) {
+     defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
+     defined(__riscv) || defined(__EMSCRIPTEN__) || \
+     defined(__or1k__)  || \
+-    defined(__microblaze__)
++    defined(__microblaze__) || defined(__XTENSA__)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(__mc68000__) || \
+     defined(__pnacl__) || defined(__native_client__)
+-- 
+2.25.1
+
-- 
2.25.1

[Buildroot] [PATCH v1 3/4] package/pinentry: add missing qt5 dependencies

[Peter Seiderer]

 - BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 - !BR2_arc

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/pinentry/Config.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in
index 9048edd21b..7d76ee7ea9 100644
--- a/package/pinentry/Config.in
+++ b/package/pinentry/Config.in
@@ -61,6 +61,8 @@ config BR2_PACKAGE_PINENTRY_QT5
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	depends on !BR2_arc
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT5BASE_GUI
@@ -68,8 +70,9 @@ config BR2_PACKAGE_PINENTRY_QT5
 	help
 	  The pinentry-qt5 tool
 
-comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
+comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 4.8, C++, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_arc || BR2_STATIC_LIBS
 
 endif
-- 
2.25.1

[Buildroot] [PATCH v1 4/4] package/wireshark: add missing qt5 dependencies

[Peter Seiderer]

  - BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
  - !BR2_arc

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/wireshark/Config.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index 382e429a9c..8e3bc7aad5 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -21,6 +21,8 @@ config BR2_PACKAGE_WIRESHARK_GUI
 	default y
 	depends on BR2_INSTALL_LIBSTDCPP # qt5
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5
+	depends on !BR2_arc # qt5
 	depends on BR2_PACKAGE_HAS_UDEV # qt5 input
 	select BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT5BASE
@@ -34,9 +36,10 @@ config BR2_PACKAGE_WIRESHARK_GUI
 	help
 	  Enable Qt5 GUI
 
-comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL"
+comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8"
 	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_arc
 
 endif # BR2_PACKAGE_WIRESHARK
 
-- 
2.25.1

[Buildroot] [PATCH v1 1/4] package/qt5: enable for nios2

[Thomas Petazzoni]

On Tue, 10 Mar 2020 09:18:59 +0100
Peter Seiderer <ps.report@gmx.net> wrote:

> The double-conversion support for nios2 is already enabled
> by commit [1], so drop dependency on !BR2_nios2.
> 
> [1] https://git.buildroot.net/buildroot/commit/?id=e2fdb41f711db8894f9c5c83f32250728d4c3aa9
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
>  package/qt5/Config.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v1 2/4] package/qt5: enable for xtensa

[Thomas Petazzoni]

On Tue, 10 Mar 2020 09:19:00 +0100
Peter Seiderer <ps.report@gmx.net> wrote:

> Add upstream patch to fix double-conversion compile for xtensa
> and drop dependency on !BR_xtensa.
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
>  package/qt5/Config.in                         |  4 +--
>  ...-double-conversion-enable-for-xtensa.patch | 27 +++++++++++++++++++
>  2 files changed, 29 insertions(+), 2 deletions(-)
>  create mode 100644 package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v1 3/4] package/pinentry: add missing qt5 dependencies

[Thomas Petazzoni]

On Tue, 10 Mar 2020 09:19:01 +0100
Peter Seiderer <ps.report@gmx.net> wrote:

> -comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
> +comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 4.8, C++, dynamic library"
>  	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
> -		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
> +		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
> +		!BR2_arc || BR2_STATIC_LIBS

This is not the correct way to take into account architecture
dependencies. It should be:

comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 4.8, C++, dynamic library"
        depends on !BR2_arc
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
                !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
                BR2_STATIC_LIBS

I fixed that and applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v1 4/4] package/wireshark: add missing qt5 dependencies

[Thomas Petazzoni]

On Tue, 10 Mar 2020 09:19:02 +0100
Peter Seiderer <ps.report@gmx.net> wrote:

> -comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL"
> +comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8"
>  	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \
> -		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
> +		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
> +		!BR2_arc

Same problem as for pinentry in how the arch dependency is taken into
account.

Fixed to:

comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8"
        depends on !BR2_arc
        depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \
                !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8

And applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v1 1/4] package/qt5: enable for nios2

[Peter Korsgaard]

>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:

 > The double-conversion support for nios2 is already enabled
 > by commit [1], so drop dependency on !BR2_nios2.

 > [1] https://git.buildroot.net/buildroot/commit/?id=e2fdb41f711db8894f9c5c83f32250728d4c3aa9

 > Signed-off-by: Peter Seiderer <ps.report@gmx.net>

Committed to 2020.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v1 2/4] package/qt5: enable for xtensa

[Peter Korsgaard]

>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:

 > Add upstream patch to fix double-conversion compile for xtensa
 > and drop dependency on !BR_xtensa.

 > Signed-off-by: Peter Seiderer <ps.report@gmx.net>

Committed to 2020.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v1 3/4] package/pinentry: add missing qt5 dependencies

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > On Tue, 10 Mar 2020 09:19:01 +0100
 > Peter Seiderer <ps.report@gmx.net> wrote:

 >> -comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
 >> +comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 4.8, C++, dynamic library"
 >> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 >> -		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 >> +		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
 >> +		!BR2_arc || BR2_STATIC_LIBS

 > This is not the correct way to take into account architecture
 > dependencies. It should be:

 > comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 4.8, C++, dynamic library"
 >         depends on !BR2_arc
 >         depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 >                 !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
 >                 BR2_STATIC_LIBS

 > I fixed that and applied. Thanks!

Committed to 2020.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v1 4/4] package/wireshark: add missing qt5 dependencies

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > On Tue, 10 Mar 2020 09:19:02 +0100
 > Peter Seiderer <ps.report@gmx.net> wrote:

 >> -comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL"
 >> +comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8"
 >> depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \
 >> -		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
 >> +		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
 >> +		!BR2_arc

 > Same problem as for pinentry in how the arch dependency is taken into
 > account.

 > Fixed to:

 > comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8"
 >         depends on !BR2_arc
 >         depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \
 >                 !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8

 > And applied. Thanks!

Committed to 2020.02.x, thanks.

-- 
Bye, Peter Korsgaard