From 190f7b50ac3d7d30cf9d31167fb74f7146c3c8ff Mon Sep 17 00:00:00 2001 From: Petr Chernikov Date: Fri, 8 Dec 2023 08:47:57 +0300 Subject: [PATCH] abseil-cpp: remove -Dcmake_cxx_standard=14 flag from extra_oecmake Old versions of abseil-cpp could not be compiled using C++ Standard 17. For now this cmake flag is not needed. Mosh compilation fixed by specifying c++17 standard. Signed-off-by: Petr Chernikov Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb | 2 ++ meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb index 0ee050da99..693ec12d3c 100644 --- a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb +++ b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb @@ -46,3 +46,5 @@ RDEPENDS:${PN}-server += "openssh-sshd" #| {standard input}:2103: Error: instruction not supported in Thumb16 mode -- `adcs r7,r7,r7' #| {standard input}:2104: Error: selected processor does not support Thumb mode `it cs' ARM_INSTRUCTION_SET = "arm" + +CXXFLAGS:append = " -std=c++17" diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 65ecab7d08..ee62d4b597 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -27,7 +27,6 @@ inherit cmake EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTING=OFF \ - -DCMAKE_CXX_STANDARD=14 \ -DABSL_ENABLE_INSTALL=ON \ "