All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically
@ 2022-03-12 20:16 Julien Olivain
  2022-03-12 20:16 ` [Buildroot] [PATCH 2/4] package/poco: use poco component names in kconfig variables Julien Olivain
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Julien Olivain @ 2022-03-12 20:16 UTC (permalink / raw)
  To: buildroot; +Cc: Julien Olivain

This commit reorders dependencies and Kconfig package options
alphabetically for better maintainability.

This commit does not change anything else.

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 package/poco/Config.in | 82 +++++++++++++++++++++---------------------
 package/poco/poco.mk   | 28 +++++++--------
 2 files changed, 55 insertions(+), 55 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"
-	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_UTIL
+	bool "util"
+	select BR2_PACKAGE_POCO_XML
 
-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_XML
+	bool "xml"
+	select BR2_PACKAGE_EXPAT
 
-config BR2_PACKAGE_POCO_JWT
-	bool "jwt"
-	select BR2_PACKAGE_POCO_JSON
-	select BR2_PACKAGE_POCO_CRYPTO
+config BR2_PACKAGE_POCO_ZIP
+	bool "zip"
+	select BR2_PACKAGE_POCO_NET
+	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_CPP_PARSER),,CppParser) \
+	$(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_JSON),,JSON) \
-	$(if $(BR2_PACKAGE_POCO_XML),,XML) \
-	$(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
+	$(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_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_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_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
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/4] package/poco: use poco component names in kconfig variables
  2022-03-12 20:16 [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Julien Olivain
@ 2022-03-12 20:16 ` Julien Olivain
  2022-03-12 20:16 ` [Buildroot] [PATCH 3/4] package/poco: add Data/PostgreSQL support Julien Olivain
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Julien Olivain @ 2022-03-12 20:16 UTC (permalink / raw)
  To: buildroot; +Cc: Julien Olivain

For clarity, use the same names used in documentation, and component
selection in configure. Valid poco component names are defined in:
https://github.com/pocoproject/poco/blob/poco-1.11.1-release/components

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 package/poco/Config.in | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index df3d3cbc66..79ffac741d 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -29,10 +29,10 @@ if BR2_PACKAGE_POCO
 comment "poco components"
 
 config BR2_PACKAGE_POCO_CPP_PARSER
-	bool "cpp_parser"
+	bool "CppParser"
 
 config BR2_PACKAGE_POCO_CRYPTO
-	bool "crypto"
+	bool "Crypto"
 	select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL
 	select BR2_PACKAGE_OPENSSL
 
@@ -40,58 +40,58 @@ config BR2_PACKAGE_POCO_DATA
 	bool
 
 config BR2_PACKAGE_POCO_DATA_MYSQL
-	bool "mysql"
+	bool "Data/MySQL"
 	depends on BR2_USE_MMU # mysql
 	select BR2_PACKAGE_MYSQL
 	select BR2_PACKAGE_POCO_DATA
 
 config BR2_PACKAGE_POCO_DATA_SQLITE
-	bool "sqlite"
+	bool "Data/SQLite"
 	select BR2_PACKAGE_POCO_DATA
 	select BR2_PACKAGE_SQLITE
 
 config BR2_PACKAGE_POCO_JSON
-	bool "json"
+	bool "JSON"
 
 config BR2_PACKAGE_POCO_JWT
-	bool "jwt"
+	bool "JWT"
 	select BR2_PACKAGE_POCO_CRYPTO
 	select BR2_PACKAGE_POCO_JSON
 
 config BR2_PACKAGE_POCO_MONGODB
-	bool "mongodb"
+	bool "MongoDB"
 	select BR2_PACKAGE_POCO_NET
 
 config BR2_PACKAGE_POCO_NET
-	bool "net"
+	bool "Net"
 
 config BR2_PACKAGE_POCO_NETSSL_OPENSSL
-	bool "netssl_openssl"
+	bool "NetSSL_OpenSSL"
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_POCO_CRYPTO
 	select BR2_PACKAGE_POCO_NET
 	select BR2_PACKAGE_POCO_UTIL
 
 config BR2_PACKAGE_POCO_PDF
-	bool "pdf"
+	bool "PDF"
 	select BR2_PACKAGE_POCO_JSON
 	select BR2_PACKAGE_POCO_UTIL
 	select BR2_PACKAGE_POCO_XML
 
 config BR2_PACKAGE_POCO_REDIS
-	bool "redis"
+	bool "Redis"
 	select BR2_PACKAGE_POCO_NET
 
 config BR2_PACKAGE_POCO_UTIL
-	bool "util"
+	bool "Util"
 	select BR2_PACKAGE_POCO_XML
 
 config BR2_PACKAGE_POCO_XML
-	bool "xml"
+	bool "XML"
 	select BR2_PACKAGE_EXPAT
 
 config BR2_PACKAGE_POCO_ZIP
-	bool "zip"
+	bool "Zip"
 	select BR2_PACKAGE_POCO_NET
 	select BR2_PACKAGE_POCO_UTIL
 	select BR2_PACKAGE_POCO_XML
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/4] package/poco: add Data/PostgreSQL support
  2022-03-12 20:16 [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Julien Olivain
  2022-03-12 20:16 ` [Buildroot] [PATCH 2/4] package/poco: use poco component names in kconfig variables Julien Olivain
