mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 13:46:32 +00:00
package/postgresql: needs wchar
Upstream removed support for non-wchar toolchains:
85feb77aa0
Propagate the new dependency to other packages.
Fixes
http://autobuild.buildroot.net/results/b73/b73342a39167ed7f293224d4e3b23dde691b9abf/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Thomas: also propagate to the php, qt and qt5base packages.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
f95d44d3f3
commit
e75f6c4e9d
@ -35,6 +35,7 @@ if BR2_PACKAGE_BANDWIDTHD
|
|||||||
config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL
|
config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL
|
||||||
bool "enable postgresql log target support"
|
bool "enable postgresql log target support"
|
||||||
depends on !BR2_STATIC_LIBS
|
depends on !BR2_STATIC_LIBS
|
||||||
|
depends on BR2_USE_WCHAR # postgresql
|
||||||
select BR2_PACKAGE_POSTGRESQL
|
select BR2_PACKAGE_POSTGRESQL
|
||||||
help
|
help
|
||||||
Enable support for logging the bandwidthd data to a remote
|
Enable support for logging the bandwidthd data to a remote
|
||||||
@ -42,8 +43,8 @@ config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL
|
|||||||
through a php site. See README in the source code
|
through a php site. See README in the source code
|
||||||
(github.com/nroach44/bandwidthd) for more information.
|
(github.com/nroach44/bandwidthd) for more information.
|
||||||
|
|
||||||
comment "postgresql support needs a toolchain w/ dynamic library"
|
comment "postgresql support needs a toolchain w/ dynamic library, wchar"
|
||||||
depends on BR2_STATIC_LIBS
|
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
|
||||||
|
|
||||||
config BR2_PACKAGE_BANDWIDTHD_SQLITE3
|
config BR2_PACKAGE_BANDWIDTHD_SQLITE3
|
||||||
bool "enable sqlite3 log storage"
|
bool "enable sqlite3 log storage"
|
||||||
|
@ -383,6 +383,7 @@ config BR2_PACKAGE_COLLECTD_PING
|
|||||||
|
|
||||||
config BR2_PACKAGE_COLLECTD_POSTGRESQL
|
config BR2_PACKAGE_COLLECTD_POSTGRESQL
|
||||||
bool "postgresql"
|
bool "postgresql"
|
||||||
|
depends on BR2_USE_WCHAR # postgresql
|
||||||
select BR2_PACKAGE_POSTGRESQL
|
select BR2_PACKAGE_POSTGRESQL
|
||||||
help
|
help
|
||||||
Connects to and executes SQL statements on a PostgreSQL
|
Connects to and executes SQL statements on a PostgreSQL
|
||||||
@ -390,6 +391,9 @@ config BR2_PACKAGE_COLLECTD_POSTGRESQL
|
|||||||
configuration, the returned values are then converted into
|
configuration, the returned values are then converted into
|
||||||
collectd “value lists”.
|
collectd “value lists”.
|
||||||
|
|
||||||
|
comment "postgresql support needs a toolchain w/ wchar"
|
||||||
|
depends on !BR2_USE_WCHAR
|
||||||
|
|
||||||
config BR2_PACKAGE_COLLECTD_PROCESSES
|
config BR2_PACKAGE_COLLECTD_PROCESSES
|
||||||
bool "processes"
|
bool "processes"
|
||||||
help
|
help
|
||||||
|
@ -140,13 +140,14 @@ config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL
|
|||||||
bool "PostgreSQL"
|
bool "PostgreSQL"
|
||||||
depends on BR2_USE_MMU # postgresql
|
depends on BR2_USE_MMU # postgresql
|
||||||
depends on !BR2_STATIC_LIBS
|
depends on !BR2_STATIC_LIBS
|
||||||
|
depends on BR2_USE_WCHAR # postgresql
|
||||||
select BR2_PACKAGE_POSTGRESQL
|
select BR2_PACKAGE_POSTGRESQL
|
||||||
help
|
help
|
||||||
PDO driver for PostgreSQL
|
PDO driver for PostgreSQL
|
||||||
|
|
||||||
comment "PostgreSQL drivers need a toolchain w/ dynamic library"
|
comment "PostgreSQL drivers need a toolchain w/ wchar, dynamic library"
|
||||||
depends on BR2_USE_MMU
|
depends on BR2_USE_MMU
|
||||||
depends on BR2_STATIC_LIBS
|
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
|
||||||
|
|
||||||
config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
|
config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
|
||||||
bool "SQLite3"
|
bool "SQLite3"
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
config BR2_PACKAGE_POSTGRESQL
|
config BR2_PACKAGE_POSTGRESQL
|
||||||
bool "postgresql"
|
bool "postgresql"
|
||||||
depends on BR2_USE_MMU # fork()
|
depends on BR2_USE_MMU # fork()
|
||||||
|
depends on BR2_USE_WCHAR
|
||||||
# fails to build in a pure static linking scenario, and
|
# fails to build in a pure static linking scenario, and
|
||||||
# postgresql is unlikely to be used in a pure statically
|
# postgresql is unlikely to be used in a pure statically
|
||||||
# linked environment.
|
# linked environment.
|
||||||
@ -18,6 +19,6 @@ config BR2_PACKAGE_POSTGRESQL
|
|||||||
|
|
||||||
http://www.postgresql.org
|
http://www.postgresql.org
|
||||||
|
|
||||||
comment "postgresql needs a toolchain w/ dynamic library"
|
comment "postgresql needs a toolchain w/ dynamic library, wchar"
|
||||||
depends on BR2_USE_MMU
|
depends on BR2_USE_MMU
|
||||||
depends on BR2_STATIC_LIBS
|
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
config BR2_PACKAGE_PYTHON_PSYCOPG2
|
config BR2_PACKAGE_PYTHON_PSYCOPG2
|
||||||
bool "python-psycopg2"
|
bool "python-psycopg2"
|
||||||
|
depends on BR2_USE_WCHAR # postgresql
|
||||||
select BR2_PACKAGE_POSTGRESQL
|
select BR2_PACKAGE_POSTGRESQL
|
||||||
help
|
help
|
||||||
Psycopg is the most popular PostgreSQL database adapter for
|
Psycopg is the most popular PostgreSQL database adapter for
|
||||||
@ -20,3 +21,6 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2
|
|||||||
Psycopg 2 is both Unicode and Python 3 friendly.
|
Psycopg 2 is both Unicode and Python 3 friendly.
|
||||||
|
|
||||||
http://initd.org/psycopg/
|
http://initd.org/psycopg/
|
||||||
|
|
||||||
|
comment "python-psycopg2 needs a toolchain w/ wchar"
|
||||||
|
depends on !BR2_USE_WCHAR
|
||||||
|
@ -24,13 +24,14 @@ config BR2_PACKAGE_QT_ODBC
|
|||||||
config BR2_PACKAGE_QT_PSQL
|
config BR2_PACKAGE_QT_PSQL
|
||||||
bool "PostgreSQL Driver"
|
bool "PostgreSQL Driver"
|
||||||
depends on !BR2_STATIC_LIBS
|
depends on !BR2_STATIC_LIBS
|
||||||
|
depends on BR2_USE_WCHAR
|
||||||
select BR2_PACKAGE_POSTGRESQL
|
select BR2_PACKAGE_POSTGRESQL
|
||||||
help
|
help
|
||||||
Build PostgreSQL driver
|
Build PostgreSQL driver
|
||||||
If unsure, say n.
|
If unsure, say n.
|
||||||
|
|
||||||
comment "PostgreSQL driver needs a toolchain w/ dynamic library"
|
comment "PostgreSQL driver needs a toolchain w/ wchar, dynamic library"
|
||||||
depends on BR2_STATIC_LIBS
|
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "SQLite 3 support"
|
prompt "SQLite 3 support"
|
||||||
|
@ -75,14 +75,15 @@ config BR2_PACKAGE_QT5BASE_PSQL
|
|||||||
bool "PostgreSQL Plugin"
|
bool "PostgreSQL Plugin"
|
||||||
depends on BR2_USE_MMU # postgresql
|
depends on BR2_USE_MMU # postgresql
|
||||||
depends on !BR2_STATIC_LIBS
|
depends on !BR2_STATIC_LIBS
|
||||||
|
depends on BR2_USE_WCHAR # postgresql
|
||||||
select BR2_PACKAGE_POSTGRESQL
|
select BR2_PACKAGE_POSTGRESQL
|
||||||
help
|
help
|
||||||
Build PostgreSQL plugin
|
Build PostgreSQL plugin
|
||||||
If unsure, say n.
|
If unsure, say n.
|
||||||
|
|
||||||
comment "PostgreSQL plugin needs a toolchain w/ dynamic library"
|
comment "PostgreSQL plugin needs a toolchain w/ wchar, dynamic library"
|
||||||
depends on BR2_USE_MMU
|
depends on BR2_USE_MMU
|
||||||
depends on BR2_STATIC_LIBS
|
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "SQLite 3 support"
|
prompt "SQLite 3 support"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user