mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 09:32:14 +02:00
boost: fix native build with glibc-2.34
(From OE-Core rev: 64ba0d40a4c77a23778c51511f2d167e2056eea3) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
331a9f9068
commit
6b6d412f59
@@ -0,0 +1,32 @@
|
||||
From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Geissler <romain.geissler@amadeus.com>
|
||||
Date: Tue, 10 Aug 2021 14:22:28 +0000
|
||||
Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
|
||||
platforms.
|
||||
|
||||
In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
|
||||
from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
|
||||
from src/GetTest.cpp:12:
|
||||
/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
|
||||
/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
|
||||
61 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
|
||||
| ^
|
||||
|
||||
Upstream-Status: Backport [1.78.0 https://github.com/boostorg/thread/commit/f9d0e594d43afcb4ab0043117249feb266ba4515]
|
||||
---
|
||||
boost/thread/pthread/thread_data.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/boost/thread/pthread/thread_data.hpp b/boost/thread/pthread/thread_data.hpp
|
||||
index bc9b1367..c43b276d 100644
|
||||
--- a/boost/thread/pthread/thread_data.hpp
|
||||
+++ b/boost/thread/pthread/thread_data.hpp
|
||||
@@ -58,7 +58,7 @@ namespace boost
|
||||
std::size_t page_size = ::sysconf( _SC_PAGESIZE);
|
||||
#endif
|
||||
#ifdef PTHREAD_STACK_MIN
|
||||
- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
|
||||
+ if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
|
||||
#endif
|
||||
size = ((size+page_size-1)/page_size)*page_size;
|
||||
int res = pthread_attr_setstacksize(&val_, size);
|
||||
@@ -0,0 +1,24 @@
|
||||
From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Boehne <robb@datalogics.com>
|
||||
Date: Wed, 20 Nov 2019 11:25:20 -0600
|
||||
Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
|
||||
to fail.
|
||||
|
||||
Upstream-Status: Backport [1.73.0 https://github.com/boostorg/thread/commit/74fb0a26099bc51d717f5f154b37231ce7df3e98]
|
||||
---
|
||||
boost/thread/pthread/thread_data.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/boost/thread/pthread/thread_data.hpp b/boost/thread/pthread/thread_data.hpp
|
||||
index aefbeb43..bc9b1367 100644
|
||||
--- a/boost/thread/pthread/thread_data.hpp
|
||||
+++ b/boost/thread/pthread/thread_data.hpp
|
||||
@@ -57,7 +57,7 @@ namespace boost
|
||||
#else
|
||||
std::size_t page_size = ::sysconf( _SC_PAGESIZE);
|
||||
#endif
|
||||
-#if PTHREAD_STACK_MIN > 0
|
||||
+#ifdef PTHREAD_STACK_MIN
|
||||
if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
|
||||
#endif
|
||||
size = ((size+page_size-1)/page_size)*page_size;
|
||||
@@ -9,4 +9,6 @@ SRC_URI += " \
|
||||
file://0001-dont-setup-compiler-flags-m32-m64.patch \
|
||||
file://0001-revert-cease-dependence-on-range.patch \
|
||||
file://0001-added-typedef-executor_type.patch \
|
||||
file://0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch \
|
||||
file://0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch \
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user