diff options
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch | 9 | ||||
-rw-r--r-- | 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 a5bebf5f0..5242b29e0 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. | |||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | 11 | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | absl/base/internal/direct_mmap.h | 6 +----- | 15 | absl/base/internal/direct_mmap.h | 6 +----- |
15 | 1 file changed, 1 insertion(+), 5 deletions(-) | 16 | 1 file changed, 1 insertion(+), 5 deletions(-) |
16 | 17 | ||
17 | diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h | 18 | diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h |
18 | index a01d61220376..c8a4fbabbb3a 100644 | 19 | index e492bb0..c8a4fba 100644 |
19 | --- a/absl/base/internal/direct_mmap.h | 20 | --- a/absl/base/internal/direct_mmap.h |
20 | +++ b/absl/base/internal/direct_mmap.h | 21 | +++ b/absl/base/internal/direct_mmap.h |
21 | @@ -41,13 +41,9 @@ | 22 | @@ -41,13 +41,9 @@ |
22 | 23 | ||
23 | #ifdef __mips__ | 24 | #ifdef __mips__ |
24 | // Include definitions of the ABI currently in use. | 25 | // Include definitions of the ABI currently in use. |
25 | -#ifdef __BIONIC__ | 26 | -#if defined(__BIONIC__) || !defined(__GLIBC__) |
26 | -// Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the | 27 | -// Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the |
27 | +// bionic/musl C libs don't have sgidefs.h, but do have asm/sgidefs.h, which has the | 28 | +// bionic/musl C libs don't have sgidefs.h, but do have asm/sgidefs.h, which has the |
28 | // definitions we need. | 29 | // definitions we need. |
29 | #include <asm/sgidefs.h> | 30 | #include <asm/sgidefs.h> |
30 | -#else | 31 | -#else |
31 | -#include <sgidefs.h> | 32 | -#include <sgidefs.h> |
32 | -#endif // __BIONIC__ | 33 | -#endif // __BIONIC__ || !__GLIBC__ |
33 | #endif // __mips__ | 34 | #endif // __mips__ |
34 | 35 | ||
35 | // SYS_mmap and SYS_munmap are not defined in Android. | 36 | // SYS_mmap and SYS_munmap are not defined in Android. |
36 | -- | 37 | -- |
37 | 2.36.1 | 38 | 2.25.1 |
38 | 39 | ||
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 b271134fd..b3dc06ca1 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" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" |
9 | 9 | ||
10 | PV = "20211102.1+git${SRCPV}" | 10 | PV = "20220623.0" |
11 | SRCREV = "7c6608d0dbe43cf9bdf7f77787bc6bc89cc42f8b" | 11 | SRCREV = "273292d1cfc0a94a65082ee350509af1d113344d" |
12 | BRANCH = "master" | 12 | BRANCH = "lts_2022_06_23" |
13 | SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ | 13 | SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ |
14 | file://0001-absl-always-use-asm-sgidefs.h.patch \ | 14 | file://0001-absl-always-use-asm-sgidefs.h.patch \ |
15 | file://0002-Remove-maes-option-from-cross-compilation.patch \ | 15 | file://0002-Remove-maes-option-from-cross-compilation.patch \ |