From 39c3ad67401fadf8ebcb7d591649d821dc02411a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 12 Mar 2022 21:16:24 +0100 Subject: [PATCH] package/poco: reorder options alphabetically This commit reorders dependencies and Kconfig package options alphabetically for better maintainability. This commit does not change anything else. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/poco/Config.in | 84 +++++++++++++++++++++--------------------- package/poco/poco.mk | 30 +++++++-------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index dd87ee36bb..df3d3cbc66 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -28,41 +28,50 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_CPP_PARSER + bool "cpp_parser" + +config BR2_PACKAGE_POCO_CRYPTO + bool "crypto" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL + +config BR2_PACKAGE_POCO_DATA + bool + +config BR2_PACKAGE_POCO_DATA_MYSQL + bool "mysql" + depends on BR2_USE_MMU # mysql + select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_POCO_DATA + +config BR2_PACKAGE_POCO_DATA_SQLITE + bool "sqlite" + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_SQLITE + config BR2_PACKAGE_POCO_JSON bool "json" -config BR2_PACKAGE_POCO_XML - bool "xml" - select BR2_PACKAGE_EXPAT +config BR2_PACKAGE_POCO_JWT + bool "jwt" + select BR2_PACKAGE_POCO_CRYPTO + select BR2_PACKAGE_POCO_JSON -config BR2_PACKAGE_POCO_UTIL - bool "util" - select BR2_PACKAGE_POCO_XML +config BR2_PACKAGE_POCO_MONGODB + bool "mongodb" + select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_NET bool "net" -config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL - config BR2_PACKAGE_POCO_NETSSL_OPENSSL bool "netssl_openssl" - select BR2_PACKAGE_POCO_NET - select BR2_PACKAGE_POCO_CRYPTO - select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_POCO_ZIP - bool "zip" - select BR2_PACKAGE_POCO_XML + select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL -config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" - config BR2_PACKAGE_POCO_PDF bool "pdf" select BR2_PACKAGE_POCO_JSON @@ -73,28 +82,19 @@ config BR2_PACKAGE_POCO_REDIS bool "redis" select BR2_PACKAGE_POCO_NET -config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" +config BR2_PACKAGE_POCO_UTIL + bool "util" + select BR2_PACKAGE_POCO_XML + +config BR2_PACKAGE_POCO_XML + bool "xml" + select BR2_PACKAGE_EXPAT + +config BR2_PACKAGE_POCO_ZIP + bool "zip" select BR2_PACKAGE_POCO_NET - -config BR2_PACKAGE_POCO_DATA - bool - -config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_SQLITE - -config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" - depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_MYSQL - -config BR2_PACKAGE_POCO_JWT - bool "jwt" - select BR2_PACKAGE_POCO_JSON - select BR2_PACKAGE_POCO_CRYPTO + select BR2_PACKAGE_POCO_UTIL + select BR2_PACKAGE_POCO_XML endif # BR2_PACKAGE_POCO diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 857f215e3a..81409ffec4 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -11,29 +11,29 @@ POCO_LICENSE_FILES = LICENSE POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES -POCO_DEPENDENCIES = zlib pcre \ - $(if $(BR2_PACKAGE_POCO_XML),expat) \ +POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_XML),expat) POCO_OMIT = Data/ODBC PageCompiler \ - $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ - $(if $(BR2_PACKAGE_POCO_XML),,XML) \ - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ - $(if $(BR2_PACKAGE_POCO_NET),,Net) \ - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ - $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ - $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ - $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ + $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ - $(if $(BR2_PACKAGE_POCO_JWT),,JWT) + $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ + $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ + $(if $(BR2_PACKAGE_POCO_NET),,Net) \ + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ + $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ + $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ + $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_XML),,XML) \ + $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POCO_CONF_OPTS += --no-fpenvironment --no-wstring