diff --git a/.checkpackageignore b/.checkpackageignore index a23fbf64a2..99b6841b39 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -271,7 +271,6 @@ package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch lib_patch.Upstream package/connman/S45connman lib_sysv.Variables package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch lib_patch.Upstream package/coremark-pro/coremark-pro.sh.in Shellcheck -package/cppdb/0001-mysql-library-suffix.patch lib_patch.Upstream package/cpulimit/0001-Fix-crash-and-compiler-warnings.patch lib_patch.Upstream package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch lib_patch.Upstream package/cpulimit/0003-Fix-an-infrequent-crash.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index ecd22e2194..16807fa196 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2026.02" +config BR2_PACKAGE_CPPDB + bool "cppdb has been removed" + select BR2_LEGACY + help + cppdb was no longer maintained upstream, and therefore was + removed. + config BR2_PACKAGE_PYTHON_AIOREDIS bool "python-aioredis has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 6ad17c1925..c92a642dcb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1651,7 +1651,6 @@ endmenu menu "Database" source "package/berkeleydb/Config.in" - source "package/cppdb/Config.in" source "package/gdbm/Config.in" source "package/hiredis/Config.in" source "package/kompexsqlite/Config.in" diff --git a/package/cppdb/0001-mysql-library-suffix.patch b/package/cppdb/0001-mysql-library-suffix.patch deleted file mode 100644 index e65e3e26b6..0000000000 --- a/package/cppdb/0001-mysql-library-suffix.patch +++ /dev/null @@ -1,23 +0,0 @@ -Add mysql/ to PATH_SUFFIXES for the library search for mysql. - -On common distros libmysqlclient* is installed and/or symlinked -into /usr/lib. -Since we install the libraries into /usr/lib/mysql alone cppdb -fails to properly link to it giving runtime errors. - -Status: https://sourceforge.net/p/cppcms/bugs/135/ - -Signed-off-by: Gustavo Zacarias - -diff -Nura cppdb-0.3.1.orig/CMakeLists.txt cppdb-0.3.1/CMakeLists.txt ---- cppdb-0.3.1.orig/CMakeLists.txt 2014-10-17 11:05:57.875429748 -0300 -+++ cppdb-0.3.1/CMakeLists.txt 2014-10-17 11:12:57.486775484 -0300 -@@ -196,7 +196,7 @@ - endif() - - if(NOT DISABLE_MYSQL) -- find_library(MYSQL_LIB mysqlclient) -+ find_library(MYSQL_LIB mysqlclient PATH_SUFFIXES mysql) - find_path(MYSQL_PATH mysql.h PATH_SUFFIXES mysql) - if(MYSQL_LIB AND MYSQL_PATH) - include_directories(${MYSQL_PATH}) diff --git a/package/cppdb/Config.in b/package/cppdb/Config.in deleted file mode 100644 index 1394c1efd8..0000000000 --- a/package/cppdb/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_CPPDB - bool "cppdb" - # dlfcn.h - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - # Can be built without them but it's useless - depends on BR2_PACKAGE_MARIADB || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE - help - CppDB is an SQL connectivity library that is designed to - provide platform and Database independent connectivity API - similarly to what JDBC, ODBC and other connectivity libraries - do. - - http://cppcms.com/sql/cppdb/ - -comment "cppdb needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_PACKAGE_MARIADB || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package/cppdb/cppdb.hash b/package/cppdb/cppdb.hash deleted file mode 100644 index bca9f55959..0000000000 --- a/package/cppdb/cppdb.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From http://sourceforge.net/projects/cppcms/files/cppdb/0.3.1/ -md5 129f1d75f46114b79160b93807d5223f cppdb-0.3.1.tar.bz2 -sha1 c0410dcc482d71696ac9206044b3a3ac03d31f96 cppdb-0.3.1.tar.bz2 -# locally computed -sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt -sha256 503ed52ef942d44bb26bd47dd5c6765927b198624e4f375e32cc660dfc2a0981 MIT.txt diff --git a/package/cppdb/cppdb.mk b/package/cppdb/cppdb.mk deleted file mode 100644 index d2a901d28b..0000000000 --- a/package/cppdb/cppdb.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# cppdb -# -################################################################################ - -CPPDB_VERSION = 0.3.1 -CPPDB_SOURCE = cppdb-$(CPPDB_VERSION).tar.bz2 -CPPDB_SITE = http://downloads.sourceforge.net/project/cppcms/cppdb/$(CPPDB_VERSION) -CPPDB_INSTALL_STAGING = YES -CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) -CPPDB_LICENSE = BSL-1.0 or MIT -CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt - -ifeq ($(BR2_PACKAGE_MARIADB),y) -CPPDB_DEPENDENCIES += mariadb -else -CPPDB_CONF_OPTS += -DDISABLE_MYSQL=ON -endif - -ifeq ($(BR2_PACKAGE_POSTGRESQL),y) -CPPDB_DEPENDENCIES += postgresql -else -CPPDB_CONF_OPTS += -DDISABLE_PQ=ON -endif - -ifeq ($(BR2_PACKAGE_SQLITE),) -CPPDB_CONF_OPTS += -DDISABLE_SQLITE=ON -endif - -$(eval $(cmake-package))