mirror of
https://abf.rosa.ru/djam/boost.git
synced 2025-04-11 08:44:17 +00:00
1.74.0
This commit is contained in:
parent
f904b334e1
commit
48034c0c0f
10 changed files with 201 additions and 36 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,2 +1,2 @@
|
||||||
sources:
|
sources:
|
||||||
boost_1_61_0.tar.bz2: f84b1a1ce764108ec3c2b7bd7704cf8dfd3c9d01
|
boost_1_74_0.tar.bz2: f82c0d8685b4d0e3971e8e2a8f9ef1551412c125
|
||||||
|
|
|
@ -5,9 +5,9 @@ index 8b2bc43..d04f2fe 100644
|
||||||
@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit<thing_base_unit, boost::units::
|
@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit<thing_base_unit, boost::units::
|
||||||
struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5>
|
struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5>
|
||||||
{
|
{
|
||||||
static const char* name() { return("EUR"); }
|
static constexpr const char* name() { return("EUR"); }
|
||||||
- static const char* symbol() { return("€"); }
|
- static constexpr const char* symbol() { return("€"); }
|
||||||
+ static const char* symbol() { return("€"); }
|
+ static constexpr const char* symbol() { return("€"); }
|
||||||
};
|
};
|
||||||
|
|
||||||
int main()
|
int main()
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Index: /trunk/boost/foreach_fwd.hpp
|
Index: boost/boost/foreach_fwd.hpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /trunk/boost/foreach_fwd.hpp (revision 62661)
|
--- boost/boost/foreach_fwd.hpp (revision 62661)
|
||||||
+++ /trunk/boost/foreach_fwd.hpp (revision 75540)
|
+++ boost/boost/foreach_fwd.hpp (revision 75540)
|
||||||
@@ -15,4 +15,6 @@
|
@@ -15,4 +15,6 @@
|
||||||
#define BOOST_FOREACH_FWD_HPP
|
#define BOOST_FOREACH_FWD_HPP
|
||||||
|
|
||||||
|
@ -40,10 +40,10 @@ Index: /trunk/boost/foreach_fwd.hpp
|
||||||
+
|
+
|
||||||
} // namespace boost
|
} // namespace boost
|
||||||
|
|
||||||
Index: /trunk/boost/foreach.hpp
|
Index: boost/boost/foreach.hpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /trunk/boost/foreach.hpp (revision 75077)
|
--- boost/boost/foreach.hpp (revision 75077)
|
||||||
+++ /trunk/boost/foreach.hpp (revision 75540)
|
+++ boost/boost/foreach.hpp (revision 75540)
|
||||||
@@ -166,5 +166,5 @@
|
@@ -166,5 +166,5 @@
|
||||||
// at the global namespace for your type.
|
// at the global namespace for your type.
|
||||||
template<typename T>
|
template<typename T>
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
diff --git a/libs/math/config/has_long_double_support.cpp b/libs/math/config/has_long_double_support.cpp
|
diff -up boost_1_73_0/libs/math/config/has_long_double_support.cpp.5~ boost_1_73_0/libs/math/config/has_long_double_support.cpp
|
||||||
index d314cf3..9022408 100644
|
--- boost_1_73_0/libs/math/config/has_long_double_support.cpp.5~ 2020-04-29 03:27:52.608400056 +0200
|
||||||
--- a/libs/math/config/has_long_double_support.cpp
|
+++ boost_1_73_0/libs/math/config/has_long_double_support.cpp 2020-04-29 14:29:15.063698315 +0200
|
||||||
+++ b/libs/math/config/has_long_double_support.cpp
|
|
||||||
@@ -8,3 +8,7 @@
|
@@ -8,3 +8,7 @@
|
||||||
#ifdef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
|
#ifdef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
|
||||||
#error "long double support is not supported by Boost.Math on this Plaform: the long double version of the TR1 library will not be built."
|
#error "long double support is not supported by Boost.Math on this Platform: the long double version of the TR1 library will not be built."
|
||||||
#endif
|
#endif
|
||||||
+
|
+
|
||||||
+int main(int argc, char *argv[]) {
|
+int main(int argc, char *argv[]) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- /usr/include/boost/polygon/polygon.hpp.orig 2012-01-26 01:05:15.934998805 +0800
|
--- boost/boost/polygon/polygon.hpp.orig 2012-01-26 01:05:15.934998805 +0800
|
||||||
+++ /usr/include/boost/polygon/polygon.hpp 2012-01-26 01:13:10.547000000 +0800
|
+++ boost/boost/polygon/polygon.hpp 2012-01-26 01:13:10.547000000 +0800
|
||||||
@@ -24,6 +24,8 @@
|
@@ -24,6 +24,8 @@
|
||||||
|
|
||||||
#include "transform.hpp"
|
#include "transform.hpp"
|
||||||
|
|
122
boost-1.50.0-pool.patch
Normal file
122
boost-1.50.0-pool.patch
Normal file
|
@ -0,0 +1,122 @@
|
||||||
|
Index: boost/boost/pool/pool.hpp
|
||||||
|
===================================================================
|
||||||
|
--- boost/boost/pool/pool.hpp (revision 78317)
|
||||||
|
+++ boost/boost/pool/pool.hpp (revision 78326)
|
||||||
|
@@ -27,4 +27,6 @@
|
||||||
|
#include <boost/pool/poolfwd.hpp>
|
||||||
|
|
||||||
|
+// std::numeric_limits
|
||||||
|
+#include <boost/limits.hpp>
|
||||||
|
// boost::integer::static_lcm
|
||||||
|
#include <boost/integer/common_factor_ct.hpp>
|
||||||
|
@@ -358,4 +360,13 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
+ size_type max_chunks() const
|
||||||
|
+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
|
||||||
|
+ size_type partition_size = alloc_size();
|
||||||
|
+ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
|
||||||
|
+ size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
|
||||||
|
+
|
||||||
|
+ return max_chunks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
static void * & nextof(void * const ptr)
|
||||||
|
{ //! \returns Pointer dereferenced.
|
||||||
|
@@ -377,5 +388,7 @@
|
||||||
|
//! 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.
|
||||||
|
+ set_next_size(nnext_size);
|
||||||
|
+ set_max_size(nmax_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -400,7 +413,7 @@
|
||||||
|
}
|
||||||
|
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.
|
||||||
|
- //! \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 @@
|
||||||
|
void set_max_size(const size_type nmax_size)
|
||||||
|
{ //! Set max_size.
|
||||||
|
- max_size = nmax_size;
|
||||||
|
+ BOOST_USING_STD_MIN();
|
||||||
|
+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
|
||||||
|
}
|
||||||
|
size_type get_requested_size() const
|
||||||
|
@@ -713,7 +727,7 @@
|
||||||
|
BOOST_USING_STD_MIN();
|
||||||
|
if(!max_size)
|
||||||
|
- next_size <<= 1;
|
||||||
|
+ set_next_size(next_size << 1);
|
||||||
|
else if( next_size*partition_size/requested_size < max_size)
|
||||||
|
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
|
||||||
|
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
|
||||||
|
|
||||||
|
// initialize it,
|
||||||
|
@@ -753,7 +767,7 @@
|
||||||
|
BOOST_USING_STD_MIN();
|
||||||
|
if(!max_size)
|
||||||
|
- next_size <<= 1;
|
||||||
|
+ set_next_size(next_size << 1);
|
||||||
|
else if( next_size*partition_size/requested_size < max_size)
|
||||||
|
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
|
||||||
|
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
|
||||||
|
|
||||||
|
// initialize it,
|
||||||
|
@@ -797,4 +811,6 @@
|
||||||
|
//! \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 @@
|
||||||
|
BOOST_USING_STD_MIN();
|
||||||
|
if(!max_size)
|
||||||
|
- next_size <<= 1;
|
||||||
|
+ set_next_size(next_size << 1);
|
||||||
|
else if( next_size*partition_size/requested_size < max_size)
|
||||||
|
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
|
||||||
|
+ 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)
|
||||||
|
@@ -0,0 +1,27 @@
|
||||||
|
+/* Copyright (C) 2012 Étienne Dupuis
|
||||||
|
+*
|
||||||
|
+* 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)
|
||||||
|
+*/
|
||||||
|
+
|
||||||
|
+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
|
||||||
|
+
|
||||||
|
+#include <boost/pool/object_pool.hpp>
|
||||||
|
+#include <boost/limits.hpp>
|
||||||
|
+
|
||||||
|
+int main()
|
||||||
|
+{
|
||||||
|
+ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
|
||||||
|
+
|
||||||
|
+ void *x = p.malloc();
|
||||||
|
+ BOOST_ASSERT(!x);
|
||||||
|
+
|
||||||
|
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
|
||||||
|
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
|
||||||
|
+
|
||||||
|
+ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
|
||||||
|
+ BOOST_ASSERT(!y);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
42
boost-1.57.0-build-optflags.patch
Normal file
42
boost-1.57.0-build-optflags.patch
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
diff -up boost_1_74_0/tools/build/src/tools/gcc.jam.9~ boost_1_74_0/tools/build/src/tools/gcc.jam
|
||||||
|
--- boost_1_74_0/tools/build/src/tools/gcc.jam.9~ 2020-08-11 16:57:21.000000000 +0200
|
||||||
|
+++ boost_1_74_0/tools/build/src/tools/gcc.jam 2020-08-14 17:43:55.676937535 +0200
|
||||||
|
@@ -577,7 +577,7 @@ rule compile.fortran ( targets * : sourc
|
||||||
|
|
||||||
|
actions compile.c++ bind PCH_FILE
|
||||||
|
{
|
||||||
|
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<:W)" "$(>:W)"
|
||||||
|
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<:W)" "$(>:W)"
|
||||||
|
}
|
||||||
|
|
||||||
|
actions compile.c bind PCH_FILE
|
||||||
|
@@ -587,7 +587,7 @@ actions compile.c bind PCH_FILE
|
||||||
|
|
||||||
|
actions compile.c++.preprocess bind PCH_FILE
|
||||||
|
{
|
||||||
|
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:W)" -E >"$(<:W)"
|
||||||
|
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:W)" -E >"$(<:W)"
|
||||||
|
}
|
||||||
|
|
||||||
|
actions compile.c.preprocess bind PCH_FILE
|
||||||
|
@@ -704,13 +704,13 @@ actions compile.c.pch
|
||||||
|
###
|
||||||
|
|
||||||
|
# Declare flags and action for compilation.
|
||||||
|
-toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
|
||||||
|
-
|
||||||
|
-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <optimization>off : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <optimization>speed : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <optimization>space : ;
|
||||||
|
+
|
||||||
|
+toolset.flags gcc.compile OPTIONS <inlining>off : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <inlining>on : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <inlining>full : ;
|
||||||
|
|
||||||
|
toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
|
||||||
|
toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
|
|
@ -1,6 +1,6 @@
|
||||||
--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200
|
--- boost_1_65_0/tools/build/src/tools/python.jam.p18~ 2017-08-21 23:51:31.876299004 +0200
|
||||||
+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200
|
+++ boost_1_65_0/tools/build/src/tools/python.jam 2017-08-21 23:52:08.595223722 +0200
|
||||||
@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti
|
@@ -99,7 +99,7 @@ py3-version = ;
|
||||||
# using python : 2.3 : /usr/local/bin/python ;
|
# using python : 2.3 : /usr/local/bin/python ;
|
||||||
#
|
#
|
||||||
rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
|
rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
{
|
{
|
||||||
project.push-current $(.project) ;
|
project.push-current $(.project) ;
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
|
@@ -112,7 +112,7 @@ rule init ( version ? : cmd-or-prefix ?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
project.pop-current ;
|
project.pop-current ;
|
||||||
}
|
}
|
||||||
@@ -653,7 +653,7 @@ local rule system-library-dependencies (
|
@@ -659,7 +659,7 @@ local rule system-library-dependencies (
|
||||||
|
|
||||||
# Declare a target to represent Python's library.
|
# Declare a target to represent Python's library.
|
||||||
#
|
#
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
{
|
{
|
||||||
# Compute the representation of Python version in the name of Python's
|
# Compute the representation of Python version in the name of Python's
|
||||||
# library file.
|
# library file.
|
||||||
@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
|
@@ -683,13 +683,13 @@ local rule declare-libpython-target ( ve
|
||||||
}
|
}
|
||||||
|
|
||||||
# Declare it.
|
# Declare it.
|
||||||
|
@ -43,15 +43,15 @@
|
||||||
{
|
{
|
||||||
local prefix ;
|
local prefix ;
|
||||||
local exec-prefix ;
|
local exec-prefix ;
|
||||||
@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
|
@@ -705,6 +705,7 @@ local rule configure ( version ? : cmd-o
|
||||||
extension-suffix ?= _d ;
|
extension-suffix ?= _d ;
|
||||||
}
|
}
|
||||||
extension-suffix ?= "" ;
|
extension-suffix ?= "" ;
|
||||||
+ abi-letters ?= "" ;
|
+ abi-letters ?= "" ;
|
||||||
|
|
||||||
# Normalize and dissect any version number.
|
local cmds-to-try ;
|
||||||
local major-minor ;
|
|
||||||
@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
|
@@ -968,7 +969,7 @@ local rule configure ( version ? : cmd-o
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
# For examples in boost-build
|
# For examples in boost-build
|
||||||
addFilter("E: devel-file-in-non-devel-package")
|
addFilter("E: devel-file-in-non-devel-package")
|
||||||
|
|
||||||
|
|
19
boost.spec
19
boost.spec
|
@ -51,11 +51,11 @@
|
||||||
|
|
||||||
Summary: Portable C++ libraries
|
Summary: Portable C++ libraries
|
||||||
Name: boost
|
Name: boost
|
||||||
Version: 1.61.0
|
Version: 1.74.0
|
||||||
Release: 7
|
Release: 1
|
||||||
License: Boost
|
License: Boost
|
||||||
Group: Development/C++
|
Group: Development/C++
|
||||||
Url: http://boost.org/
|
URL: http://boost.org
|
||||||
Source0: http://download.sourceforge.net/boost/boost_%{packver}.tar.bz2
|
Source0: http://download.sourceforge.net/boost/boost_%{packver}.tar.bz2
|
||||||
Source100: %{name}.rpmlintrc
|
Source100: %{name}.rpmlintrc
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1102667
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1102667
|
||||||
|
@ -89,10 +89,11 @@ BuildRequires: doxygen
|
||||||
BuildRequires: xsltproc
|
BuildRequires: xsltproc
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: pkgconfig(expat)
|
BuildRequires: pkgconfig(expat)
|
||||||
BuildRequires: pkgconfig(icu-uc)
|
BuildRequires: pkgconfig(icu-uc) >= 60.1
|
||||||
BuildRequires: pkgconfig(python)
|
BuildRequires: pkgconfig(python)
|
||||||
BuildRequires: pkgconfig(python3)
|
BuildRequires: pkgconfig(python3)
|
||||||
BuildRequires: pkgconfig(zlib)
|
BuildRequires: pkgconfig(zlib)
|
||||||
|
BuildRequires: bzip2
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Boost is a collection of free peer-reviewed portable C++ source
|
Boost is a collection of free peer-reviewed portable C++ source
|
||||||
|
@ -839,15 +840,15 @@ symlinks needed for Boost development.
|
||||||
%setup -qn boost_%{packver}
|
%setup -qn boost_%{packver}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
#patch2 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch7 -p2
|
#patch7 -p2
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
%patch12 -p3
|
#patch12 -p3
|
||||||
%patch15 -p0
|
%patch15 -p0
|
||||||
%patch16 -p1
|
#patch16 -p1
|
||||||
%patch17 -p1
|
#patch17 -p1
|
||||||
|
|
||||||
# Preparing the docs
|
# Preparing the docs
|
||||||
mkdir packagedoc
|
mkdir packagedoc
|
||||||
|
|
Loading…
Add table
Reference in a new issue