diff --git a/boost-1.58.0-pool-test_linking.patch b/boost-1.58.0-pool-test_linking.patch deleted file mode 100644 index 10292ee660369ea7ff22573e3881a3124db4dcdf..0000000000000000000000000000000000000000 --- a/boost-1.58.0-pool-test_linking.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up boost_1_58_0/libs/pool/test/Jamfile.v2\~ boost_1_58_0/libs/pool/test/Jamfile.v2 ---- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0100 -+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +0100 -@@ -22,18 +22,18 @@ import os ; - import testing ; - - test-suite pool : -- [ run test_simple_seg_storage.cpp : : : msvc:-wd4267 ] -- [ run test_pool_alloc.cpp ] -- [ run pool_msvc_compiler_bug_test.cpp : : : msvc:-wd4512 ] -- [ run test_msvc_mem_leak_detect.cpp ] -- [ run test_bug_3349.cpp ] -- [ run test_bug_4960.cpp ] -+ [ run test_simple_seg_storage.cpp : : : msvc:-wd4267 /boost/system//boost_system ] -+ [ run test_pool_alloc.cpp /boost/system//boost_system ] -+ [ run pool_msvc_compiler_bug_test.cpp : : : msvc:-wd4512 /boost/system//boost_system ] -+ [ run test_msvc_mem_leak_detect.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_3349.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_4960.cpp : : : /boost/system//boost_system ] - [ run test_bug_1252.cpp : : : - clang:-Wno-c++11-long-long - gcc:-Wno-long-long -- pathscale:-Wno-long-long ] -- [ run test_bug_2696.cpp ] -- [ run test_bug_5526.cpp ] -+ pathscale:-Wno-long-long /boost/system//boost_system ] -+ [ run test_bug_2696.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_5526.cpp : : : /boost/system//boost_system ] - [ run test_threading.cpp : : : multi /boost/thread//boost_thread ] - [ compile test_poisoned_macros.cpp ] - ; --- -2.19.1 diff --git a/boost-1.77-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux.patch b/boost-1.77-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux.patch new file mode 100644 index 0000000000000000000000000000000000000000..f517a49ef3a9d0ceee32ea2e7b90722b8436b4d6 --- /dev/null +++ b/boost-1.77-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux.patch @@ -0,0 +1,30 @@ +From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001 +From: Romain Geissler +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; + #endif + size = ((size+page_size-1)/page_size)*page_size; + int res = pthread_attr_setstacksize(&val_, size); diff --git a/boost-1.66.0-no-rpath.patch b/boost-1.77-build-drop-rpath.patch similarity index 82% rename from boost-1.66.0-no-rpath.patch rename to boost-1.77-build-drop-rpath.patch index beb26ef113bfe81f0df3c0cc86d68e0eeada0c63..9c465aac5a639fd934f3212e91ee8db7f17134a6 100644 --- a/boost-1.66.0-no-rpath.patch +++ b/boost-1.77-build-drop-rpath.patch @@ -1,8 +1,18 @@ +From 8f85a56a883d3712d4d0cb23dc22ccdfb8201f12 Mon Sep 17 00:00:00 2001 +From: sdlzx +Date: Wed, 15 Sep 2021 23:41:16 +0800 +Subject: [PATCH] Drop rpath + +Originally-by: Yaakov Selkowitz +--- + tools/build/src/tools/gcc.jam | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index ff3209f7b..04520bc01 100644 +index f48a00dc9..5c4e3e3ed 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1132,17 +1132,17 @@ actions link.mingw bind LIBRARIES +@@ -1034,17 +1034,17 @@ actions link.mingw bind LIBRARIES actions link.dll.mingw bind LIBRARIES { @@ -24,4 +34,5 @@ index ff3209f7b..04520bc01 100644 ### -- -2.23.0 \ No newline at end of file +2.31.1 + diff --git a/boost-1.77-locale-remove-linking-with-boost-system.patch b/boost-1.77-locale-remove-linking-with-boost-system.patch new file mode 100644 index 0000000000000000000000000000000000000000..a3ecde136813ea2de9b272497df9c834eccb8083 --- /dev/null +++ b/boost-1.77-locale-remove-linking-with-boost-system.patch @@ -0,0 +1,355 @@ +From aebac1401f9ddabb84c222481301d25beea1988d Mon Sep 17 00:00:00 2001 +From: Andrey Semashev +Date: Mon, 14 Jan 2019 21:08:25 +0300 +Subject: [PATCH 1/2] Remove linking with Boost.System. + +Since Boost.System is header-only now, no need to link with the library. +--- + build/Jamfile.v2 | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 +index 578e722e..43ab0014 100644 +--- a/libs/locale/build/Jamfile.v2 ++++ b/libs/locale/build/Jamfile.v2 +@@ -382,9 +382,6 @@ rule configure-full ( properties * : flags-only ) + result += util/gregorian.cpp ; + } + +- result += ../../system/build//boost_system ; +- +- + if "$(flags-only)" = "flags" + { + return $(flags-result) ; + +From b01aab1d28c9b32d107ae39c76c9af988420d476 Mon Sep 17 00:00:00 2001 +From: Andrey Semashev +Date: Mon, 14 Jan 2019 21:10:38 +0300 +Subject: [PATCH 2/2] Trim trailing spaces. + +--- + build/Jamfile.v2 | 119 +++++++++++++++++++++++------------------------ + 1 file changed, 59 insertions(+), 60 deletions(-) + +diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 +index 43ab0014..97dd68c7 100644 +--- a/libs/locale/build/Jamfile.v2 ++++ b/libs/locale/build/Jamfile.v2 +@@ -1,6 +1,6 @@ + # copyright John Maddock 2003, Artyom Beilis 2010 +-# Distributed under the Boost Software License, Version 1.0. +-# (See accompanying file LICENSE_1_0.txt or copy at ++# Distributed under the Boost Software License, Version 1.0. ++# (See accompanying file LICENSE_1_0.txt or copy at + # http://www.boost.org/LICENSE_1_0.txt. + + +@@ -32,11 +32,11 @@ explicit has_iconv ; + + ICONV_PATH = [ modules.peek : ICONV_PATH ] ; + +-lib iconv +- : ++lib iconv ++ : + : $(ICONV_PATH)/lib shared shared + : +- : $(ICONV_PATH)/include ++ : $(ICONV_PATH)/include + ; + + explicit iconv ; +@@ -45,8 +45,8 @@ obj has_iconv_libc_ext : ../build/has_iconv.cpp iconv ; + exe has_external_iconv : has_iconv_libc_ext iconv ; + explicit has_external_iconv ; + +-exe accepts_shared_option : ../build/option.cpp +- : -shared-libstdc++ ++exe accepts_shared_option : ../build/option.cpp ++ : -shared-libstdc++ + -shared-libgcc + -shared-libstdc++ + -shared-libgcc +@@ -71,8 +71,8 @@ if $(ICU_LINK) + else + { + searched-lib icuuc : : icuuc +- $(ICU_PATH)/lib +- shared ++ $(ICU_PATH)/lib ++ shared + shared ; + + searched-lib icuuc : : msvc +@@ -120,9 +120,9 @@ else + + explicit icuuc icudt icuin ; + +- ICU_OPTS = $(ICU_PATH)/include +- icuuc/shared/shared +- icudt/shared/shared ++ ICU_OPTS = $(ICU_PATH)/include ++ icuuc/shared/shared ++ icudt/shared/shared + icuin/shared/shared + $(ICU_PATH)/bin + shared ; +@@ -130,8 +130,8 @@ else + + + searched-lib icuuc_64 : : icuuc +- $(ICU_PATH)/lib64 +- shared ++ $(ICU_PATH)/lib64 ++ shared + shared ; + + searched-lib icuuc_64 : : msvc +@@ -179,14 +179,14 @@ else + + explicit icuuc_64 icudt_64 icuin_64 ; + +- ICU64_OPTS = $(ICU_PATH)/include +- icuuc_64/shared/shared +- icudt_64/shared/shared ++ ICU64_OPTS = $(ICU_PATH)/include ++ icuuc_64/shared/shared ++ icudt_64/shared/shared + icuin_64/shared/shared + $(ICU_PATH)/bin64 + shared ; +- +- ++ ++ + } + + obj has_icu_obj : ../build/has_icu_test.cpp : $(ICU_OPTS) ; +@@ -206,11 +206,11 @@ rule configure-full ( properties * : flags-only ) + + local result ; + local flags-result ; +- ++ + local found-iconv ; +- ++ + if on in $(properties) +- || ! in $(properties:G) ++ || ! in $(properties:G) + && ! solaris in $(properties) + { + # See if iconv is bundled with standard library. +@@ -218,7 +218,7 @@ rule configure-full ( properties * : flags-only ) + { + found-iconv = true ; + } +- else ++ else + { + if [ configure.builds has_external_iconv : $(properties) : "iconv (separate)" ] + { +@@ -226,8 +226,8 @@ rule configure-full ( properties * : flags-only ) + result += iconv ; + } + } +- } +- if $(found-iconv) ++ } ++ if $(found-iconv) + { + flags-result += BOOST_LOCALE_WITH_ICONV=1 ; + } +@@ -249,7 +249,7 @@ rule configure-full ( properties * : flags-only ) + + if $(found-icu) + { +- ICU_SOURCES = ++ ICU_SOURCES = + boundary + codecvt + collator +@@ -260,20 +260,20 @@ rule configure-full ( properties * : flags-only ) + numeric + time_zone + ; +- +- result += icu/$(ICU_SOURCES).cpp +- ../../thread/build//boost_thread ++ ++ result += icu/$(ICU_SOURCES).cpp ++ ../../thread/build//boost_thread + ; + } + + } +- +- if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) && ! cygwin in $(properties) ++ ++ if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) && ! cygwin in $(properties) + { + ECHO "- Boost.Locale needs either iconv or ICU library to be built." ; + result += no ; + } +- ++ + if ! in $(properties:G) + { + if sun in $(properties) +@@ -283,9 +283,9 @@ rule configure-full ( properties * : flags-only ) + else + { + properties += on ; +- } ++ } + } +- ++ + if off in $(properties) + { + flags-result += BOOST_LOCALE_NO_STD_BACKEND=1 ; +@@ -301,38 +301,38 @@ rule configure-full ( properties * : flags-only ) + ; + result += std/$(STD_SOURCES).cpp ; + } +- ++ + if ! in $(properties:G) + { +- if windows in $(properties) ++ if windows in $(properties) + || cygwin in $(properties) + { + properties += on ; +- } ++ } + else + { + properties += off ; +- } ++ } + } +- if windows in $(properties) +- && gcc in $(properties) ++ if windows in $(properties) ++ && gcc in $(properties) + && shared in $(properties) + && [ configure.builds accepts_shared_option : $(properties) : "g++ -shared-* supported" ] + { +- flags-result += -shared-libstdc++ ++ flags-result += -shared-libstdc++ + -shared-libgcc + -shared-libstdc++ + -shared-libgcc + ; + } +- ++ + if off in $(properties) + { + flags-result += BOOST_LOCALE_NO_WINAPI_BACKEND=1 ; + } + else + { +- WINAPI_SOURCES = ++ WINAPI_SOURCES = + collate + converter + numeric +@@ -340,34 +340,34 @@ rule configure-full ( properties * : flags-only ) + ; + result += win32/$(WINAPI_SOURCES).cpp ; + } +- ++ + if ( ! off in $(properties) || ! off in $(properties) ) + && ( windows in $(properties) || cygwin in $(properties) ) + { + result += win32/lcid.cpp ; + } +- ++ + if ! in $(properties:G) + { +- if linux in $(properties) +- || darwin in $(properties) ++ if linux in $(properties) ++ || darwin in $(properties) + || ( freebsd in $(properties) && [ configure.builds has_xlocale : $(properties) : "xlocale supported" ] ) + { + properties += on ; + } + else + { +- properties += off ; +- } ++ properties += off ; ++ } + } +- ++ + if off in $(properties) + { +- flags-result += BOOST_LOCALE_NO_POSIX_BACKEND=1 ; ++ flags-result += BOOST_LOCALE_NO_POSIX_BACKEND=1 ; + } + else + { +- POSIX_SOURCES = ++ POSIX_SOURCES = + collate + converter + numeric +@@ -381,12 +381,13 @@ rule configure-full ( properties * : flags-only ) + { + result += util/gregorian.cpp ; + } +- +- if "$(flags-only)" = "flags" ++ ++ if "$(flags-only)" = "flags" + { + return $(flags-result) ; + } +- else { ++ else ++ { + result += $(flags-result) ; + return $(result) ; + } +@@ -396,7 +397,6 @@ rule configure ( properties * ) + { + local result = [ configure-full $(properties) : "all" ] ; + return $(result) ; +- + } + + rule configure-flags ( properties * ) +@@ -404,15 +404,14 @@ rule configure-flags ( properties * ) + local result ; + result = [ configure-full $(properties) : "flags" ] ; + return $(result) ; +- + } + + + alias build_options : : : : @configure ; + alias build_flags : : : : @configure-flags ; + +-lib boost_locale +- : ++lib boost_locale ++ : + encoding/codepage.cpp + shared/date_time.cpp + shared/format.cpp +@@ -425,7 +424,7 @@ lib boost_locale + util/codecvt_converter.cpp + util/default_locale.cpp + util/info.cpp +- util/locale_data.cpp ++ util/locale_data.cpp + : + # Don't link explicitly, not required + BOOST_THREAD_NO_LIB=1 diff --git a/boost-1.58.0-pool.patch b/boost-1.77-pool-fix-interger-overflows-in-pool-ordered_malloc.patch similarity index 61% rename from boost-1.58.0-pool.patch rename to boost-1.77-pool-fix-interger-overflows-in-pool-ordered_malloc.patch index ed8449ef0f8a847b9c6b756064a0f21602d04d8d..8f9c3373df2c43280e1f263d5a592637c62fa860 100644 --- a/boost-1.58.0-pool.patch +++ b/boost-1.77-pool-fix-interger-overflows-in-pool-ordered_malloc.patch @@ -1,15 +1,32 @@ -Index: boost/pool/pool.hpp -=================================================================== ---- boost/pool/pool.hpp (revision 78317) -+++ boost/pool/pool.hpp (revision 78326) -@@ -27,4 +27,6 @@ +From b59c1be697a001a71f6b92660e41d8915eea941d Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh +Date: Thu, 9 Sep 2021 10:28:13 +0300 +Subject: [PATCH] fix integer overflows in pool::ordered_malloc + +Fixes trac #6701 (https://svn.boost.org/trac10/ticket/6701). + +Originally-by: Jonathan Wakely +--- + boost/pool/pool.hpp | 32 +++++++++++++++++++++++--------- + libs/pool/test/test_bug_6701.cpp | 27 +++++++++++++++++++++++++++ + 2 files changed, 50 insertions(+), 9 deletions(-) + create mode 100644 libs/pool/test/test_bug_6701.cpp + +diff --git a/boost/pool/pool.hpp b/boost/pool/pool.hpp +index c47b11faf..a899ca0a2 100644 +--- a/boost/pool/pool.hpp ++++ b/boost/pool/pool.hpp +@@ -26,6 +26,8 @@ + #include +// std::numeric_limits +#include // boost::integer::static_lcm #include -@@ -358,4 +360,11 @@ + // boost::simple_segregated_storage +@@ -355,6 +357,13 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t + return s; } + size_type max_chunks() const @@ -21,27 +38,29 @@ Index: boost/pool/pool.hpp + static void * & nextof(void * const ptr) { //! \returns Pointer dereferenced. -@@ -377,5 +388,7 @@ + //! (Provided and used for the sake of code readability :) +@@ -375,6 +384,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t //! the first time that object needs to allocate system memory. //! The default is 32. This parameter may not be 0. -- //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ //! \param nmax_size is the maximum number of chunks to allocate in one block. + //! \param nmax_size is the maximum number of chunks to allocate in one block. + set_next_size(nnext_size); + set_max_size(nmax_size); } -@@ -400,7 +413,7 @@ + ~pool() +@@ -398,8 +409,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t } void set_next_size(const size_type nnext_size) -- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. + { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. - //! \returns nnext_size. - next_size = start_size = nnext_size; -+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. + BOOST_USING_STD_MIN(); + next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); } size_type get_max_size() const -@@ -410,5 +423,6 @@ + { //! \returns max_size. +@@ -407,7 +418,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t + } void set_max_size(const size_type nmax_size) { //! Set max_size. - max_size = nmax_size; @@ -49,7 +68,9 @@ Index: boost/pool/pool.hpp + max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); } size_type get_requested_size() const -@@ -713,7 +727,7 @@ + { //! \returns the requested size passed into the constructor. +@@ -708,9 +720,9 @@ void * pool::malloc_need_resize() + BOOST_USING_STD_MIN(); if(!max_size) - next_size <<= 1; @@ -59,7 +80,9 @@ Index: boost/pool/pool.hpp + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); // initialize it, -@@ -753,7 +767,7 @@ + store().add_block(node.begin(), node.element_size(), partition_size); +@@ -748,9 +760,9 @@ void * pool::ordered_malloc_need_resize() + BOOST_USING_STD_MIN(); if(!max_size) - next_size <<= 1; @@ -69,14 +92,18 @@ Index: boost/pool/pool.hpp + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); // initialize it, -@@ -797,4 +811,6 @@ + // (we can use "add_block" here because we know that +@@ -792,6 +804,8 @@ void * pool::ordered_malloc(const size_type n) + { //! Gets address of a chunk n, allocating new memory if not already available. //! \returns Address of chunk n if allocated ok. //! \returns 0 if not enough memory for n chunks. + if (n > max_chunks()) + return 0; const size_type partition_size = alloc_size(); -@@ -845,7 +861,7 @@ + const size_type total_req_size = n * requested_size; +@@ -840,9 +854,9 @@ void * pool::ordered_malloc(const size_type n) + BOOST_USING_STD_MIN(); if(!max_size) - next_size <<= 1; @@ -86,14 +113,16 @@ Index: boost/pool/pool.hpp + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); // insert it into the list, -Index: libs/pool/test/test_bug_6701.cpp -=================================================================== ---- libs/pool/test/test_bug_6701.cpp (revision 78326) -+++ libs/pool/test/test_bug_6701.cpp (revision 78326) + // handle border case. +diff --git a/libs/pool/test/test_bug_6701.cpp b/libs/pool/test/test_bug_6701.cpp +new file mode 100644 +index 000000000..e484d3c7e +--- /dev/null ++++ b/libs/pool/test/test_bug_6701.cpp @@ -0,0 +1,27 @@ +/* Copyright (C) 2012 Étienne Dupuis -+* -+* Use, modification and distribution is subject to the ++* ++* Use, modification and distribution is subject to the +* Boost Software License, Version 1.0. (See accompanying +* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) +*/ @@ -109,7 +138,7 @@ Index: libs/pool/test/test_bug_6701.cpp + + void *x = p.malloc(); + BOOST_ASSERT(!x); -+ ++ + BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_next_size()); + BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_max_size()); + @@ -118,3 +147,6 @@ Index: libs/pool/test/test_bug_6701.cpp + + return 0; +} +-- +2.31.1 + diff --git a/boost-1.77-type_erasure-remove-boost-system-linkage.patch b/boost-1.77-type_erasure-remove-boost-system-linkage.patch new file mode 100644 index 0000000000000000000000000000000000000000..2236d5654edebeb1d37c6733655d073fa22e98c1 --- /dev/null +++ b/boost-1.77-type_erasure-remove-boost-system-linkage.patch @@ -0,0 +1,24 @@ +From d96af5c5060f02d35a70f57d971b539258279634 Mon Sep 17 00:00:00 2001 +From: sdlzx +Date: Tue, 5 Oct 2021 17:14:02 +0800 +Subject: [PATCH] Remove boost.system linkage + +--- + libs/type_erasure/build/Jamfile.v2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/type_erasure/build/Jamfile.v2 b/libs/type_erasure/build/Jamfile.v2 +index 2408e6bd8..3a77b5e57 100644 +--- a/libs/type_erasure/build/Jamfile.v2 ++++ b/libs/type_erasure/build/Jamfile.v2 +@@ -12,6 +12,6 @@ project /boost/type_erasure + : usage-requirements shared:BOOST_TYPE_ERASURE_DYN_LINK + ; + +-lib boost_type_erasure : dynamic_binding.cpp /boost//thread /boost//system ; ++lib boost_type_erasure : dynamic_binding.cpp /boost//thread ; + + boost-install boost_type_erasure ; +-- +2.31.1 + diff --git a/boost.spec b/boost.spec index 90e9711694aa4074747bf93eafdfe11fe9031e99..8fdb02e7aec97732eb3c4d841b5e4fde86ee3fba 100644 --- a/boost.spec +++ b/boost.spec @@ -1,9 +1,6 @@ %global boost_docdir __tmp_docdir %global boost_examplesdir __tmp_examplesdir -%global version_enc 1_76_0 -%global toplev_dirname %{name}_%{version_enc} -%global sonamever %{version} -%global python3_lib_version 38 +%global version_enc 1_77_0 %bcond_with mpich %bcond_with openmpi @@ -20,31 +17,35 @@ %bcond_with docs_generated Name: boost -Version: 1.76.0 -Release: 1 +Version: 1.77.0 +Release: 5 Summary: The free peer-reviewed portable C++ source libraries -License: Boost Software license V1.0 +License: Boost Software License 1.0 URL: http://www.boost.org -Source0: https://sourceforge.net/projects/boost/files/boost/%{version}/%{toplev_dirname}.tar.bz2 -Source1: libboost_thread.so -Source2: bjam +Source0: https://boostorg.jfrog.io/ui/native/main/release/1.77.0/source/%{name}_%{version_enc}.tar.gz +Source1: bjam # https://bugzilla.redhat.com/show_bug.cgi?id=828856 # https://bugzilla.redhat.com/show_bug.cgi?id=828857 # https://svn.boost.org/trac/boost/ticket/6701 -Patch1: boost-1.58.0-pool.patch - -# https://svn.boost.org/trac/boost/ticket/9038 -Patch2: boost-1.58.0-pool-test_linking.patch +# https://github.com/boostorg/pool/pull/42 +Patch1: boost-1.77-pool-fix-interger-overflows-in-pool-ordered_malloc.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1318383 -Patch3: boost-1.66.0-no-rpath.patch +Patch2: boost-1.77-build-drop-rpath.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1899888 # https://github.com/boostorg/locale/issues/52 -Patch4: boost-1.73-locale-empty-vector.patch +Patch3: boost-1.73-locale-empty-vector.patch + +# https://github.com/boostorg/locale/pull/38 +Patch4: boost-1.77-locale-remove-linking-with-boost-system.patch + +# https://github.com/boostorg/type_erasure/pull/19 +Patch5: boost-1.77-type_erasure-remove-boost-system-linkage.patch -Patch9000: regex-fix-dead-loop-in-parse_repeat.patch +# https://github.com/boostorg/thread/pull/354 +Patch6: boost-1.77-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux.patch Requires: %{name}-atomic%{?_isa} = %{version}-%{release} Requires: %{name}-chrono%{?_isa} = %{version}-%{release} @@ -73,8 +74,8 @@ Requires: %{name}-type_erasure%{?_isa} = %{version}-%{release} Requires: %{name}-wave%{?_isa} = %{version}-%{release} Requires: %{name}-contract%{?_isa} = %{version}-%{release} -BuildRequires: gcc-c++ m4 -BuildRequires: libstdc++-devel bzip2-devel zlib-devel libicu-devel +BuildRequires: gcc-c++ +BuildRequires: bzip2-devel zlib-devel libicu-devel %if %{with python3} BuildRequires: python3-devel python3-numpy %endif @@ -117,7 +118,6 @@ for this particular C++11 feature. %package chrono Summary: Useful time utilities C++11 -Requires: boost-system%{?_isa} = %{version}-%{release} %description chrono @@ -182,7 +182,6 @@ and synchronize fibers similiarly to standard thread support library. %package filesystem Summary: Run-time component of boost filesystem library -Requires: boost-system%{?_isa} = %{version}-%{release} %description filesystem @@ -218,7 +217,6 @@ simply "JSON" %package locale Summary: Run-time component of boost locale library Requires: boost-chrono%{?_isa} = %{version}-%{release} -Requires: boost-system%{?_isa} = %{version}-%{release} Requires: boost-thread%{?_isa} = %{version}-%{release} %description locale @@ -352,7 +350,6 @@ execution monitoring. %package thread Summary: Run-time component of boost thread library -Requires: boost-system%{?_isa} = %{version}-%{release} %description thread @@ -365,7 +362,6 @@ threads. %package timer Summary: Event timer, progress timer, and progress display classes Requires: boost-chrono%{?_isa} = %{version}-%{release} -Requires: boost-system%{?_isa} = %{version}-%{release} %description timer @@ -376,7 +372,6 @@ with as little as one #include and one additional line of code. %package type_erasure Summary: Run-time component of boost type erasure library Requires: boost-chrono%{?_isa} = %{version}-%{release} -Requires: boost-system%{?_isa} = %{version}-%{release} %description type_erasure @@ -386,9 +381,7 @@ that is more flexible than that provided by the core language. %package wave Summary: Run-time component of boost C99/C++ preprocessing library Requires: boost-chrono%{?_isa} = %{version}-%{release} -Requires: boost-date-time%{?_isa} = %{version}-%{release} Requires: boost-filesystem%{?_isa} = %{version}-%{release} -Requires: boost-system%{?_isa} = %{version}-%{release} Requires: boost-thread%{?_isa} = %{version}-%{release} %description wave @@ -586,14 +579,7 @@ Historically, Boost.Jam is based on on FTJam and on Perforce Jam but has grown a number of significant features and is now developed independently. %prep -%setup -q -n %{toplev_dirname} -find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x - -%patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch9000 -p1 +%autosetup -p1 -n %{name}_%{version_enc} %build %if %{with python3} @@ -643,8 +629,6 @@ else DEF=U fi -m4 -${DEF}HAS_ATOMIC_FLAG_LOCKFREE -DVERSION=%{version} %{SOURCE1} > $(basename %{SOURCE1}) - %if %{with openmpi} || %{with mpich} module purge ||: %endif @@ -687,8 +671,6 @@ echo ============================= build Boost.Build ================== : %install -cd %{_builddir}/%{toplev_dirname} - %if 0%{with openmpi} || 0%{with mpich} module purge ||: %endif @@ -761,7 +743,6 @@ echo ============================= install serial ================== [ -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so ] rm -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so -install -p -m 644 $(basename %{SOURCE1}) $RPM_BUILD_ROOT%{_libdir}/ rm -r $RPM_BUILD_ROOT/%{_libdir}/cmake @@ -777,7 +758,7 @@ echo ============================= install Boost.Build ================== rm -f $RPM_BUILD_ROOT%{_bindir}/b2 install -m 755 %{_builddir}/%{name}_%{version_enc}/tools/build/b2 $RPM_BUILD_ROOT%{_bindir}/bjam - %{__install} -p -m 644 %{SOURCE2} -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1 + %{__install} -p -m 644 %{SOURCE1} -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1 ) echo ============================= install Boost.QuickBook ================== @@ -869,145 +850,145 @@ fi %files contract %license LICENSE_1_0.txt -%{_libdir}/libboost_contract.so.%{sonamever} +%{_libdir}/libboost_contract.so.%{version} %files atomic %license LICENSE_1_0.txt -%{_libdir}/libboost_atomic.so.%{sonamever} +%{_libdir}/libboost_atomic.so.%{version} %files chrono %license LICENSE_1_0.txt -%{_libdir}/libboost_chrono.so.%{sonamever} +%{_libdir}/libboost_chrono.so.%{version} %files container %license LICENSE_1_0.txt -%{_libdir}/libboost_container.so.%{sonamever} +%{_libdir}/libboost_container.so.%{version} %files context %license LICENSE_1_0.txt -%{_libdir}/libboost_context.so.%{sonamever} +%{_libdir}/libboost_context.so.%{version} %files coroutine %license LICENSE_1_0.txt -%{_libdir}/libboost_coroutine.so.%{sonamever} +%{_libdir}/libboost_coroutine.so.%{version} %files date-time %license LICENSE_1_0.txt -%{_libdir}/libboost_date_time.so.%{sonamever} +%{_libdir}/libboost_date_time.so.%{version} %files fiber %license LICENSE_1_0.txt -%{_libdir}/libboost_fiber.so.%{sonamever} +%{_libdir}/libboost_fiber.so.%{version} %files filesystem %license LICENSE_1_0.txt -%{_libdir}/libboost_filesystem.so.%{sonamever} +%{_libdir}/libboost_filesystem.so.%{version} %files graph %license LICENSE_1_0.txt -%{_libdir}/libboost_graph.so.%{sonamever} +%{_libdir}/libboost_graph.so.%{version} %files iostreams %license LICENSE_1_0.txt -%{_libdir}/libboost_iostreams.so.%{sonamever} +%{_libdir}/libboost_iostreams.so.%{version} %files json %license LICENSE_1_0.txt -%{_libdir}/libboost_json.so.%{sonamever} +%{_libdir}/libboost_json.so.%{version} %files locale %license LICENSE_1_0.txt -%{_libdir}/libboost_locale.so.%{sonamever} +%{_libdir}/libboost_locale.so.%{version} %files log %license LICENSE_1_0.txt -%{_libdir}/libboost_log.so.%{sonamever} -%{_libdir}/libboost_log_setup.so.%{sonamever} +%{_libdir}/libboost_log.so.%{version} +%{_libdir}/libboost_log_setup.so.%{version} %files math %license LICENSE_1_0.txt -%{_libdir}/libboost_math_c99.so.%{sonamever} -%{_libdir}/libboost_math_c99f.so.%{sonamever} -%{_libdir}/libboost_math_c99l.so.%{sonamever} -%{_libdir}/libboost_math_tr1.so.%{sonamever} -%{_libdir}/libboost_math_tr1f.so.%{sonamever} -%{_libdir}/libboost_math_tr1l.so.%{sonamever} +%{_libdir}/libboost_math_c99.so.%{version} +%{_libdir}/libboost_math_c99f.so.%{version} +%{_libdir}/libboost_math_c99l.so.%{version} +%{_libdir}/libboost_math_tr1.so.%{version} +%{_libdir}/libboost_math_tr1f.so.%{version} +%{_libdir}/libboost_math_tr1l.so.%{version} %files nowide %license LICENSE_1_0.txt -%{_libdir}/libboost_nowide.so.%{sonamever} +%{_libdir}/libboost_nowide.so.%{version} %if %{with python3} %files numpy3 %license LICENSE_1_0.txt -%{_libdir}/libboost_numpy%{python3_lib_version}.so.%{sonamever} +%{_libdir}/libboost_numpy%{python3_version_nodots}.so.%{version} %files python3 %license LICENSE_1_0.txt -%{_libdir}/libboost_python%{python3_lib_version}.so.%{sonamever} +%{_libdir}/libboost_python%{python3_version_nodots}.so.%{version} %files python3-devel %license LICENSE_1_0.txt -%{_libdir}/libboost_numpy%{python3_lib_version}.so -%{_libdir}/libboost_python%{python3_lib_version}.so +%{_libdir}/libboost_numpy%{python3_version_nodots}.so +%{_libdir}/libboost_python%{python3_version_nodots}.so %endif %files test %license LICENSE_1_0.txt -%{_libdir}/libboost_prg_exec_monitor.so.%{sonamever} -%{_libdir}/libboost_unit_test_framework.so.%{sonamever} +%{_libdir}/libboost_prg_exec_monitor.so.%{version} +%{_libdir}/libboost_unit_test_framework.so.%{version} %files program-options %license LICENSE_1_0.txt -%{_libdir}/libboost_program_options.so.%{sonamever} +%{_libdir}/libboost_program_options.so.%{version} %files random %license LICENSE_1_0.txt -%{_libdir}/libboost_random.so.%{sonamever} +%{_libdir}/libboost_random.so.%{version} %files regex %license LICENSE_1_0.txt -%{_libdir}/libboost_regex.so.%{sonamever} +%{_libdir}/libboost_regex.so.%{version} %files serialization %license LICENSE_1_0.txt -%{_libdir}/libboost_serialization.so.%{sonamever} -%{_libdir}/libboost_wserialization.so.%{sonamever} +%{_libdir}/libboost_serialization.so.%{version} +%{_libdir}/libboost_wserialization.so.%{version} %files stacktrace %license LICENSE_1_0.txt -%{_libdir}/libboost_stacktrace_addr2line.so.%{sonamever} -%{_libdir}/libboost_stacktrace_basic.so.%{sonamever} -%{_libdir}/libboost_stacktrace_noop.so.%{sonamever} +%{_libdir}/libboost_stacktrace_addr2line.so.%{version} +%{_libdir}/libboost_stacktrace_basic.so.%{version} +%{_libdir}/libboost_stacktrace_noop.so.%{version} %files system %license LICENSE_1_0.txt -%{_libdir}/libboost_system.so.%{sonamever} +%{_libdir}/libboost_system.so.%{version} %files thread %license LICENSE_1_0.txt -%{_libdir}/libboost_thread.so.%{sonamever} +%{_libdir}/libboost_thread.so.%{version} %files timer %license LICENSE_1_0.txt -%{_libdir}/libboost_timer.so.%{sonamever} +%{_libdir}/libboost_timer.so.%{version} %files type_erasure %license LICENSE_1_0.txt -%{_libdir}/libboost_type_erasure.so.%{sonamever} +%{_libdir}/libboost_type_erasure.so.%{version} %files wave %license LICENSE_1_0.txt -%{_libdir}/libboost_wave.so.%{sonamever} +%{_libdir}/libboost_wave.so.%{version} %files help %doc %{boost_docdir}/* %files devel -%exclude %{_libdir}/libboost_numpy%{python3_lib_version}.so -%exclude %{_libdir}/libboost_python%{python3_lib_version}.so +%exclude %{_libdir}/libboost_numpy%{python3_version_nodots}.so +%exclude %{_libdir}/libboost_python%{python3_version_nodots}.so %license LICENSE_1_0.txt %{_includedir}/%{name} %{_libdir}/*.so @@ -1026,7 +1007,7 @@ fi %files openmpi %license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_mpi.so.%{sonamever} +%{_libdir}/openmpi/lib/libboost_mpi.so.%{version} %files openmpi-devel %license LICENSE_1_0.txt @@ -1037,24 +1018,24 @@ fi %files openmpi-python3 %license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_mpi_python%{python3_lib_version}.so.%{sonamever} +%{_libdir}/openmpi/lib/libboost_mpi_python%{python3_version_nodots}.so.%{version} %{python3_sitearch}/openmpi/boost/ %files openmpi-python3-devel %license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_mpi_python%{python3_lib_version}.so +%{_libdir}/openmpi/lib/libboost_mpi_python%{python3_version_nodots}.so %endif %files graph-openmpi %license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_graph_parallel.so.%{sonamever} +%{_libdir}/openmpi/lib/libboost_graph_parallel.so.%{version} %endif %if 0%{with mpich} %files mpich %license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_mpi.so.%{sonamever} +%{_libdir}/mpich/lib/libboost_mpi.so.%{version} %files mpich-devel %license LICENSE_1_0.txt @@ -1065,18 +1046,18 @@ fi %files mpich-python3 %license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_mpi_python%{python3_lib_version}.so.%{sonamever} +%{_libdir}/mpich/lib/libboost_mpi_python%{python3_version_nodots}.so.%{version} %{python3_sitearch}/mpich/boost/ %files mpich-python3-devel %license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_mpi_python%{python3_lib_version}.so +%{_libdir}/mpich/lib/libboost_mpi_python%{python3_version_nodots}.so %endif %files graph-mpich %license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_graph_parallel.so.%{sonamever} +%{_libdir}/mpich/lib/libboost_graph_parallel.so.%{version} %endif @@ -1095,6 +1076,21 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Thu Dec 02 2021 sdlzx - 1.77.0-5 +- Cleancode: Fix sign compare build warnings in boost-thread + +* Wed Oct 06 2021 Liu Zixian - 1.77.0-4 +- Remove dependencies on header-only libraries + +* Sun Sep 26 2021 Liu Zixian - 1.77.0-3 +- Remove linking script which is fixed in upstream PR266 + +* Wed Sep 22 2021 Liu Zixian - 1.77.0-2 +- Correct license name for ci. + +* Wed Sep 15 2021 Liu Zixian - 1.77.0-1 +- update to 1.77.0 + * Sat Jul 24 2021 Liu Zixian - 1.76.0-1 - update to 1.76.0 diff --git a/boost_1_76_0.tar.bz2 b/boost_1_77_0.tar.gz similarity index 78% rename from boost_1_76_0.tar.bz2 rename to boost_1_77_0.tar.gz index 91acbd38147cf71b2fdf37a5874dc22ea209c440..a5a11111d9f1fe130df43652f97cd4003e5caaf9 100644 Binary files a/boost_1_76_0.tar.bz2 and b/boost_1_77_0.tar.gz differ diff --git a/libboost_thread.so b/libboost_thread.so deleted file mode 100644 index db50610d6f179507ef1f11d355ad4aae5d24d789..0000000000000000000000000000000000000000 --- a/libboost_thread.so +++ /dev/null @@ -1,21 +0,0 @@ -changequote(`[', `]')dnl -/* GNU ld script - - Boost.Thread header files pull in enough of Boost.System that - symbols from the latter library are referenced by a compiled object - that includes Boost.Thread headers. libboost_system-mt.so is among - libboost_thread-mt.so's DT_NEEDED, but program linker requires that - missing symbols are satisfied by direct dependency, not by a - transitive one. Hence this linker script, which brings in the - Boost.System DSO. */ - -INPUT(libboost_thread.so.VERSION) -INPUT(libboost_system.so.VERSION) -ifdef([HAS_ATOMIC_FLAG_LOCKFREE],[], -[ -/* If the given architecture doesn't have lock-free implementation of - boost::atomic_flag, the dependency on Boost.Atomic may leak from - the header files to client binaries. */ - -INPUT(libboost_atomic.so.VERSION) -])dnl diff --git a/regex-fix-dead-loop-in-parse_repeat.patch b/regex-fix-dead-loop-in-parse_repeat.patch deleted file mode 100644 index b0dc52400e6d59b8ad64445ad4f8a43cd67b6789..0000000000000000000000000000000000000000 --- a/regex-fix-dead-loop-in-parse_repeat.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 91107fe78a290a7d25a042fec09ea89f14f480d9 Mon Sep 17 00:00:00 2001 -From: xuhuijie -Date: Wed, 16 Jun 2021 15:47:22 +0800 -Subject: [PATCH] regex: fix dead loop in parse_repea - There is a bug in parse_repeat(), after deal with comment the - contin value will be always true. So we enter a dead loop. To deal with this, - we assign contin to false each time we enter the loop. - Testcase: boost::regex(std::string("1?+(?#)1")) - -Signed-off-by: Xu Huijie ---- - boost/regex/v4/basic_regex_parser.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/boost/regex/v4/basic_regex_parser.hpp b/boost/regex/v4/basic_regex_parser.hpp -index 6c7065f05..de22f7000 100644 ---- a/boost/regex/v4/basic_regex_parser.hpp -+++ b/boost/regex/v4/basic_regex_parser.hpp -@@ -1080,9 +1080,10 @@ bool basic_regex_parser::parse_repeat(std::size_t low, std::size_ - // Check for illegal following quantifier, we have to do this here, because - // the extra states we insert below circumvents our usual error checking :-( - // -- bool contin = false; -+ bool contin; - do - { -+ contin = false; - if ((this->flags() & (regbase::main_option_type | regbase::mod_x | regbase::no_perl_ex)) == regbase::mod_x) - { - // whitespace skip: --- -2.23.0 -