From 7793f4d72735bbdf7daf706056737796296b618a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sun, 18 Sep 2022 10:39:54 +0200
Subject: [PATCH] package/qt6/qt6base: order conditional blocks alphabetically

This commit changes qt6base.mk to order conditional blocks
alphabetically based on the BR2_PACKAGE_* option they test.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/qt6/qt6base/qt6base.mk | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index e8bb8e7e47..44092ffc82 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -77,6 +77,15 @@ 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.
+
+ifeq ($(BR2_PACKAGE_QT6BASE_CONCURRENT),y)
+QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON
+else
+QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF
+endif
+
 # We need host-qt6base with D-Bus support, otherwise: "the tool
 # "Qt6::qdbuscpp2xml" was not found in the Qt6DBusTools package."
 ifeq ($(BR2_PACKAGE_QT6BASE_DBUS),y)
@@ -95,10 +104,10 @@ else
 QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_QT6BASE_CONCURRENT),y)
-QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON
+ifeq ($(BR2_PACKAGE_QT6BASE_SYSLOG),y)
+QT6BASE_CONF_OPTS += -DFEATURE_syslog=ON
 else
-QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF
+QT6BASE_CONF_OPTS += -DFEATURE_syslog=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_QT6BASE_TEST),y)
@@ -113,11 +122,5 @@ else
 QT6BASE_CONF_OPTS += -DFEATURE_xml=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_QT6BASE_SYSLOG),y)
-QT6BASE_CONF_OPTS += -DFEATURE_syslog=ON
-else
-QT6BASE_CONF_OPTS += -DFEATURE_syslog=OFF
-endif
-
 $(eval $(cmake-package))
 $(eval $(host-cmake-package))