towards buildroot Qt6 support
cover towards buildroot Qt6 support
A very preliminary/early draft of a patchset to add Qt6 (qt6base only until now) support do buildroot.
The main change (from a package point of view) is the change to the cmake build system (with ninja preferred over makefile) and separate host/target compiles.
The qt6base config/make is still (very) work in progress...and needs a lot more fixes, adjustments and testing...
Regards,
Peter
Peter Seiderer (6):
package/libb2: new package
package/libb2/libb2.mk: fix cross-compile/runtime detection package/double-conversion: new package package/double-conversion: bump version to 3c6d2c2 package/pkg-cmake: add _INSTALL_STAGING_ENV/_INSTALL_TARGET_ENV package/qt6: new package
package/Config.in | 3 + package/double-conversion/Config.in | 12 + .../double-conversion/double-conversion.hash | 3 + .../double-conversion/double-conversion.mk | 15 + package/libb2/Config.in | 6 + package/libb2/libb2.hash | 3 + package/libb2/libb2.mk | 18 + package/pkg-cmake.mk | 7 +- package/qt6/Config.in | 75 +++ package/qt6/qt6.mk | 12 + ...disable-global-minimum-linux-support.patch | 55 ++ ...-failure-with-multiline-toolchain-fi.patch | 48 ++ package/qt6/qt6base/Config.in | 311 +++++++++++ package/qt6/qt6base/qt6base.hash | 10 + package/qt6/qt6base/qt6base.mk | 496 ++++++++++++++++++ 15 files changed, 1072 insertions(+), 2 deletions(-) create mode 100644 package/double-conversion/Config.in create mode 100644 package/double-conversion/double-conversion.hash create mode 100644 package/double-conversion/double-conversion.mk create mode 100644 package/libb2/Config.in create mode 100644 package/libb2/libb2.hash create mode 100644 package/libb2/libb2.mk create mode 100644 package/qt6/Config.in create mode 100644 package/qt6/qt6.mk create mode 100644 package/qt6/qt6base/0001-src-corelib-disable-global-minimum-linux-support.patch create mode 100644 package/qt6/qt6base/0002-QtAutoDetect-fix-failure-with-multiline-toolchain-fi.patch create mode 100644 package/qt6/qt6base/Config.in create mode 100644 package/qt6/qt6base/qt6base.hash create mode 100644 package/qt6/qt6base/qt6base.mk
Signature · 1 line
2.30.0
RFC 1/6 package/libb2: new package
--- package/Config.in | 1 + package/libb2/Config.in | 6 ++++++ package/libb2/libb2.hash | 3 +++ package/libb2/libb2.mk | 16 ++++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/libb2/Config.in create mode 100644 package/libb2/libb2.hash create mode 100644 package/libb2/libb2.mk
package/Config.in +1 -0
@@ -1353,6 +1353,7 @@ menu "Crypto" source "package/gnutls/Config.in" source "package/libargon2/Config.in" source "package/libassuan/Config.in" + source "package/libb2/Config.in" source "package/libgcrypt/Config.in" source "package/libgpg-error/Config.in" source "package/libgpgme/Config.in"
package/libb2/Config.in new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBB2 + bool "libb2" + help + C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp. + + https://github.com/BLAKE2/libb2
package/libb2/libb2.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally computed: +sha256 10053dbc2fa342516b780a6bbf6e7b2a2360b8d49c5ac426936bf3df82526732 libb2-0.98.1.tar.gz +sha256 6a1ee543e5282cd9061881edf462e6fdab181f328da71fc2c9a6950a80e94d01 COPYING
package/libb2/libb2.mk new file +16 -0
@@ -0,0 +1,16 @@ +################################################################################ +# +# libb2 +# +################################################################################ + +LIBB2_VERSION = 0.98.1 +LIBB2_SITE = $(call github,BLAKE2,libb2,v$(LIBB2_VERSION)) +LIBB2_LICENSE = CC0-1.0 +LIBB2_LICENSE_FILES = COPYING +LIBB2_INSTALL_STAGING = YES +# From git +LIBB2_AUTORECONF = YES +LIBB2_DEPENDENCIES = host-pkgconf + +$(eval $(autotools-package))
Signature · 1 line
2.30.0
RFC 2/6 package/libb2/libb2.mk: fix cross-compile/runtime detection
In reply to Peter Seiderer---
Notes:
- squash with previous patch and add proper failure/fix description
--- package/libb2/libb2.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
package/libb2/libb2.mk +3 -1
@@ -12,5 +12,7 @@ LIBB2_INSTALL_STAGING = YES # From git LIBB2_AUTORECONF = YES LIBB2_DEPENDENCIES = host-pkgconf - +# disable failing cross-compiling/runtime detection +LIBB2_CONF_ENV = ax_cv_have_ssse3_ex=no +LIBB2_CONF_OPTS = --enable-fat=no --enable-native=no $(eval $(autotools-package))
Signature · 1 line
2.30.0
RFC 3/6 package/double-conversion: new package
In reply to Peter Seiderer--- package/Config.in | 1 + package/double-conversion/Config.in | 14 ++++++++++++++ package/double-conversion/double-conversion.hash | 3 +++ package/double-conversion/double-conversion.mk | 13 +++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/double-conversion/Config.in create mode 100644 package/double-conversion/double-conversion.hash create mode 100644 package/double-conversion/double-conversion.mk
package/Config.in +1 -0
@@ -1861,6 +1861,7 @@ menu "Other" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" + source "package/double-conversion/Config.in" source "package/eigen/Config.in" source "package/elfutils/Config.in" source "package/ell/Config.in"
package/double-conversion/Config.in new file +14 -0
@@ -0,0 +1,14 @@ +config BR2_PACKAGE_DOUBLE_CONVERSION + bool "double-conversion" + # note: BR2_microblazeel/BR2_nios2/BR2_xtensa was added post v3.1.5 already + depends on !BR2_nds32 && !BR2_microblazeel && !BR2_nios2 + depends on !BR2_xtensa + depends on BR2_INSTALL_LIBSTDCPP + help + Provides binary-decimal and decimal-binary routines for + IEEE doubles. + + https://github.com/google/double-conversion + +comment "double-conversion needs a toolchian w/ C++ + depends on !BR2_INSTALL_LIBSTDCPP
package/double-conversion/double-conversion.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally computed: +sha256 a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13 double-conversion-3.1.5.tar.gz +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca COPYING
package/double-conversion/double-conversion.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# double-conversion +# +################################################################################ + +DOUBLE_CONVERSION_VERSION = 3.1.5 +DOUBLE_CONVERSION_SITE = $(call github,google,double-conversion,v$(DOUBLE_CONVERSION_VERSION)) +DOUBLE_CONVERSION_LICENSE = BSD-3-Clause +DOUBLE_CONVERSION_LICENSE_FILES = COPYING +DOUBLE_CONVERSION_INSTALL_STAGING = YES + +$(eval $(cmake-package))
Signature · 1 line
2.30.0
RFC 4/6 package/double-conversion: bump version to 3c6d2c2
In reply to Peter Seiderer---
Notes:
- squash with previous patch
- fix the remaining BR2_nds32 case
--- package/double-conversion/Config.in | 4 +--- package/double-conversion/double-conversion.hash | 2 +- package/double-conversion/double-conversion.mk | 6 ++++-- 3 files changed, 6 insertions(+), 6 deletions(-)
package/double-conversion/Config.in +1 -3
@@ -1,8 +1,6 @@ config BR2_PACKAGE_DOUBLE_CONVERSION bool "double-conversion" - # note: BR2_microblazeel/BR2_nios2/BR2_xtensa was added post v3.1.5 already - depends on !BR2_nds32 && !BR2_microblazeel && !BR2_nios2 - depends on !BR2_xtensa + depends on !BR2_nds32 depends on BR2_INSTALL_LIBSTDCPP help Provides binary-decimal and decimal-binary routines for
package/double-conversion/double-conversion.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed: -sha256 a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13 double-conversion-3.1.5.tar.gz +sha256 025e4cd3f02408df4fe8a6a0526bea69b4bc9c5536bd37dadcecec7aad568593 double-conversion-3c6d2c2ec99340bf05aa0fef7842bbaf6af4d830.tar.gz sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca COPYING
package/double-conversion/double-conversion.mk +4 -2
@@ -4,8 +4,10 @@ # ################################################################################ -DOUBLE_CONVERSION_VERSION = 3.1.5 -DOUBLE_CONVERSION_SITE = $(call github,google,double-conversion,v$(DOUBLE_CONVERSION_VERSION)) +# use git latest instead of lat release v3.1.5 to enable additioanal +# cpu archs +DOUBLE_CONVERSION_VERSION = 3c6d2c2ec99340bf05aa0fef7842bbaf6af4d830 +DOUBLE_CONVERSION_SITE = $(call github,google,double-conversion,$(DOUBLE_CONVERSION_VERSION)) DOUBLE_CONVERSION_LICENSE = BSD-3-Clause DOUBLE_CONVERSION_LICENSE_FILES = COPYING DOUBLE_CONVERSION_INSTALL_STAGING = YES
Signature · 1 line
2.30.0
RFC 5/6 package/pkg-cmake: add _INSTALL_STAGING_ENV/_INSTALL_TARGET_ENV
In reply to Peter SeidererAdd _INSTALL_STAGING_ENV/_INSTALL_TARGET_ENV as needed for ninja make/install as ninja expects the DESDIR as eviornment var instead of parameter.
This one makes ninja unhappy:
$ ninja install DESTDIR=...
This one makes ninja happy:
$ DESTDIR=... ninja install
---
ToDo:
- add documentation
Notes:
- alternative to explicit make/ninja calls maybe common 'cmake --build'/'cmake --install' calls are a feasible solution (yet untested) - pro: more common code, con:
less customizable, needs to take a look at the current users of _MAKE/_INSTALL_STAGING_OPTS/_INSTALL_TARGET_OPTS options
--- package/pkg-cmake.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
package/pkg-cmake.mk +5 -2
@@ -58,7 +58,10 @@ $(2)_MAKE_ENV ?= $(2)_MAKE_OPTS ?= $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast +$(2)_INSTALL_STAGING_ENV ?= $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast +$(2)_INSTALL_TARGET_ENV ?= + $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES
@@ -192,7 +195,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_INSTALL_STAGING_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif
@@ -202,7 +205,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_INSTALL_TARGET_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif
Signature · 1 line
2.30.0
RFC 5/6 package/pkg-cmake: add _INSTALL_STAGING_ENV/_INSTALL_TARGET_ENV
Quoted 11 lines · Peter Seiderer
Add _INSTALL_STAGING_ENV/_INSTALL_TARGET_ENV as needed for ninja make/install as ninja expects the DESDIR as eviornment var instead of parameter.
This one makes ninja unhappy:
$ ninja install DESTDIR=...This one makes ninja happy:
$ DESTDIR=... ninja install
We can use the same for make as well, so we don't need the additional ?= below.
And with that, we can actually remove _INSTALL_STAGING_OPTS and_INSTALL_TARGET_OPTS completely...
Quoted 33 lines
Signed-off-by Peter Seiderer <[email protected]>---
ToDo:
- add documentationNotes:
- alternative to explicit make/ninja calls maybe common 'cmake --build'/'cmake --install' calls are a feasible solution (yet untested) - pro: more common code, con:
less customizable, needs to take a look at the current users of _MAKE/_INSTALL_STAGING_OPTS/_INSTALL_TARGET_OPTS options--- package/pkg-cmake.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)package/pkg-cmake.mk +3
-0@@ -58,7 +58,10 @@ $(2)_MAKE_ENV ?= $(2)_MAKE_OPTS ?= $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast +$(2)_INSTALL_STAGING_ENV ?= $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast +$(2)_INSTALL_TARGET_ENV ?= + $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES
package/pkg-cmake.mk endif · line 198
Quoted 5 lines
package/pkg-cmake.mk +1
-1@@ -192,7 +195,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_INSTALL_STAGING_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR)
I.e.
$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) DESTDIR=$(STAGING_DIR) \ $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR)
Note that I think it's useful to add a $(2)_USE_NINJA option for cmake
packages. We could default that one to YES after some testing, and any package that really doesn't want ninja can set it to NO.
Regards,
Arnout
Quoted 13 lines
package/pkg-cmake.mk +1
-1endef endif@@ -202,7 +205,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_INSTALL_TARGET_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif
RFC 6/6 package/qt6: new package
In reply to Peter Seiderer--- package/Config.in | 1 + package/qt6/Config.in | 75 +++ package/qt6/qt6.mk | 12 + ...disable-global-minimum-linux-support.patch | 55 ++ ...-failure-with-multiline-toolchain-fi.patch | 48 ++ package/qt6/qt6base/Config.in | 311 +++++++++++ package/qt6/qt6base/qt6base.hash | 10 + package/qt6/qt6base/qt6base.mk | 496 ++++++++++++++++++ 8 files changed, 1008 insertions(+) create mode 100644 package/qt6/Config.in create mode 100644 package/qt6/qt6.mk create mode 100644 package/qt6/qt6base/0001-src-corelib-disable-global-minimum-linux-support.patch create mode 100644 package/qt6/qt6base/0002-QtAutoDetect-fix-failure-with-multiline-toolchain-fi.patch create mode 100644 package/qt6/qt6base/Config.in create mode 100644 package/qt6/qt6base/qt6base.hash create mode 100644 package/qt6/qt6base/qt6base.mk
package/Config.in +1 -0
@@ -354,6 +354,7 @@ comment "QT libraries and helper libraries" source "package/quazip/Config.in" source "package/qwt/Config.in" endif + source "package/qt6/Config.in" source "package/tekui/Config.in" source "package/weston/Config.in" source "package/x11r7/Config.in"
package/qt6/Config.in new file +75 -0
75 lines not on this page · raw message
package/qt6/qt6.mk new file +12 -0
@@ -0,0 +1,12 @@ +################################################################################ +# +# qt6 +# +################################################################################ + +QT6_VERSION_MAJOR = 6.0 +QT6_VERSION = $(QT6_VERSION_MAJOR).1 +QT6_SOURCE_TARBALL_PREFIX = everywhere-src +QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules + +include $(sort $(wildcard package/qt6/*/*.mk))
package/qt6/qt6base/0001-src-corelib-disable-global-minimum-linux-support.patch new file +55 -0
55 lines not on this page · raw message
package/qt6/qt6base/0002-QtAutoDetect-fix-failure-with-multiline-toolchain-fi.patch new file +48 -0
48 lines not on this page · raw message
package/qt6/qt6base/Config.in new file +311 -0
311 lines not on this page · raw message
package/qt6/qt6base/qt6base.hash new file +10 -0
@@ -0,0 +1,10 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.0/6.0.0/submodules/qtbase-everywhere-src-6.0.0.tar.xz.sha256 +sha256 8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa qtbase-everywhere-src-6.0.1.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING
package/qt6/qt6base/qt6base.mk new file +496 -0
496 lines not on this page · raw message
Signature · 1 line
2.30.0