mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/capnproto: bump to version 0.9.1

Browse Source 
- Drop patch (already in version)
- Fix build on musl by disabling fibers through the new KJ_USE_FIBERS
  variable:
  https://github.com/capnproto/capnproto/issues/1167
  https://github.com/capnproto/capnproto/pull/1313
- Update indentation in hash file (two spaces)

https://capnproto.org/news

Fixes:
 - http://autobuild.buildroot.org/results/1a54cf9e7223c2bd67a5c85a6f2f42aa98da3a53

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit ee3e17a717)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2021-11-15 23:18:05 +01:00
committed by Peter Korsgaard
parent f0cca242d3
commit 1f67a4dc06
3 changed files with 8 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch
View File

@@ -1,37 +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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
[Retrieved from:
https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@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 c81cead7b..e1594b117 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

4
package/capnproto/capnproto.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated # Locally calculated
sha256 6d8b43a7ec2a764b4dfe4139a7cdd070ad9057f106898050d9f4db3754b98820 capnproto-0.8.0.tar.gz sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz
sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE

7
package/capnproto/capnproto.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
CAPNPROTO_VERSION = 0.8.0 CAPNPROTO_VERSION = 0.9.1
CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION))
CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE = MIT
CAPNPROTO_LICENSE_FILES = LICENSE CAPNPROTO_LICENSE_FILES = LICENSE
@@ -29,5 +29,10 @@ else
CAPNPROTO_CONF_OPTS += --without-openssl CAPNPROTO_CONF_OPTS += --without-openssl
endif endif
# musl doesn't support getcontext/setcontext
ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
CAPNPROTO_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DKJ_USE_FIBERS=0"
endif
$(eval $(autotools-package)) $(eval $(autotools-package))
$(eval $(host-autotools-package)) $(eval $(host-autotools-package))