* [Buildroot] [PATCH v1 2/3 next] package/qt6/qt6serialbus: use the CMAKE_NINJA flag
2023-08-07 14:58 [Buildroot] [PATCH v1 1/3 next] package/qt6/qt6serialport: use the CMAKE_NINJA flag Thomas Devoogdt
@ 2023-08-07 14:58 ` Thomas Devoogdt
2023-08-07 14:58 ` [Buildroot] [PATCH v1 3/3 next] package/qt6/qt6base: " Thomas Devoogdt
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Devoogdt @ 2023-08-07 14:58 UTC (permalink / raw)
To: buildroot
Cc: Jesse Van Gavere, Yann E . MORIN, Thomas Petazzoni,
Thomas Devoogdt
Use the newly introduce backend option (4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606)
to specify what cmake backend to use, instead of special-coding it's use.
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
package/qt6/qt6serialbus/qt6serialbus.mk | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk
index 0717736387..631531e14f 100644
--- a/package/qt6/qt6serialbus/qt6serialbus.mk
+++ b/package/qt6/qt6serialbus/qt6serialbus.mk
@@ -10,6 +10,8 @@ QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VE
QT6SERIALBUS_INSTALL_STAGING = YES
QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO
+QT6SERIALBUS_CMAKE_BACKEND = ninja
+
QT6SERIALBUS_LICENSE = \
GPL-2.0+ or LGPL-3.0, \
GPL-3.0, GFDL-1.3 no invariants (docs)
@@ -21,7 +23,6 @@ QT6SERIALBUS_LICENSE_FILES = \
LICENSES/GFDL-1.3-no-invariants-only.txt
QT6SERIALBUS_CONF_OPTS = \
- -GNinja \
-DQT_HOST_PATH=$(HOST_DIR) \
-DBUILD_WITH_PCH=OFF \
-DQT_BUILD_EXAMPLES=OFF \
@@ -30,16 +31,4 @@ QT6SERIALBUS_CONF_OPTS = \
QT6SERIALBUS_DEPENDENCIES = \
qt6serialport
-define QT6SERIALBUS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR)
-endef
-
-define QT6SERIALBUS_INSTALL_STAGING_CMDS
- $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR)
-endef
-
-define QT6SERIALBUS_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR)
-endef
-
$(eval $(cmake-package))
--
2.41.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v1 3/3 next] package/qt6/qt6base: use the CMAKE_NINJA flag
2023-08-07 14:58 [Buildroot] [PATCH v1 1/3 next] package/qt6/qt6serialport: use the CMAKE_NINJA flag Thomas Devoogdt
2023-08-07 14:58 ` [Buildroot] [PATCH v1 2/3 next] package/qt6/qt6serialbus: " Thomas Devoogdt
@ 2023-08-07 14:58 ` Thomas Devoogdt
2023-08-07 21:26 ` [Buildroot] [PATCH v1 1/3 next] package/qt6/qt6serialport: " Thomas Petazzoni via buildroot
2023-08-07 21:31 ` Yann E. MORIN
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Devoogdt @ 2023-08-07 14:58 UTC (permalink / raw)
To: buildroot
Cc: Jesse Van Gavere, Yann E . MORIN, Thomas Petazzoni,
Thomas Devoogdt
Use the newly introduce backend option (4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606)
to specify what cmake backend to use, instead of special-coding it's use.
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
package/qt6/qt6base/qt6base.mk | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index e6cf4f14bb..4a01bb17b2 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -8,6 +8,8 @@ QT6BASE_VERSION = $(QT6_VERSION)
QT6BASE_SITE = $(QT6_SITE)
QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz
+QT6BASE_CMAKE_BACKEND = ninja
+
QT6BASE_LICENSE = \
GPL-2.0+ or LGPL-3.0, \
GPL-3.0 with exception (tools), \
@@ -29,7 +31,6 @@ QT6BASE_LICENSE_FILES = \
LICENSES/Qt-GPL-exception-1.0.txt
QT6BASE_DEPENDENCIES = \
- host-ninja \
host-qt6base \
double-conversion \
libb2 \
@@ -38,7 +39,6 @@ QT6BASE_DEPENDENCIES = \
QT6BASE_INSTALL_STAGING = YES
QT6BASE_CONF_OPTS = \
- -GNinja \
-DQT_HOST_PATH=$(HOST_DIR) \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=OFF \
@@ -76,26 +76,12 @@ QT6BASE_CONF_OPTS += \
-DFEATURE_avx512vl=OFF \
-DFEATURE_vaes=OFF
-define QT6BASE_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR)
-endef
-
-define QT6BASE_INSTALL_STAGING_CMDS
- $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR)
-endef
-
-define QT6BASE_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR)
-endef
-
HOST_QT6BASE_DEPENDENCIES = \
- host-ninja \
host-double-conversion \
host-libb2 \
host-pcre2 \
host-zlib
HOST_QT6BASE_CONF_OPTS = \
- -GNinja \
-DFEATURE_gui=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
@@ -110,14 +96,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_zlib=ON
-define HOST_QT6BASE_BUILD_CMDS
- $(HOST_MAKE_ENV) $(BR2_CMAKE) --build $(HOST_QT6BASE_BUILDDIR)
-endef
-
-define HOST_QT6BASE_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR)
-endef
-
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.41.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH v1 1/3 next] package/qt6/qt6serialport: use the CMAKE_NINJA flag
2023-08-07 14:58 [Buildroot] [PATCH v1 1/3 next] package/qt6/qt6serialport: use the CMAKE_NINJA flag Thomas Devoogdt
2023-08-07 14:58 ` [Buildroot] [PATCH v1 2/3 next] package/qt6/qt6serialbus: " Thomas Devoogdt
2023-08-07 14:58 ` [Buildroot] [PATCH v1 3/3 next] package/qt6/qt6base: " Thomas Devoogdt
@ 2023-08-07 21:26 ` Thomas Petazzoni via buildroot
2023-08-07 21:31 ` Yann E. MORIN
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-08-07 21:26 UTC (permalink / raw)
To: Thomas Devoogdt
Cc: Thomas Devoogdt, Jesse Van Gavere, Yann E . MORIN, buildroot
On Mon, 7 Aug 2023 16:58:37 +0200
Thomas Devoogdt <thomas@devoogdt.com> wrote:
> Use the newly introduce backend option (4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606)
> to specify what cmake backend to use, instead of special-coding it's use.
>
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
> ---
> package/qt6/qt6serialport/qt6serialport.mk | 16 ++--------------
> 1 file changed, 2 insertions(+), 14 deletions(-)
All three applied to next, thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH v1 1/3 next] package/qt6/qt6serialport: use the CMAKE_NINJA flag
2023-08-07 14:58 [Buildroot] [PATCH v1 1/3 next] package/qt6/qt6serialport: use the CMAKE_NINJA flag Thomas Devoogdt
` (2 preceding siblings ...)
2023-08-07 21:26 ` [Buildroot] [PATCH v1 1/3 next] package/qt6/qt6serialport: " Thomas Petazzoni via buildroot
@ 2023-08-07 21:31 ` Yann E. MORIN
2023-08-08 5:24 ` Thomas Devoogdt
3 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2023-08-07 21:31 UTC (permalink / raw)
To: Thomas Devoogdt
Cc: Jesse Van Gavere, Thomas Devoogdt, Thomas Petazzoni, buildroot
Thomas, All,
Thanks for this series. Thomas P. applied it before I had a chance to
reply, so:
Is there an issue with qt6svg, or did you just miss it?
Regards,
Yann E. MORIN.
On 2023-08-07 16:58 +0200, Thomas Devoogdt spake thusly:
> Use the newly introduce backend option (4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606)
> to specify what cmake backend to use, instead of special-coding it's use.
>
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
> ---
> package/qt6/qt6serialport/qt6serialport.mk | 16 ++--------------
> 1 file changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk
> index 497719d4ec..bdb16dd892 100644
> --- a/package/qt6/qt6serialport/qt6serialport.mk
> +++ b/package/qt6/qt6serialport/qt6serialport.mk
> @@ -10,6 +10,8 @@ QT6SERIALPORT_SOURCE = qtserialport-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALPORT
> QT6SERIALPORT_INSTALL_STAGING = YES
> QT6SERIALPORT_SUPPORTS_IN_SOURCE_BUILD = NO
>
> +QT6SERIALPORT_CMAKE_BACKEND = ninja
> +
> QT6SERIALPORT_LICENSE = \
> GPL-2.0+ or LGPL-3.0, \
> GPL-3.0 with exception (tools), \
> @@ -25,7 +27,6 @@ QT6SERIALPORT_LICENSE_FILES = \
> LICENSES/Qt-GPL-exception-1.0.txt
>
> QT6SERIALPORT_CONF_OPTS = \
> - -GNinja \
> -DQT_HOST_PATH=$(HOST_DIR) \
> -DBUILD_WITH_PCH=OFF \
> -DQT_BUILD_EXAMPLES=OFF \
> @@ -33,19 +34,6 @@ QT6SERIALPORT_CONF_OPTS = \
>
> QT6SERIALPORT_DEPENDENCIES = \
> host-pkgconf \
> - host-ninja \
> qt6base
>
> -define QT6SERIALPORT_BUILD_CMDS
> - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALPORT_BUILDDIR)
> -endef
> -
> -define QT6SERIALPORT_INSTALL_STAGING_CMDS
> - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR)
> -endef
> -
> -define QT6SERIALPORT_INSTALL_TARGET_CMDS
> - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR)
> -endef
> -
> $(eval $(cmake-package))
> --
> 2.41.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Buildroot] [PATCH v1 1/3 next] package/qt6/qt6serialport: use the CMAKE_NINJA flag
2023-08-07 21:31 ` Yann E. MORIN
@ 2023-08-08 5:24 ` Thomas Devoogdt
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Devoogdt @ 2023-08-08 5:24 UTC (permalink / raw)
To: Yann E. MORIN
Cc: Thomas Devoogdt, Jesse Van Gavere, Thomas Devoogdt,
Thomas Petazzoni, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 3098 bytes --]
Yann, All,
Ah wow, missed it, will change it too and re-run test-pkg with that one
include. The other three simply passed for the default test-pkg
architectures.
Kr,
Thomas
Op ma 7 aug. 2023 23:31 schreef Yann E. MORIN <yann.morin.1998@free.fr>:
> Thomas, All,
>
> Thanks for this series. Thomas P. applied it before I had a chance to
> reply, so:
>
> Is there an issue with qt6svg, or did you just miss it?
>
> Regards,
> Yann E. MORIN.
>
> On 2023-08-07 16:58 +0200, Thomas Devoogdt spake thusly:
> > Use the newly introduce backend option
> (4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606)
> > to specify what cmake backend to use, instead of special-coding it's use.
> >
> > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
> > ---
> > package/qt6/qt6serialport/qt6serialport.mk | 16 ++--------------
> > 1 file changed, 2 insertions(+), 14 deletions(-)
> >
> > diff --git a/package/qt6/qt6serialport/qt6serialport.mk
> b/package/qt6/qt6serialport/qt6serialport.mk
> > index 497719d4ec..bdb16dd892 100644
> > --- a/package/qt6/qt6serialport/qt6serialport.mk
> > +++ b/package/qt6/qt6serialport/qt6serialport.mk
> > @@ -10,6 +10,8 @@ QT6SERIALPORT_SOURCE =
> qtserialport-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALPORT
> > QT6SERIALPORT_INSTALL_STAGING = YES
> > QT6SERIALPORT_SUPPORTS_IN_SOURCE_BUILD = NO
> >
> > +QT6SERIALPORT_CMAKE_BACKEND = ninja
> > +
> > QT6SERIALPORT_LICENSE = \
> > GPL-2.0+ or LGPL-3.0, \
> > GPL-3.0 with exception (tools), \
> > @@ -25,7 +27,6 @@ QT6SERIALPORT_LICENSE_FILES = \
> > LICENSES/Qt-GPL-exception-1.0.txt
> >
> > QT6SERIALPORT_CONF_OPTS = \
> > - -GNinja \
> > -DQT_HOST_PATH=$(HOST_DIR) \
> > -DBUILD_WITH_PCH=OFF \
> > -DQT_BUILD_EXAMPLES=OFF \
> > @@ -33,19 +34,6 @@ QT6SERIALPORT_CONF_OPTS = \
> >
> > QT6SERIALPORT_DEPENDENCIES = \
> > host-pkgconf \
> > - host-ninja \
> > qt6base
> >
> > -define QT6SERIALPORT_BUILD_CMDS
> > - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALPORT_BUILDDIR)
> > -endef
> > -
> > -define QT6SERIALPORT_INSTALL_STAGING_CMDS
> > - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install
> $(QT6SERIALPORT_BUILDDIR)
> > -endef
> > -
> > -define QT6SERIALPORT_INSTALL_TARGET_CMDS
> > - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install
> $(QT6SERIALPORT_BUILDDIR)
> > -endef
> > -
> > $(eval $(cmake-package))
> > --
> > 2.41.0
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
>
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
> conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___
> |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is
> no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v
> conspiracy. |
>
> '------------------------------^-------^------------------^--------------------'
>
>
[-- Attachment #1.2: Type: text/html, Size: 4870 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread