diff --git a/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch b/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch new file mode 100644 index 0000000000..ba2f073a59 --- /dev/null +++ b/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch @@ -0,0 +1,45 @@ +From 3884c734c261231c34f59e56cde7ae02945b4dae Mon Sep 17 00:00:00 2001 +From: Hernan Martinez +Date: Tue, 16 Aug 2022 23:07:25 -0500 +Subject: [PATCH] Fix optional JSON support for MySQL (#3753) + +* Fix optional JSON support for MySQL + +* Fix optional JSON support for MySQLTest +--- + Data/MySQL/src/ResultMetadata.cpp | 2 ++ + Data/MySQL/testsuite/src/MySQLTest.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp +index 61b49dd54..adb5dae84 100644 +--- a/Data/MySQL/src/ResultMetadata.cpp ++++ b/Data/MySQL/src/ResultMetadata.cpp +@@ -133,8 +133,10 @@ namespace + case MYSQL_TYPE_LONG_BLOB: + case MYSQL_TYPE_BLOB: + return Poco::Data::MetaColumn::FDT_BLOB; ++#ifdef POCO_MYSQL_JSON + case MYSQL_TYPE_JSON: + return Poco::Data::MetaColumn::FDT_JSON; ++#endif + default: + return Poco::Data::MetaColumn::FDT_UNKNOWN; + } +diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp +index 80a3683b1..2a286d35e 100644 +--- a/Data/MySQL/testsuite/src/MySQLTest.cpp ++++ b/Data/MySQL/testsuite/src/MySQLTest.cpp +@@ -976,7 +976,9 @@ CppUnit::Test* MySQLTest::suite() + CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt); + CppUnit_addTest(pSuite, MySQLTest, testLongBLOB); + CppUnit_addTest(pSuite, MySQLTest, testLongTEXT); ++#ifdef POCO_MYSQL_JSON + CppUnit_addTest(pSuite, MySQLTest, testJSON); ++#endif + CppUnit_addTest(pSuite, MySQLTest, testUnsignedInts); + CppUnit_addTest(pSuite, MySQLTest, testFloat); + CppUnit_addTest(pSuite, MySQLTest, testDouble); +-- +2.37.2 + diff --git a/package/poco/Config.in b/package/poco/Config.in index 95f9a46e6e..cb447960f1 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -17,8 +17,8 @@ config BR2_PACKAGE_POCO depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_PCRE help The C++ Portable Components Libraries diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 4bf20f3f6b..eea3e2494a 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9774651a02e4cfa79fc43b7db617e45d353ede00b7be8afd0e74e6afb23d3793 poco-1.11.2.tar.gz +sha256 30442ccb097a0074133f699213a59d6f8c77db5b2c98a7c1ad9c5eeb3a2b06f3 poco-1.12.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index c06e55210e..3bcc42c455 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,14 +4,14 @@ # ################################################################################ -POCO_VERSION = 1.11.2 +POCO_VERSION = 1.12.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES -POCO_DEPENDENCIES = pcre zlib \ +POCO_DEPENDENCIES = pcre2 zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ @@ -60,11 +60,17 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y) POCO_MAKE_TARGET = all_release endif +POCO_LDFLAGS=$(TARGET_LDFLAGS) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +POCO_LDFLAGS += -latomic +endif + define POCO_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ --cflags=-std=c++14 \ + --ldflags="$(POCO_LDFLAGS)" \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ --unbundled \