summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/boost
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r--meta/recipes-support/boost/boost-1.72.0.inc2
-rw-r--r--meta/recipes-support/boost/boost.inc6
-rw-r--r--meta/recipes-support/boost/boost/0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch32
-rw-r--r--meta/recipes-support/boost/boost/0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch24
-rw-r--r--meta/recipes-support/boost/boost_1.72.0.bb2
5 files changed, 64 insertions, 2 deletions
diff --git a/meta/recipes-support/boost/boost-1.72.0.inc b/meta/recipes-support/boost/boost-1.72.0.inc
index 55a095bf1c..d152895f09 100644
--- a/meta/recipes-support/boost/boost-1.72.0.inc
+++ b/meta/recipes-support/boost/boost-1.72.0.inc
@@ -11,7 +11,7 @@ BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}"
11BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" 11BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
12BOOST_P = "boost_${BOOST_VER}" 12BOOST_P = "boost_${BOOST_VER}"
13 13
14SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" 14SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2"
15SRC_URI[md5sum] = "cb40943d2a2cb8ce08d42bc48b0f84f0" 15SRC_URI[md5sum] = "cb40943d2a2cb8ce08d42bc48b0f84f0"
16SRC_URI[sha256sum] = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722" 16SRC_URI[sha256sum] = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"
17 17
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 8eb9494381..1c13fb3599 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -1,4 +1,8 @@
1SUMMARY = "Free peer-reviewed portable C++ source libraries" 1SUMMARY = "Free peer-reviewed portable C++ source libraries"
2DESCRIPTION = "Provides free peer-reviewed portable C++ source libraries. The emphasis is on libraries which work well with the C++ \
3Standard Library. One goal is to establish 'existing practice' and \
4provide reference implementations so that the Boost libraries are suitable for eventual standardization. Some of the libraries have already been proposed for inclusion in the C++ Standards Committee's \
5upcoming C++ Standard Library Technical Report."
2SECTION = "libs" 6SECTION = "libs"
3DEPENDS = "bjam-native zlib bzip2" 7DEPENDS = "bjam-native zlib bzip2"
4 8
@@ -161,7 +165,7 @@ do_configure() {
161 165
162 # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. 166 # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation.
163 rm -f ${WORKDIR}/user-config.jam 167 rm -f ${WORKDIR}/user-config.jam
164 echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${WORKDIR}/user-config.jam 168 echo 'using gcc : : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${WORKDIR}/user-config.jam
165 169
166 # If we want Python then we need to tell Boost *exactly* where to find it 170 # If we want Python then we need to tell Boost *exactly* where to find it
167 if ${@bb.utils.contains('BOOST_LIBS', 'python', 'true', 'false', d)}; then 171 if ${@bb.utils.contains('BOOST_LIBS', 'python', 'true', 'false', d)}; then
diff --git a/meta/recipes-support/boost/boost/0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch b/meta/recipes-support/boost/boost/0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch
new file mode 100644
index 0000000000..46c706931b
--- /dev/null
+++ b/meta/recipes-support/boost/boost/0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch
@@ -0,0 +1,32 @@
1From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
2From: Romain Geissler <romain.geissler@amadeus.com>
3Date: Tue, 10 Aug 2021 14:22:28 +0000
4Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
5 platforms.
6
7In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
8 from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
9 from src/GetTest.cpp:12:
10/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)':
11/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]
12 61 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
13 | ^
14
15Upstream-Status: Backport [1.78.0 https://github.com/boostorg/thread/commit/f9d0e594d43afcb4ab0043117249feb266ba4515]
16---
17 boost/thread/pthread/thread_data.hpp | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/boost/thread/pthread/thread_data.hpp b/boost/thread/pthread/thread_data.hpp
21index bc9b1367..c43b276d 100644
22--- a/boost/thread/pthread/thread_data.hpp
23+++ b/boost/thread/pthread/thread_data.hpp
24@@ -58,7 +58,7 @@ namespace boost
25 std::size_t page_size = ::sysconf( _SC_PAGESIZE);
26 #endif
27 #ifdef PTHREAD_STACK_MIN
28- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
29+ if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
30 #endif
31 size = ((size+page_size-1)/page_size)*page_size;
32 int res = pthread_attr_setstacksize(&val_, size);
diff --git a/meta/recipes-support/boost/boost/0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch b/meta/recipes-support/boost/boost/0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch
new file mode 100644
index 0000000000..3784cf9165
--- /dev/null
+++ b/meta/recipes-support/boost/boost/0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch
@@ -0,0 +1,24 @@
1From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
2From: Rob Boehne <robb@datalogics.com>
3Date: Wed, 20 Nov 2019 11:25:20 -0600
4Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
5 to fail.
6
7Upstream-Status: Backport [1.73.0 https://github.com/boostorg/thread/commit/74fb0a26099bc51d717f5f154b37231ce7df3e98]
8---
9 boost/thread/pthread/thread_data.hpp | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/boost/thread/pthread/thread_data.hpp b/boost/thread/pthread/thread_data.hpp
13index aefbeb43..bc9b1367 100644
14--- a/boost/thread/pthread/thread_data.hpp
15+++ b/boost/thread/pthread/thread_data.hpp
16@@ -57,7 +57,7 @@ namespace boost
17 #else
18 std::size_t page_size = ::sysconf( _SC_PAGESIZE);
19 #endif
20-#if PTHREAD_STACK_MIN > 0
21+#ifdef PTHREAD_STACK_MIN
22 if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
23 #endif
24 size = ((size+page_size-1)/page_size)*page_size;
diff --git a/meta/recipes-support/boost/boost_1.72.0.bb b/meta/recipes-support/boost/boost_1.72.0.bb
index df1cc16937..b3ec11933c 100644
--- a/meta/recipes-support/boost/boost_1.72.0.bb
+++ b/meta/recipes-support/boost/boost_1.72.0.bb
@@ -9,4 +9,6 @@ SRC_URI += " \
9 file://0001-dont-setup-compiler-flags-m32-m64.patch \ 9 file://0001-dont-setup-compiler-flags-m32-m64.patch \
10 file://0001-revert-cease-dependence-on-range.patch \ 10 file://0001-revert-cease-dependence-on-range.patch \
11 file://0001-added-typedef-executor_type.patch \ 11 file://0001-added-typedef-executor_type.patch \
12 file://0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch \
13 file://0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch \
12 " 14 "