From 0c00d881c2709aca8bd6de1fcc40af19584c6887 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jun 2020 14:28:10 +0200 Subject: [PATCH] package/edid-decode: fix build with gcc <= 5 Pass -std=c++11 to fix the following build failure with gcc <= 5: /tmp/instance-0/output-1/host/bin/mips64el-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -g -DSHA="not available" -o edid-decode edid-decode.cpp parse-base-block.cpp parse-cta-block.cpp parse-displayid-block.cpp parse-ls-ext-block.cpp parse-di-ext-block.cpp parse-vtb-ext-block.cpp -lm edid-decode.cpp: In member function 'std::__cxx11::string edid_state::dtd_type()': edid-decode.cpp:192:17: error: 'to_string' is not a member of 'std' unsigned len = std::to_string(preparse_total_dtds).length(); ^ Also add a dependency on gcc 4.7 Fixes: - http://autobuild.buildroot.org/results/71e4a50542c4551797f1d0404d27244612b427d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/edid-decode/Config.in | 6 ++++-- package/edid-decode/edid-decode.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/edid-decode/Config.in b/package/edid-decode/Config.in index d2d21288de..ddf1942c68 100644 --- a/package/edid-decode/Config.in +++ b/package/edid-decode/Config.in @@ -1,10 +1,12 @@ config BR2_PACKAGE_EDID_DECODE bool "edid-decode" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 help Decode EDID data in human-readable format. https://git.linuxtv.org/edid-decode.git/ -comment "edid-decode needs a toolchain w/ C++" - depends on !!BR2_INSTALL_LIBSTDCPP +comment "edid-decode needs a toolchain w/ C++, gcc >= 4.7" + depends on !!BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index c41a9f2a76..7e463c02b1 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -11,7 +11,7 @@ EDID_DECODE_LICENSE_FILES = LICENSE define EDID_DECODE_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CXXFLAGS)" + CFLAGS="$(TARGET_CXXFLAGS) -std=c++11" endef define EDID_DECODE_INSTALL_TARGET_CMDS -- 2.30.2