package/libabseil-cpp: bump version to 20220623.0
- drop upstreamed patches Signed-off-by: Michael Nosthoff <buildroot@heine.tech> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Michael Nosthoff
Arnout Vandecappelle (Essensium/Mind)
parent
67a1e8a552
commit
8657046cb1
@ -1,62 +0,0 @@
|
||||
From b9ad9bbfed92199a1a58504306d026cd2597539e Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Wed, 30 Mar 2022 21:56:20 +0200
|
||||
Subject: [PATCH] Fix build with uclibc-ng (#1145)
|
||||
|
||||
uclibc-ng doesn't provide getauxval which results in the following build
|
||||
failure on arm or ppc with any user of abseil-cpp such as grpc:
|
||||
|
||||
/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_random_internal_randen_hwaes.so.2111.0.0: undefined reference to `getauxval'
|
||||
|
||||
To fix this build failure, check that __UCLIBC__ is not defined before
|
||||
using getauxval (as Babel is not able to check function availability)
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/775f3ca3dedebff29e212b29dfa896b7613b7a02
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/abseil/abseil-cpp/commit/b9ad9bbfed92199a1a58504306d026cd2597539e]
|
||||
---
|
||||
absl/debugging/internal/vdso_support.cc | 2 +-
|
||||
absl/random/internal/randen_detect.cc | 7 ++++++-
|
||||
2 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/absl/debugging/internal/vdso_support.cc b/absl/debugging/internal/vdso_support.cc
|
||||
index c655cf452..e63ac4a3b 100644
|
||||
--- a/absl/debugging/internal/vdso_support.cc
|
||||
+++ b/absl/debugging/internal/vdso_support.cc
|
||||
@@ -33,7 +33,7 @@
|
||||
#endif
|
||||
#include <unistd.h>
|
||||
|
||||
-#if defined(__GLIBC__) && \
|
||||
+#if !defined(__UCLIBC__) && defined(__GLIBC__) && \
|
||||
(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16))
|
||||
#define ABSL_HAVE_GETAUXVAL
|
||||
#endif
|
||||
diff --git a/absl/random/internal/randen_detect.cc b/absl/random/internal/randen_detect.cc
|
||||
index 9bb58fc68..6dababa35 100644
|
||||
--- a/absl/random/internal/randen_detect.cc
|
||||
+++ b/absl/random/internal/randen_detect.cc
|
||||
@@ -24,6 +24,11 @@
|
||||
|
||||
#include "absl/random/internal/platform.h"
|
||||
|
||||
+#if !defined(__UCLIBC__) && defined(__GLIBC__) && \
|
||||
+ (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16))
|
||||
+#define ABSL_HAVE_GETAUXVAL
|
||||
+#endif
|
||||
+
|
||||
#if defined(ABSL_ARCH_X86_64)
|
||||
#define ABSL_INTERNAL_USE_X86_CPUID
|
||||
#elif defined(ABSL_ARCH_PPC) || defined(ABSL_ARCH_ARM) || \
|
||||
@@ -31,7 +36,7 @@
|
||||
#if defined(__ANDROID__)
|
||||
#define ABSL_INTERNAL_USE_ANDROID_GETAUXVAL
|
||||
#define ABSL_INTERNAL_USE_GETAUXVAL
|
||||
-#elif defined(__linux__)
|
||||
+#elif defined(__linux__) && defined(ABSL_HAVE_GETAUXVAL)
|
||||
#define ABSL_INTERNAL_USE_LINUX_GETAUXVAL
|
||||
#define ABSL_INTERNAL_USE_GETAUXVAL
|
||||
#endif
|
||||
@ -1,55 +0,0 @@
|
||||
From 53a90f079af7ab491530d432bb318a95371ba877 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 16 Jun 2022 14:28:53 -0700
|
||||
Subject: [PATCH] PR #1197: absl/base/internal/direct_mmap.h: fix musl build on
|
||||
mips
|
||||
|
||||
Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1197
|
||||
|
||||
Fix the following musl build failure on mips:
|
||||
|
||||
```
|
||||
In file included from /nvmedata/autobuild/instance-15/output-1/build/libabseil-cpp-20211102.0/absl/base/internal/low_level_alloc.cc:26:
|
||||
/nvmedata/autobuild/instance-15/output-1/build/libabseil-cpp-20211102.0/absl/base/internal/direct_mmap.h:49:10: fatal error: sgidefs.h: No such file or directory
|
||||
49 | #include <sgidefs.h>
|
||||
| ^~~~~~~~~~~
|
||||
```
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/3fa027e602bacb22316fb5d9b233baa0b0f0e845
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Merge c9b5b5c5471213a871f7d6d1d2fc8f6899effbac into a184bab83ffcffc2aaac49a3900361158ab3890f
|
||||
|
||||
Merging this change closes #1197
|
||||
|
||||
COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1197 from ffontaine:master c9b5b5c5471213a871f7d6d1d2fc8f6899effbac
|
||||
PiperOrigin-RevId: 455467767
|
||||
Change-Id: I1905f7d70e914288bc1524a52adce3476a779fd8
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/abseil/abseil-cpp/commit/53a90f079af7ab491530d432bb318a95371ba877]
|
||||
---
|
||||
absl/base/internal/direct_mmap.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h
|
||||
index a01d61220..e492bb004 100644
|
||||
--- a/absl/base/internal/direct_mmap.h
|
||||
+++ b/absl/base/internal/direct_mmap.h
|
||||
@@ -41,13 +41,13 @@
|
||||
|
||||
#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
|
||||
// definitions we need.
|
||||
#include <asm/sgidefs.h>
|
||||
#else
|
||||
#include <sgidefs.h>
|
||||
-#endif // __BIONIC__
|
||||
+#endif // __BIONIC__ || !__GLIBC__
|
||||
#endif // __mips__
|
||||
|
||||
// SYS_mmap and SYS_munmap are not defined in Android.
|
||||
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4 libabseil-cpp-20211102.0.tar.gz
|
||||
sha256 4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602 libabseil-cpp-20220623.0.tar.gz
|
||||
sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBABSEIL_CPP_VERSION = 20211102.0
|
||||
LIBABSEIL_CPP_VERSION = 20220623.0
|
||||
LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION))
|
||||
LIBABSEIL_CPP_LICENSE = Apache-2.0
|
||||
LIBABSEIL_CPP_LICENSE_FILES = LICENSE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user