package/postgresql: needs wchar

Upstream removed support for non-wchar toolchains:
https://github.com/postgres/postgres/commit/85feb77aa09cda9ff3e12cf95c757c499dc25343

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>

diff --git a/package/bandwidthd/Config.in b/package/bandwidthd/Config.in
index 8a19733c2c70f0c4adeed2c1d0028bff7541368e..5a3529e0c43879afb98f095ea9e7112601b2d417 100644 (file)
--- a/package/bandwidthd/Config.in
+++ b/package/bandwidthd/Config.in
@@ -35,6 +35,7 @@ if BR2_PACKAGE_BANDWIDTHD
 config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL
        bool "enable postgresql log target support"
        depends on !BR2_STATIC_LIBS
+       depends on BR2_USE_WCHAR # postgresql
        select BR2_PACKAGE_POSTGRESQL
        help
          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
          (github.com/nroach44/bandwidthd) for more information.
 
-comment "postgresql support needs a toolchain w/ dynamic library"
-       depends on BR2_STATIC_LIBS
+comment "postgresql support needs a toolchain w/ dynamic library, wchar"
+       depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_BANDWIDTHD_SQLITE3
        bool "enable sqlite3 log storage"

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index c9e61a56225072a4e8d7bf869a1433e0534fbecb..3222547b680971ef8892f55c4b65c752f9270c1a 100644 (file)
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -383,6 +383,7 @@ config BR2_PACKAGE_COLLECTD_PING
 
 config BR2_PACKAGE_COLLECTD_POSTGRESQL
        bool "postgresql"
+       depends on BR2_USE_WCHAR # postgresql
        select BR2_PACKAGE_POSTGRESQL
        help
          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
          collectd “value lists”.
 
+comment "postgresql support needs a toolchain w/ wchar"
+       depends on !BR2_USE_WCHAR
+
 config BR2_PACKAGE_COLLECTD_PROCESSES
        bool "processes"
        help

diff --git a/package/php/Config.ext b/package/php/Config.ext
index 51dcbbf4a40d0fa00a4d2733f1b29cbd832cccb0..808551e77b1bf1236d006ba48bc1fe25489df26b 100644 (file)
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -140,13 +140,14 @@ config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL
        bool "PostgreSQL"
        depends on BR2_USE_MMU # postgresql
        depends on !BR2_STATIC_LIBS
+       depends on BR2_USE_WCHAR # postgresql
        select BR2_PACKAGE_POSTGRESQL
        help
          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_STATIC_LIBS
+       depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
        bool "SQLite3"

diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in
index 9dda54bf9faaf676e86c763e39d64ccfbaca1f4a..e548d3cb270f9ad17a9e1153a02b621d7fbdbe97 100644 (file)
--- a/package/postgresql/Config.in
+++ b/package/postgresql/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_POSTGRESQL
        bool "postgresql"
        depends on BR2_USE_MMU # fork()
+       depends on BR2_USE_WCHAR
        # fails to build in a pure static linking scenario, and
        # postgresql is unlikely to be used in a pure statically
        # linked environment.
@@ -18,6 +19,6 @@ config BR2_PACKAGE_POSTGRESQL
 
          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_STATIC_LIBS
+       depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR

diff --git a/package/python-psycopg2/Config.in b/package/python-psycopg2/Config.in
index ec852bb49e66bf044ee9d3d4952d0beb148e565f..ec27d706de123293152b2d3e488888fca8cafde3 100644 (file)
--- a/package/python-psycopg2/Config.in
+++ b/package/python-psycopg2/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_PSYCOPG2
        bool "python-psycopg2"
+       depends on BR2_USE_WCHAR # postgresql
        select BR2_PACKAGE_POSTGRESQL
        help
          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.
 
          http://initd.org/psycopg/
+
+comment "python-psycopg2 needs a toolchain w/ wchar"
+       depends on !BR2_USE_WCHAR

diff --git a/package/qt/Config.sql.in b/package/qt/Config.sql.in
index 6d39bb974ac79a2014d06a133074e08c6541d584..1e7f6ba799874193a66e3604140557752a6a479f 100644 (file)
--- a/package/qt/Config.sql.in
+++ b/package/qt/Config.sql.in
@@ -24,13 +24,14 @@ config BR2_PACKAGE_QT_ODBC
 config BR2_PACKAGE_QT_PSQL
        bool "PostgreSQL Driver"
        depends on !BR2_STATIC_LIBS
+       depends on BR2_USE_WCHAR
        select BR2_PACKAGE_POSTGRESQL
        help
          Build PostgreSQL driver
          If unsure, say n.
 
-comment "PostgreSQL driver needs a toolchain w/ dynamic library"
-       depends on BR2_STATIC_LIBS
+comment "PostgreSQL driver needs a toolchain w/ wchar, dynamic library"
+       depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 choice
        prompt "SQLite 3 support"

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index b9aba2d3898dc926fdeb0c88424ce06ddf7d1728..1340ea48f07ce56224ab10368f5b9ec9ef2ac72a 100644 (file)
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -75,14 +75,15 @@ config BR2_PACKAGE_QT5BASE_PSQL
        bool "PostgreSQL Plugin"
        depends on BR2_USE_MMU # postgresql
        depends on !BR2_STATIC_LIBS
+       depends on BR2_USE_WCHAR # postgresql
        select BR2_PACKAGE_POSTGRESQL
        help
          Build PostgreSQL plugin
          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_STATIC_LIBS
+       depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 choice
        prompt "SQLite 3 support"