[Buildroot] [PATCH 1/1] package/postgresql: needs wchar

Adam Duskett aduskett at gmail.com
Tue Oct 23 17:25:32 UTC 2018


Hello;
On Tue, Oct 23, 2018 at 12:09 PM Bernd Kuhls <bernd.kuhls at t-online.de> wrote:
>
> 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 at t-online.de>
> ---
>  package/bandwidthd/Config.in      | 5 +++--
>  package/collectd/Config.in        | 4 ++++
>  package/postgresql/Config.in      | 5 +++--
>  package/python-psycopg2/Config.in | 4 ++++
>  4 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/package/bandwidthd/Config.in b/package/bandwidthd/Config.in
> index 8a19733c2c..5a3529e0c4 100644
> --- 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 c9e61a5622..3222547b68 100644
> --- 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/postgresql/Config.in b/package/postgresql/Config.in
> index 9dda54bf9f..e548d3cb27 100644
> --- 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 ec852bb49e..ec27d706de 100644
> --- 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
This isn't needed because python already requires wchar.
>         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
> --
> 2.19.1
>
Thanks!

Adam


More information about the buildroot mailing list