@ 2022-03-12 20:16 ` Julien Olivain
  2022-03-12 20:16 ` [Buildroot] [PATCH 4/4] package/poco: bump to version 1.11.1 Julien Olivain
  2022-03-23 20:24 ` [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Arnout Vandecappelle
  3 siblings, 0 replies; 5+ messages in thread
From: Julien Olivain @ 2022-03-12 20:16 UTC (permalink / raw)
  To: buildroot; +Cc: Julien Olivain

PostgreSQL support was introduced in poco v1.10.0, in commit:
https://github.com/pocoproject/poco/commit/8cec8f6451b9a0ead80f655eee986040863e3526

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 package/poco/Config.in | 6 ++++++
 package/poco/poco.mk   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index 79ffac741d..714e40f447 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -45,6 +45,12 @@ config BR2_PACKAGE_POCO_DATA_MYSQL
 	select BR2_PACKAGE_MYSQL
 	select BR2_PACKAGE_POCO_DATA
 
+config BR2_PACKAGE_POCO_DATA_PGSQL
+	bool "Data/PostgreSQL"
+	depends on BR2_USE_MMU # postgresql
+	select BR2_PACKAGE_POCO_DATA
+	select BR2_PACKAGE_POSTGRESQL
+
 config BR2_PACKAGE_POCO_DATA_SQLITE
 	bool "Data/SQLite"
 	select BR2_PACKAGE_POCO_DATA
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 81409ffec4..119711f3fd 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -15,6 +15,7 @@ POCO_DEPENDENCIES = pcre zlib \
 	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
 	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \
 	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
+	$(if $(BR2_PACKAGE_POCO_DATA_PGSQL),postgresql) \
 	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_POCO_XML),expat)
 
@@ -24,6 +25,7 @@ POCO_OMIT = Data/ODBC PageCompiler \
 	$(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_DATA_PGSQL),,Data/PostgreSQL) \
 	$(if $(BR2_PACKAGE_POCO_JSON),,JSON) \
 	$(if $(BR2_PACKAGE_POCO_JWT),,JWT) \
 	$(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 4/4] package/poco: bump to version 1.11.1
  2022-03-12 20:16 [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Julien Olivain
  2022-03-12 20:16 ` [Buildroot] [PATCH 2/4] package/poco: use poco component names in kconfig variables Julien Olivain
  2022-03-12 20:16 ` [Buildroot] [PATCH 3/4] package/poco: add Data/PostgreSQL support Julien Olivain
@ 2022-03-12 20:16 ` Julien Olivain
  2022-03-23 20:24 ` [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Arnout Vandecappelle
  3 siblings, 0 replies; 5+ messages in thread
From: Julien Olivain @ 2022-03-12 20:16 UTC (permalink / raw)
  To: buildroot; +Cc: Julien Olivain

This commit drop patches, as they are now included upstream or no longer
needed. It also introduces a new patch to fix a build failure for nios2.

MySQL include and library paths can now be provided in variables passed
to the build command. Variables MYSQL_{INC,LIB}DIR are renamed to
POCO_MYSQL_{INCLUDE,LIB}. For PostgreSQL support, variables
POCO_PGSQL_{INCLUDE,LIB} are also passed the same way to the build
command.

This poco version 1.11.1 introduces a new ActiveRecord component.

For changelog, see:
https://raw.githubusercontent.com/pocoproject/poco/poco-1.11.1-release/CHANGELOG

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
This patch series was tested with:

    make check-package
    ...
    0 warnings generated

    ./utils/test-pkg -a -p poco
    ...
    45 builds, 17 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
---
 ...ouble-conversion-detection-to-fix-co.patch | 36 +++++++++++++++++
 ...-add-the-staging-path-to-search-path.patch | 40 -------------------
 .../0002-Add-support-for-m68000-1856.patch    | 32 ---------------
 ...tils.h-backport-double-conversion-ch.patch | 34 ----------------
 package/poco/Config.in                        |  4 ++
 package/poco/poco.hash                        |  2 +-
 package/poco/poco.mk                          |  9 +++--
 7 files changed, 47 insertions(+), 110 deletions(-)
 create mode 100644 package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch
 delete mode 100644 package/poco/0001-poco-add-the-staging-path-to-search-path.patch
 delete mode 100644 package/poco/0002-Add-support-for-m68000-1856.patch
 delete mode 100644 package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch

diff --git a/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch
new file mode 100644
index 0000000000..7b31729347
--- /dev/null
+++ b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch
@@ -0,0 +1,36 @@
+From d328829e9cb8b9fde9e70b07f2b991972cf474d1 Mon Sep 17 00:00:00 2001
+From: Julien Olivain <ju.o@free.fr>
+Date: Sat, 12 Mar 2022 10:34:04 +0100
+Subject: [PATCH] Add back NIOS2 double conversion detection to fix compile
+ errors
+
+The commit
+https://github.com/pocoproject/poco/commit/558324f672d824300498060aff63356bc6bb8097
+
+removed the nios2 support, which was originally added in
+https://github.com/pocoproject/poco/commit/e7b91e8125d6910b53f94de5be4bb53f38dc77c1
+
+This commit add it back.
+
+Signed-off-by: Julien Olivain <ju.o@free.fr>
+---
+ Foundation/src/utils.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
+index 4328344d7..0a222c77d 100644
+--- a/Foundation/src/utils.h
++++ b/Foundation/src/utils.h
+@@ -102,7 +102,8 @@ int main(int argc, char** argv) {
+     defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
+     defined(__riscv) || \
+     defined(__or1k__) || defined(__arc__) || \
+-    defined(__EMSCRIPTEN__)
++    defined(__EMSCRIPTEN__) || \
++    defined(nios2) || defined(__nios2) || defined(__nios2__)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(__mc68000__) || \
+     defined(__pnacl__) || defined(__native_client__)
+-- 
+2.35.1
+
diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch
deleted file mode 100644
index fbabfc8f26..0000000000
--- a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a53f3fd64a0f36ec9bc1307d7e66cdc2dee4aeaa Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 4 Aug 2015 10:14:00 +0200
-Subject: [PATCH] poco: add the staging path to search path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add the mysql headers and client libraries to the search path of the
-preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables
-must be set from the make command line.
-
-[Peter: Remove host dirs, add MYSQL_INCDIR]
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-[Jörg: Update to version 1.6.1 from github]
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
-[Julien: Rebased on version 1.10.1]
-Signed-off-by: Julien Olivain <juju@cotds.org>
----
- Data/MySQL/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile
-index 64a7d3f82..955fee2d4 100644
---- a/Data/MySQL/Makefile
-+++ b/Data/MySQL/Makefile
-@@ -6,8 +6,8 @@
- 
- include $(POCO_BASE)/build/rules/global
- 
--SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient
--INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include
-+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient
-+INCLUDE += -I$(MYSQL_INCDIR)
- SYSFLAGS += -DTHREADSAFE -DNO_TCL
- 
- objects = Binder Extractor SessionImpl Connector \
--- 
-2.26.2
-
diff --git a/package/poco/0002-Add-support-for-m68000-1856.patch b/package/poco/0002-Add-support-for-m68000-1856.patch
deleted file mode 100644
index bc04a9bf69..0000000000
--- a/package/poco/0002-Add-support-for-m68000-1856.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 221e308ad452035f4c1dc25e194f817a30f38f7b Mon Sep 17 00:00:00 2001
-From: Jochen Sprickerhof <github@jochen.sprickerhof.de>
-Date: Wed, 23 Aug 2017 16:50:51 +0200
-Subject: [PATCH] Add support for m68000 (#1856)
-
-Originally taken from
-
-https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-[Julien: rebased on version 1.10.1]
-Signed-off-by: Julien Olivain <juju@cotds.org>
----
- Foundation/src/utils.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
-index c87cee13c..e891c0f10 100644
---- a/Foundation/src/utils.h
-+++ b/Foundation/src/utils.h
-@@ -66,6 +66,8 @@
- 	defined(__AARCH64EL__) || \
-     defined(nios2) || defined(__nios2) || defined(__nios2__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-+#elif defined(__mc68000__)
-+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
- // Windows uses a 64bit wide floating point stack.
--- 
-2.26.2
-
diff --git a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch
deleted file mode 100644
index c06eebe8b0..0000000000
--- a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fe7d230da03a35725ef768c07ce064324f941863 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Sun, 1 Jul 2018 15:37:47 +0200
-Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for
- AArch64 BE support
-
-This commit, identical to upstream double-conversion commit
-https://github.com/google/double-conversion/commit/cb2beeb6771025377c665d1c3ea08388bc6e619a
-allows Poco to build on AArch64 big-endian.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Upstream: https://github.com/pocoproject/poco/pull/2378
-[Julien: rebased on version 1.10.1]
-Signed-off-by: Julien Olivain <juju@cotds.org>
----
- Foundation/src/utils.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
-index e891c0f10..892f7db18 100644
---- a/Foundation/src/utils.h
-+++ b/Foundation/src/utils.h
-@@ -63,7 +63,7 @@
-     defined(__SH4__) || defined(__alpha__) || \
-     defined(_MIPS_ARCH_MIPS32R2) || \
-     defined(__riscv) || \
--	defined(__AARCH64EL__) || \
-+	defined(__AARCH64EL__) || defined(__aarch64__) || \
-     defined(nios2) || defined(__nios2) || defined(__nios2__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(__mc68000__)
--- 
-2.26.2
-
diff --git a/package/poco/Config.in b/package/poco/Config.in
index 714e40f447..699495a241 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -28,6 +28,10 @@ if BR2_PACKAGE_POCO
 
 comment "poco components"
 
+config BR2_PACKAGE_POCO_ACTIVERECORD
+	bool "ActiveRecord"
+	select BR2_PACKAGE_POCO_XML
+
 config BR2_PACKAGE_POCO_CPP_PARSER
 	bool "CppParser"
 
diff --git a/package/poco/poco.hash b/package/poco/poco.hash
index 2a2629733d..78d7d0b96e 100644
--- a/package/poco/poco.hash
+++ b/package/poco/poco.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818  poco-1.10.1.tar.gz
+sha256  2412a5819a239ff2ee58f81033bcc39c40460d7a8b330013a687c8c0bd2b4ac0  poco-1.11.1.tar.gz
 sha256  c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5  LICENSE
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 119711f3fd..fcf480c2a8 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-POCO_VERSION = 1.10.1
+POCO_VERSION = 1.11.1
 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release)
 POCO_LICENSE = BSL-1.0
 POCO_LICENSE_FILES = LICENSE
@@ -20,6 +20,7 @@ POCO_DEPENDENCIES = pcre zlib \
 	$(if $(BR2_PACKAGE_POCO_XML),expat)
 
 POCO_OMIT = Data/ODBC PageCompiler \
+	$(if $(BR2_PACKAGE_POCO_ACTIVERECORD),,ActiveRecord) \
 	$(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \
 	$(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \
 	$(if $(BR2_PACKAGE_POCO_DATA),,Data) \
@@ -74,8 +75,10 @@ endef
 # Use $(MAKE1) to avoid failures on heavilly parallel machines (e.g. -j25)
 define POCO_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \
-		MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \
-		MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \
+		POCO_MYSQL_INCLUDE=$(STAGING_DIR)/usr/include/mysql \
+		POCO_MYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql \
+		POCO_PGSQL_INCLUDE=$(STAGING_DIR)/usr/include/postgresql \
+		POCO_PGSQL_LIB=$(STAGING_DIR)/usr/lib/postgresql \
 		DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D)
 endef
 
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically
  2022-03-12 20:16 [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Julien Olivain
                   ` (2 preceding siblings ...)
  2022-03-12 20:16 ` [Buildroot] [PATCH 4/4] package/poco: bump to version 1.11.1 Julien Olivain
@ 2022-03-23 20:24 ` Arnout Vandecappelle
  3 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2022-03-23 20:24 UTC (permalink / raw)
  To: Julien Olivain, buildroot



