Skip to contentSkip to conversation

package/qt6/qt6svg: use the CMAKE_NINJA flag

PATCH Applied Thomas Devoogdt 2 participants 3 messages Aug 8, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qt6/qt6svg: use the CMAKE_NINJA flag

Use the newly introduce backend option (4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606) to specify what cmake backend to use, instead of special-coding it's use.

---
Same change as for qt6base, qt6serialbus, and qt6serialport. Missed that one because I searched for --build on an older clone.

---
 package/qt6/qt6svg/qt6svg.mk | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
package/qt6/qt6svg/qt6svg.mk +2 -14
index be0addbd0d..25e87dd208 100644
@@ -10,6 +10,8 @@ QT6SVG_SOURCE = qtsvg-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SVG_VERSION).tar.xz
 QT6SVG_INSTALL_STAGING = YES
 QT6SVG_SUPPORTS_IN_SOURCE_BUILD = NO
 
+QT6SVG_CMAKE_BACKEND = ninja
+
 QT6SVG_LICENSE = \
 	GPL-2.0+ or LGPL-3.0, \
 	GPL-3.0 with exception (tools), \
@@ -25,7 +27,6 @@ QT6SVG_LICENSE_FILES = \
 	LICENSES/Qt-GPL-exception-1.0.txt
 
 QT6SVG_CONF_OPTS = \
-	-GNinja \
 	-DQT_HOST_PATH=$(HOST_DIR) \
 	-DBUILD_WITH_PCH=OFF \
 	-DQT_BUILD_EXAMPLES=OFF \
@@ -33,19 +34,6 @@ QT6SVG_CONF_OPTS = \
 
 QT6SVG_DEPENDENCIES = \
 	host-pkgconf \
-	host-ninja \
 	qt6base
 
-define QT6SVG_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SVG_BUILDDIR)
-endef
-
-define QT6SVG_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SVG_BUILDDIR)
-endef
-
-define QT6SVG_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SVG_BUILDDIR)
-endef
-
 $(eval $(cmake-package))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Thomas Devoogdt
Quoted 10 lines · On Tue, 8 Aug 2023 09:02:45 +0200 Thomas Devoogdt <[email protected]> wrote:

Use the newly introduce backend option (4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606) to specify what cmake backend to use, instead of special-coding it's use.

---
Same change as for qt6base, qt6serialbus, and qt6serialport. Missed that one because I searched for --build on an older clone.

---
 package/qt6/qt6svg/qt6svg.mk | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

Applied to next, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot