summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch36
-rw-r--r--meta/recipes-support/boost/boost_1.78.0.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch b/meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch
new file mode 100644
index 0000000000..20dc3ca54e
--- /dev/null
+++ b/meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch
@@ -0,0 +1,36 @@
1From b15d8d0754bb545ba10d0cfba8bbfdfb22a62c38 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 20 Feb 2022 22:03:14 -0800
4Subject: [PATCH] futex: fix build on 32-bit architectures using 64-bit time_t
5
6Fix the following build failure on 32-bit architectures using 64-bit
7time_t (e.g. riscv32):
8| ./boost/fiber/detail/futex.hpp:31:23: error: use of undeclared identifier 'SYS_futex'
9| return ::syscall( SYS_futex, addr, op, x, nullptr, nullptr, 0);
10| ^
11| 1 error generated.
12
13Upstream-Status: Submitted [https://github.com/boostorg/fiber/pull/292]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 boost/fiber/detail/futex.hpp | 4 ++++
17 1 file changed, 4 insertions(+)
18
19diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp
20index e64bd5990..d0353e9e5 100644
21--- a/boost/fiber/detail/futex.hpp
22+++ b/boost/fiber/detail/futex.hpp
23@@ -12,6 +12,10 @@
24
25 #include <boost/fiber/detail/config.hpp>
26
27+#ifndef SYS_futex
28+#define SYS_futex SYS_futex_time64
29+#endif
30+
31 #if BOOST_OS_LINUX
32 extern "C" {
33 #include <linux/futex.h>
34--
352.35.1
36
diff --git a/meta/recipes-support/boost/boost_1.78.0.bb b/meta/recipes-support/boost/boost_1.78.0.bb
index f4b6ed8576..58be9dcf12 100644
--- a/meta/recipes-support/boost/boost_1.78.0.bb
+++ b/meta/recipes-support/boost/boost_1.78.0.bb
@@ -6,4 +6,5 @@ SRC_URI += "file://boost-CVE-2012-2677.patch \
6 file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ 6 file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
7 file://0001-dont-setup-compiler-flags-m32-m64.patch \ 7 file://0001-dont-setup-compiler-flags-m32-m64.patch \
8 file://de657e01635306085488290ea83de541ec393f8b.patch \ 8 file://de657e01635306085488290ea83de541ec393f8b.patch \
9 file://0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch \
9 " 10 "