浏览代码

package/zxing-cpp: needs wchar

wchar is mandatory since switch to an active fork in commit
456a7398316655ad0b669635f580e4887c24a700:

In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12,
                 from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9:
/home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type
   40 |         std::wstring render(bool withECI) const;
      |              ^~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Fabrice Fontaine 2 年之前
父节点
当前提交
631d0289fe
共有 2 个文件被更改,包括 8 次插入4 次删除
  1. 4 2
      package/gstreamer1/gst1-plugins-bad/Config.in
  2. 4 2
      package/zxing-cpp/Config.in

+ 4 - 2
package/gstreamer1/gst1-plugins-bad/Config.in

@@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0"
 config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING
 	bool "zxing"
 	depends on !BR2_STATIC_LIBS # zxing-cpp
+	depends on BR2_USE_WCHAR # zxing-cpp
 	depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp
 	select BR2_PACKAGE_ZXING_CPP
 
-comment "zxing plugin needs a toolchain w/ C++, dynamic library"
-	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP
+comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library"
+	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \
+		!BR2_INSTALL_LIBSTDCPP
 
 endif
 

+ 4 - 2
package/zxing-cpp/Config.in

@@ -1,9 +1,11 @@
-comment "zxing-cpp needs a toolchain w/ C++, dynamic library"
-	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
+comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		BR2_STATIC_LIBS
 
 config BR2_PACKAGE_ZXING_CPP
 	bool "zxing-cpp"
 	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_WCHAR
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_STB
 	select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3