mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 02:10:04 +00:00
capnproto: update to 0.9.1
Removed upstreamed patch. Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
0eaccf0031
commit
905dbd4aa5
-38
@@ -1,38 +0,0 @@
|
|||||||
From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sun, 15 Nov 2020 12:10:28 -0800
|
|
||||||
Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t
|
|
||||||
|
|
||||||
mutex code uses SYS_futex, which it expects from system C library.
|
|
||||||
in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
|
|
||||||
rv32 is using 64bit time_t from get go unlike other 32bit architectures
|
|
||||||
in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
|
|
||||||
this aliases it to NR_futex so that SYS_futex is then defined for rv32
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/capnproto/capnproto/pull/1103]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
c++/src/kj/mutex.c++ | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++
|
|
||||||
index c81cead7..e1594b11 100644
|
|
||||||
--- a/c++/src/kj/mutex.c++
|
|
||||||
+++ b/c++/src/kj/mutex.c++
|
|
||||||
@@ -39,7 +39,13 @@
|
|
||||||
|
|
||||||
#ifndef SYS_futex
|
|
||||||
// Missing on Android/Bionic.
|
|
||||||
+#ifdef __NR_futex
|
|
||||||
#define SYS_futex __NR_futex
|
|
||||||
+#elif defined(SYS_futex_time64)
|
|
||||||
+#define SYS_futex SYS_futex_time64
|
|
||||||
+#else
|
|
||||||
+#error "Need working SYS_futex"
|
|
||||||
+#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef FUTEX_WAIT_PRIVATE
|
|
||||||
--
|
|
||||||
2.29.2
|
|
||||||
|
|
||||||
+1
-2
@@ -6,9 +6,8 @@ LICENSE = "MIT"
|
|||||||
LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9"
|
LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \
|
SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \
|
||||||
file://0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch;patchdir=../ \
|
|
||||||
"
|
"
|
||||||
SRCREV = "57a4ca5af5a7f55b768a9d9d6655250bffb1257f"
|
SRCREV = "b49431c48d40490ef979247d308af63345376cee"
|
||||||
|
|
||||||
S = "${WORKDIR}/git/c++"
|
S = "${WORKDIR}/git/c++"
|
||||||
|
|
||||||
Reference in New Issue
Block a user