From fe3cbba5ba20bf5f9e75dd8b8a4fa993c939c39e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 14 Oct 2019 04:20:42 +0200 Subject: [PATCH] package/proj: needs wchar Propagate dependency also to libgeotiff Fixes: http://autobuild.buildroot.net/results/f8e/f8e261dd64346caeff568a23621b3dd15ac3967c/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libgeotiff/Config.in | 6 ++++-- package/proj/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/libgeotiff/Config.in b/package/libgeotiff/Config.in index 6ac8a51f7c..7ed296fb25 100644 --- a/package/libgeotiff/Config.in +++ b/package/libgeotiff/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEOTIFF depends on BR2_INSTALL_LIBSTDCPP # proj depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # proj depends on BR2_TOOLCHAIN_HAS_THREADS # proj + depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_PROJ select BR2_PACKAGE_TIFF help @@ -11,6 +12,7 @@ config BR2_PACKAGE_LIBGEOTIFF https://github.com/OSGeo/libgeotiff -comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads" +comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/proj/Config.in b/package/proj/Config.in index ced386f465..1952fc7d9a 100644 --- a/package/proj/Config.in +++ b/package/proj/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PROJ depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR select BR2_PACKAGE_SQLITE help proj.4 is a standard UNIX filter function which converts @@ -13,6 +14,7 @@ config BR2_PACKAGE_PROJ http://proj4.org/ -comment "proj needs a toolchain w/ C++, gcc >= 4.7, threads" +comment "proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -- 2.30.2