From 4c547796f6f280a6772bd4dc95aa507cdd8dba2b Mon Sep 17 00:00:00 2001 From: Ulysse Manceron Date: Fri, 14 Oct 2022 17:36:35 -0600 Subject: [PATCH] abseil-cpp: Upgrade to head on 2022-10-14 Our team wants to use absl/log which was recently added to abseil. --- .../abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch | 8 ++++---- meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 6 +++--- meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch index ef3f50d9e72..9b408259f93 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch @@ -20,7 +20,7 @@ Signed-off-by: Khem Raj #ifdef __GLIBC__ #include #elif defined(__FreeBSD__) -@@ -53,7 +53,7 @@ double UnscaledCycleClock::Frequency() { +@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { return base_internal::NominalCPUFrequency(); } @@ -29,9 +29,9 @@ Signed-off-by: Khem Raj int64_t UnscaledCycleClock::Now() { #ifdef __GLIBC__ ---- a/absl/base/internal/unscaledcycleclock.h -+++ b/absl/base/internal/unscaledcycleclock.h -@@ -46,7 +46,8 @@ +--- a/absl/base/internal/unscaledcycleclock_config.h ++++ b/absl/base/internal/unscaledcycleclock_config.h +@@ -21,7 +21,8 @@ // The following platforms have an implementation of a hardware counter. #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ 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 af28da59352..9f8c48cfa40 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,9 +7,9 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -PV = "20220623.1" -SRCREV = "8c0b94e793a66495e0b1f34a5eb26bd7dc672db0" -BRANCH = "lts_2022_06_23" +PV = "20221014.0" +SRCREV = "5fa65f28e46e86c44966a1ca8a727a329d9c1ff8" +BRANCH = "master" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://0002-Remove-maes-option-from-cross-compilation.patch \ diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb b/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb index c2f952fc647..d4d8404d04f 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb @@ -28,7 +28,7 @@ SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRAN file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ " # Fixes build with older compilers 4.8 especially on ubuntu 14.04 -CXXFLAGS:append:class-native = " -Wl,--no-as-needed" +CXXFLAGS:append:class-native = " -Wl,--no-as-needed -std=c++14" inherit cmake pkgconfig