Skip to contentSkip to conversation

package/qt5: enable for nios2

PATCH New Peter Seiderer 3 participants 12 messages Mar 10, 2020 – Mar 27, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 package/qt5: enable for nios2

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

---
 package/qt5/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/Config.in +2 -2
index e257b92b99..b2cbf336bd 100644
@@ -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
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/4 package/qt5: enable for xtensa

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

---
 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
package/qt5/Config.in +2 -2
index b2cbf336bd..b59c38aa7c 100644
@@ -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
package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch new file +27 -0
new file mode 100644
index 0000000000..769a34da24
@@ -0,0 +1,27 @@
+From cfac9a39658906b06f28208ee1d129f042760416 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <[email protected]>
+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 <[email protected]>
+---
+ .../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
+
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/4 package/qt5: enable for xtensa

Quoted 9 lines · On Tue, 10 Mar 2020 09:19:00 +0100 Peter Seiderer <[email protected]> wrote:

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

---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 3/4 package/pinentry: add missing qt5 dependencies

In reply to Peter Seiderer

- BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
- !BR2_arc

---
 package/pinentry/Config.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/pinentry/Config.in +5 -2
index 9048edd21b..7d76ee7ea9 100644
@@ -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
Signature · 1 line
2.25.1
#5 lore raw

PATCH 3/4 package/pinentry: add missing qt5 dependencies

package/pinentry/Config.in config BR2_PACKAGE_PINENTRY_QT5 · line 76

Quoted 6 lines · On Tue, 10 Mar 2020 09:19:01 +0100 Peter Seiderer <[email protected]> wrote:
package/pinentry/Config.in +3 -2
-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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

PATCH 3/4 package/pinentry: add missing qt5 dependencies

Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

package/pinentry/Config.in config BR2_PACKAGE_PINENTRY_QT5 · line 76

Quoted 6 lines · On Tue, 10 Mar 2020 09:19:01 +0100 Peter Seiderer <[email protected]> wrote:
package/pinentry/Config.in +1 -1
-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 || \

package/pinentry/Config.in +2 -1
-		!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:

Quoted 7 lines

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.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 4/4 package/wireshark: add missing qt5 dependencies

In reply to Peter Seiderer

- BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
- !BR2_arc

---
 package/wireshark/Config.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/wireshark/Config.in +5 -2
index 382e429a9c..8e3bc7aad5 100644
@@ -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
 
Signature · 1 line
2.25.1
#8 lore raw

PATCH 4/4 package/wireshark: add missing qt5 dependencies

package/wireshark/Config.in config BR2_PACKAGE_WIRESHARK_GUI · line 42

Quoted 6 lines · On Tue, 10 Mar 2020 09:19:02 +0100 Peter Seiderer <[email protected]> wrote:
package/wireshark/Config.in +3 -2
-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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#9 lore raw

PATCH 4/4 package/wireshark: add missing qt5 dependencies

Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

package/wireshark/Config.in config BR2_PACKAGE_WIRESHARK_GUI · line 42

Quoted 6 lines · On Tue, 10 Mar 2020 09:19:02 +0100 Peter Seiderer <[email protected]> wrote:
package/wireshark/Config.in +1 -1
-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 || \

package/wireshark/Config.in +2 -1
-		!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.

Quoted 8 lines

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.

Signature · 1 line
Bye, Peter Korsgaard
#10 lore raw

PATCH 1/4 package/qt5: enable for nios2

In reply to Peter Seiderer
Quoted 9 lines · On Tue, 10 Mar 2020 09:18:59 +0100 Peter Seiderer <[email protected]> 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

---
 package/qt5/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#11 lore raw

PATCH 1/4 package/qt5: enable for nios2

In reply to Peter Seiderer
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> 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

Committed to 2020.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard