浏览代码

package/proj: needs wchar

Propagate dependency also to libgeotiff

Fixes:
http://autobuild.buildroot.net/results/f8e/f8e261dd64346caeff568a23621b3dd15ac3967c/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Bernd Kuhls 5 年之前
父节点
当前提交
fe3cbba5ba
共有 2 个文件被更改,包括 8 次插入4 次删除
  1. 4 2
      package/libgeotiff/Config.in
  2. 4 2
      package/proj/Config.in

+ 4 - 2
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

+ 4 - 2
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