From 1460943511f5a7b5506a189ae170d0a231ddc205 Mon Sep 17 00:00:00 2001 From: wangmy Date: Mon, 4 Jul 2022 17:07:20 +0800 Subject: [PATCH] abseil-cpp: upgrade 20211102 -> 20220623 0001-absl-always-use-asm-sgidefs.h.patch refreshed for new verion. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch | 9 +++++---- meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch index a5bebf5f00..5242b29e06 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch @@ -10,29 +10,30 @@ that makes it portable. Upstream-Status: Pending Signed-off-by: Khem Raj + --- absl/base/internal/direct_mmap.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h -index a01d61220376..c8a4fbabbb3a 100644 +index e492bb0..c8a4fba 100644 --- a/absl/base/internal/direct_mmap.h +++ b/absl/base/internal/direct_mmap.h @@ -41,13 +41,9 @@ #ifdef __mips__ // Include definitions of the ABI currently in use. --#ifdef __BIONIC__ +-#if defined(__BIONIC__) || !defined(__GLIBC__) -// Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the +// bionic/musl C libs don't have sgidefs.h, but do have asm/sgidefs.h, which has the // definitions we need. #include -#else -#include --#endif // __BIONIC__ +-#endif // __BIONIC__ || !__GLIBC__ #endif // __mips__ // SYS_mmap and SYS_munmap are not defined in Android. -- -2.36.1 +2.25.1 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 b271134fd2..b3dc06ca14 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 = "20211102.1+git${SRCPV}" -SRCREV = "7c6608d0dbe43cf9bdf7f77787bc6bc89cc42f8b" -BRANCH = "master" +PV = "20220623.0" +SRCREV = "273292d1cfc0a94a65082ee350509af1d113344d" +BRANCH = "lts_2022_06_23" 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 \