mirror of
https://github.com/PartialVolume/shredos.x86_64.git
synced 2026-02-20 09:35:26 +00:00
Upgrade buildroot to 2023.05 (from 2021.08.2), kernel is upgraded to 6.3 (from 5.13.19).
This commit is contained in:
PartialVolume
@@ -0,0 +1,45 @@
|
||||
From 3884c734c261231c34f59e56cde7ae02945b4dae Mon Sep 17 00:00:00 2001
|
||||
From: Hernan Martinez <hernan.c.martinez@gmail.com>
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -28,72 +28,91 @@ if BR2_PACKAGE_POCO
|
||||
|
||||
comment "poco components"
|
||||
|
||||
config BR2_PACKAGE_POCO_JSON
|
||||
bool "json"
|
||||
|
||||
config BR2_PACKAGE_POCO_XML
|
||||
bool "xml"
|
||||
select BR2_PACKAGE_EXPAT
|
||||
|
||||
config BR2_PACKAGE_POCO_UTIL
|
||||
bool "util"
|
||||
config BR2_PACKAGE_POCO_ACTIVERECORD
|
||||
bool "ActiveRecord"
|
||||
select BR2_PACKAGE_POCO_XML
|
||||
|
||||
config BR2_PACKAGE_POCO_NET
|
||||
bool "net"
|
||||
|
||||
config BR2_PACKAGE_POCO_CRYPTO
|
||||
bool "crypto"
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
|
||||
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_NET
|
||||
select BR2_PACKAGE_POCO_UTIL
|
||||
|
||||
config BR2_PACKAGE_POCO_CPP_PARSER
|
||||
bool "cpp_parser"
|
||||
bool "CppParser"
|
||||
|
||||
config BR2_PACKAGE_POCO_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"
|
||||
select BR2_PACKAGE_POCO_NET
|
||||
|
||||
config BR2_PACKAGE_POCO_MONGODB
|
||||
bool "mongodb"
|
||||
select BR2_PACKAGE_POCO_NET
|
||||
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 "Data/MySQL"
|
||||
depends on BR2_USE_MMU # 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
|
||||
depends on !BR2_OPTIMIZE_FAST # postgresql
|
||||
select BR2_PACKAGE_POCO_DATA
|
||||
select BR2_PACKAGE_POSTGRESQL
|
||||
|
||||
comment "Data/PostgreSQL can't be built with Optimize for fast"
|
||||
depends on BR2_OPTIMIZE_FAST
|
||||
|
||||
config BR2_PACKAGE_POCO_DATA_SQLITE
|
||||
bool "sqlite"
|
||||
bool "Data/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_JSON
|
||||
bool "JSON"
|
||||
|
||||
config BR2_PACKAGE_POCO_JWT
|
||||
bool "jwt"
|
||||
select BR2_PACKAGE_POCO_JSON
|
||||
bool "JWT"
|
||||
select BR2_PACKAGE_POCO_CRYPTO
|
||||
select BR2_PACKAGE_POCO_JSON
|
||||
|
||||
config BR2_PACKAGE_POCO_MONGODB
|
||||
bool "MongoDB"
|
||||
select BR2_PACKAGE_POCO_NET
|
||||
|
||||
config BR2_PACKAGE_POCO_NET
|
||||
bool "Net"
|
||||
|
||||
config BR2_PACKAGE_POCO_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"
|
||||
select BR2_PACKAGE_POCO_JSON
|
||||
select BR2_PACKAGE_POCO_UTIL
|
||||
select BR2_PACKAGE_POCO_XML
|
||||
|
||||
config BR2_PACKAGE_POCO_PROMETHEUS
|
||||
bool "Prometheus"
|
||||
select BR2_PACKAGE_POCO_NET
|
||||
|
||||
config BR2_PACKAGE_POCO_REDIS
|
||||
bool "Redis"
|
||||
select BR2_PACKAGE_POCO_NET
|
||||
|
||||
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
|
||||
select BR2_PACKAGE_POCO_UTIL
|
||||
select BR2_PACKAGE_POCO_XML
|
||||
|
||||
endif # BR2_PACKAGE_POCO
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 poco-1.10.1.tar.gz
|
||||
sha256 30442ccb097a0074133f699213a59d6f8c77db5b2c98a7c1ad9c5eeb3a2b06f3 poco-1.12.2.tar.gz
|
||||
sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE
|
||||
|
||||
@@ -4,36 +4,44 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
POCO_VERSION = 1.10.1
|
||||
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 = zlib pcre \
|
||||
$(if $(BR2_PACKAGE_POCO_XML),expat) \
|
||||
POCO_DEPENDENCIES = \
|
||||
pcre2 \
|
||||
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_DATA_PGSQL),postgresql) \
|
||||
$(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) \
|
||||
POCO_OMIT = \
|
||||
Data/ODBC \
|
||||
PageCompiler \
|
||||
$(if $(BR2_PACKAGE_POCO_ACTIVERECORD),,ActiveRecord) \
|
||||
$(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_DATA_PGSQL),,Data/PostgreSQL) \
|
||||
$(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_PROMETHEUS),,Prometheus) \
|
||||
$(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
|
||||
@@ -57,11 +65,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 \
|
||||
@@ -72,8 +86,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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user