On 12/03/2022 21:16, Julien Olivain wrote:
> This commit reorders dependencies and Kconfig package options
> alphabetically for better maintainability.
> 
> This commit does not change anything else.
> 
> Signed-off-by: Julien Olivain <ju.o@free.fr>

  All four applied to master, thanks!

  Nice series!

  Regards,
  Arnout

> ---
>   package/poco/Config.in | 82 +++++++++++++++++++++---------------------
>   package/poco/poco.mk   | 28 +++++++--------
>   2 files changed, 55 insertions(+), 55 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"
> -	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_UTIL
> +	bool "util"
> +	select BR2_PACKAGE_POCO_XML
>   
> -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_XML
> +	bool "xml"
> +	select BR2_PACKAGE_EXPAT
>   
> -config BR2_PACKAGE_POCO_JWT
> -	bool "jwt"
> -	select BR2_PACKAGE_POCO_JSON
> -	select BR2_PACKAGE_POCO_CRYPTO
> +config BR2_PACKAGE_POCO_ZIP
> +	bool "zip"
> +	select BR2_PACKAGE_POCO_NET
> +	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_CPP_PARSER),,CppParser) \
> +	$(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_JSON),,JSON) \
> -	$(if $(BR2_PACKAGE_POCO_XML),,XML) \
> -	$(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
> +	$(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_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_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_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
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-23 20:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-12 20:16 [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Julien Olivain
2022-03-12 20:16 ` [Buildroot] [PATCH 2/4] package/poco: use poco component names in kconfig variables Julien Olivain
2022-03-12 20:16 ` [Buildroot] [PATCH 3/4] package/poco: add Data/PostgreSQL support Julien Olivain
2022-03-12 20:16 ` [Buildroot] [PATCH 4/4] package/poco: bump to version 1.11.1 Julien Olivain
2022-03-23 20:24 ` [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Arnout Vandecappelle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.