Compare commits
1 commit
rawhide
...
pmachata/b
| Author | SHA1 | Date | |
|---|---|---|---|
|
5fe94647a1 |
28 changed files with 990 additions and 2468 deletions
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
144
b2.1
144
b2.1
|
|
@ -1,144 +0,0 @@
|
|||
.TH "b2" 1 "Sat Nov 19 2011" "Doxygen" \" -*- nroff -*-
|
||||
.ad l
|
||||
.nh
|
||||
.SH NAME
|
||||
b2 \- Command-line utility to build Boost-related C++ projects with Boost\&.Build
|
||||
.SH "SYNOPSIS"
|
||||
.PP
|
||||
\fBb2\fP \fC[-a] [-dx] [-fx] [-jx] [-lx] [-n] [-ox] [-px] [-q] [-sx=y] [-tx] [-v] [--x]\fP
|
||||
.PP
|
||||
\fIb2\fP accepts the following options:
|
||||
.PP
|
||||
\fB-a\fP
|
||||
.br
|
||||
Build all targets, even if they are current
|
||||
.PP
|
||||
\fB-dx\fP
|
||||
.br
|
||||
Set the debug level to x (0-9)
|
||||
.PP
|
||||
\fB-fx\fP
|
||||
.br
|
||||
Read x instead of Jambase
|
||||
.PP
|
||||
\fB-jx\fP
|
||||
.br
|
||||
Run up to x shell commands concurrently
|
||||
.PP
|
||||
\fB-lx\fP
|
||||
.br
|
||||
Limit actions to x number of seconds after which they are stopped
|
||||
.PP
|
||||
\fB-n\fP
|
||||
.br
|
||||
Don't actually execute the updating actions
|
||||
.PP
|
||||
\fB-ox\fP
|
||||
.br
|
||||
Write the updating actions to file x
|
||||
.PP
|
||||
\fB-px\fP
|
||||
.br
|
||||
x=0, pipes action stdout and stderr merged into action output
|
||||
.PP
|
||||
\fB-q\fP
|
||||
.br
|
||||
Quit quickly as soon as a target fails
|
||||
.PP
|
||||
\fB-sx=y\fP
|
||||
.br
|
||||
Set variable x=y, overriding environment
|
||||
.PP
|
||||
\fB-tx\fP
|
||||
.br
|
||||
Rebuild x, even if it is up-to-date
|
||||
.PP
|
||||
\fB-v\fP
|
||||
.br
|
||||
Print the version of b2 and exit
|
||||
.PP
|
||||
\fB--x\fP
|
||||
.br
|
||||
Option is ignored
|
||||
.SH "DESCRIPTION"
|
||||
.PP
|
||||
This section provides the information necessary to create your own projects using \fIBoost\&.Build\fP The information provided here is relatively high-level, and Chapter 6, Reference as well as the on-line help system must be used to obtain low-level documentation (see --help)
|
||||
.PP
|
||||
\fIBoost\&.Build\fP actually consists of two parts - \fIBoost\&.Jam\fP, a build engine with its own interpreted language, and \fIBoost\&.Build\fP itself, implemented in \fIBoost\&.Jam's\fP language\&. The chain of events when you type b2 on the command line is as follows:
|
||||
.IP "\(bu" 2
|
||||
\fIBoost\&.Jam\fP tries to find \fIBoost\&.Build\fP and loads the top-level module\&. The exact process is described in the section called “Initialization”
|
||||
.PP
|
||||
.PP
|
||||
.IP "\(bu" 2
|
||||
The top-level module loads user-defined configuration files, \fIuser-config\&.jam\fP and \fIsite-config\&.jam\fP, which define available toolsets
|
||||
.PP
|
||||
.PP
|
||||
.IP "\(bu" 2
|
||||
The \fIJamfile\fP in the current directory is read That in turn might cause reading of further Jamfiles\&. As a result, a tree of projects is created, with targets inside projects
|
||||
.PP
|
||||
.PP
|
||||
.IP "\(bu" 2
|
||||
Finally, using the build request specified on the command line, \fIBoost\&.Build\fP decides which targets should be built and how\&. That information is passed back to \fIBoost\&.Jam\fP, which takes care of actually running the scheduled build action commands
|
||||
.PP
|
||||
.PP
|
||||
So, to be able to successfully use \fIBoost\&.Build\fP, you need to know only four things:
|
||||
.IP "\(bu" 2
|
||||
How to configure \fIBoost\&.Build\fP (http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html)
|
||||
.IP "\(bu" 2
|
||||
How to declare targets in Jamfiles (http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html)
|
||||
.IP "\(bu" 2
|
||||
How the build process works (http://www.boost.org/boost-build2/doc/html/bbv2/overview/build_process.html)
|
||||
.PP
|
||||
.PP
|
||||
Some Basics about the \fIBoost\&.Jam\fP language\&. See the section called “Boost\&.Jam Language” (http://www.boost.org/boost-build2/doc/html/bbv2/overview/jam_language.html)
|
||||
.SH "CONCEPTS"
|
||||
.PP
|
||||
\fIBoost\&.Build\fP has a few unique concepts that are introduced in this section\&. The best way to explain the concepts is by comparison with more classical build tools
|
||||
.PP
|
||||
When using any flavour of make, you directly specify targets and commands that are used to create them from other target\&. The below example creates a\&.o from a\&.c using a hardcoded compiler invocation command
|
||||
.PP
|
||||
a\&.o: a\&.c
|
||||
.br
|
||||
g++ -o a\&.o -g a\&.c
|
||||
.PP
|
||||
This is rather low-level description mechanism and it is hard to adjust commands, options, and sets of created targets depending on the used compiler and operating system\&.
|
||||
.PP
|
||||
To improve portability, most modern build system provide a set of higher-level functions that can be used in build description files\&. Consider this example:
|
||||
.PP
|
||||
add_program ('a', 'a\&.c')
|
||||
.br
|
||||
.PP
|
||||
This is a function call that creates targets necessary to create executable file from source file a\&.c\&. Depending on configured properties, different commands line may be used\&. However, \fIadd_program\fP is higher-level, but rather thin level All targets are created immediately when build description is parsed, which makes it impossible to perform multi-variant builds\&. Often, change in any build property requires complete reconfiguration of the build tree
|
||||
.PP
|
||||
In order to support true multivariant builds, Boost\&.Build introduces the concept of metatarget—object that is created when build description is parsed and can be later called with specific build properties to generate actual targets
|
||||
.PP
|
||||
Consider an example:
|
||||
.PP
|
||||
exe a : a\&.cpp ;
|
||||
.br
|
||||
.PP
|
||||
When this declaration is parsed, \fIBoost\&.Build\fP creates a metatarget, but does not yet decides what files must be created, or what commands must be used\&. After all build files are parsed, Boost\&.Build considers properties requested on the command line\&. Supposed you have invoked \fIBoost\&.Build\fP with:
|
||||
.PP
|
||||
\fIb2\fP toolset=gcc toolset=msvc
|
||||
.br
|
||||
.PP
|
||||
In that case, the metatarget will be called twice, once with toolset=gcc and once with toolset=msvc\&. Both invocations will produce concrete targets, that will have different extensions and use different command lines\&. Another key concept is build property\&. Build property is a variable that affects the build process\&. It can be specified on the command line, and is passed when calling a metatarget
|
||||
.PP
|
||||
While all build tools have a similar mechanism, \fIBoost\&.Build\fP differs by requiring that all build properties are declared in advance, and providing a large set of properties with portable semantics
|
||||
.PP
|
||||
The final concept is property propagation\&. Boost\&.Build does not require that every metatarget is called with the same properties\&. Instead, the 'top-level' metatargets are called with the properties specified on the command line Each metatarget can elect to augment or override some properties (in particular, using the requirements mechanism, see the section called “Requirements”: http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html#bbv2.overview.targets.requirements) Then, the dependency metatargets are called with modified properties and produce concrete targets that are then used in build process Of course, dependency metatargets maybe in turn modify build properties and have dependencies of their own\&.
|
||||
.PP
|
||||
For more in-depth treatment of the requirements and concepts, you may refer to SYRCoSE 2009 Boost\&.Build article (http://syrcose.ispras.ru/2009/files/04_paper.pdf)\&.
|
||||
.SH "SEE ALSO"
|
||||
.PP
|
||||
\fBboost-libraries\fP(3)
|
||||
.SH "SUPPORT"
|
||||
.PP
|
||||
Please report any bugs to https://svn.boost.org/trac/boost/
|
||||
.SH "COPYRIGHT"
|
||||
.PP
|
||||
Boost Software License - Version 1\&.0 - August 17th, 2003
|
||||
.PP
|
||||
See the LICENSE_1_0\&.txt file for more information on that license, or directly on Internet:
|
||||
.br
|
||||
http://www.boost.org/LICENSE_1_0.txt
|
||||
150
boost-1.48.0-add-bjam-man-page.patch
Normal file
150
boost-1.48.0-add-bjam-man-page.patch
Normal file
|
|
@ -0,0 +1,150 @@
|
|||
diff --git a/tools/build/v2/doc/bjam.1 b/tools/build/v2/doc/bjam.1
|
||||
new file mode 100644
|
||||
index 0000000..8a44af6
|
||||
--- /dev/null
|
||||
+++ b/tools/build/v2/doc/bjam.1
|
||||
@@ -0,0 +1,144 @@
|
||||
+.TH "bjam" 1 "Sat Nov 19 2011" "Doxygen" \" -*- nroff -*-
|
||||
+.ad l
|
||||
+.nh
|
||||
+.SH NAME
|
||||
+bjam \- Command-line utility to build Boost-related C++ projects with Boost\&.Build
|
||||
+.SH "SYNOPSIS"
|
||||
+.PP
|
||||
+\fBbjam\fP \fC[-a] [-dx] [-fx] [-jx] [-lx] [-n] [-ox] [-px] [-q] [-sx=y] [-tx] [-v] [--x]\fP
|
||||
+.PP
|
||||
+\fIbjam\fP accepts the following options:
|
||||
+.PP
|
||||
+\fB-a\fP
|
||||
+.br
|
||||
+ Build all targets, even if they are current
|
||||
+.PP
|
||||
+\fB-dx\fP
|
||||
+.br
|
||||
+ Set the debug level to x (0-9)
|
||||
+.PP
|
||||
+\fB-fx\fP
|
||||
+.br
|
||||
+ Read x instead of Jambase
|
||||
+.PP
|
||||
+\fB-jx\fP
|
||||
+.br
|
||||
+ Run up to x shell commands concurrently
|
||||
+.PP
|
||||
+\fB-lx\fP
|
||||
+.br
|
||||
+ Limit actions to x number of seconds after which they are stopped
|
||||
+.PP
|
||||
+\fB-n\fP
|
||||
+.br
|
||||
+ Don't actually execute the updating actions
|
||||
+.PP
|
||||
+\fB-ox\fP
|
||||
+.br
|
||||
+ Write the updating actions to file x
|
||||
+.PP
|
||||
+\fB-px\fP
|
||||
+.br
|
||||
+ x=0, pipes action stdout and stderr merged into action output
|
||||
+.PP
|
||||
+\fB-q\fP
|
||||
+.br
|
||||
+ Quit quickly as soon as a target fails
|
||||
+.PP
|
||||
+\fB-sx=y\fP
|
||||
+.br
|
||||
+ Set variable x=y, overriding environment
|
||||
+.PP
|
||||
+\fB-tx\fP
|
||||
+.br
|
||||
+ Rebuild x, even if it is up-to-date
|
||||
+.PP
|
||||
+\fB-v\fP
|
||||
+.br
|
||||
+ Print the version of jam and exit
|
||||
+.PP
|
||||
+\fB--x\fP
|
||||
+.br
|
||||
+ Option is ignored
|
||||
+.SH "DESCRIPTION"
|
||||
+.PP
|
||||
+This section provides the information necessary to create your own projects using \fIBoost\&.Build\fP The information provided here is relatively high-level, and Chapter 6, Reference as well as the on-line help system must be used to obtain low-level documentation (see --help)
|
||||
+.PP
|
||||
+\fIBoost\&.Build\fP actually consists of two parts - \fIBoost\&.Jam\fP, a build engine with its own interpreted language, and \fIBoost\&.Build\fP itself, implemented in \fIBoost\&.Jam's\fP language\&. The chain of events when you type bjam on the command line is as follows:
|
||||
+.IP "\(bu" 2
|
||||
+\fIBoost\&.Jam\fP tries to find \fIBoost\&.Build\fP and loads the top-level module\&. The exact process is described in the section called “Initialization”
|
||||
+.PP
|
||||
+.PP
|
||||
+.IP "\(bu" 2
|
||||
+The top-level module loads user-defined configuration files, \fIuser-config\&.jam\fP and \fIsite-config\&.jam\fP, which define available toolsets
|
||||
+.PP
|
||||
+.PP
|
||||
+.IP "\(bu" 2
|
||||
+The \fIJamfile\fP in the current directory is read That in turn might cause reading of further Jamfiles\&. As a result, a tree of projects is created, with targets inside projects
|
||||
+.PP
|
||||
+.PP
|
||||
+.IP "\(bu" 2
|
||||
+Finally, using the build request specified on the command line, \fIBoost\&.Build\fP decides which targets should be built and how\&. That information is passed back to \fIBoost\&.Jam\fP, which takes care of actually running the scheduled build action commands
|
||||
+.PP
|
||||
+.PP
|
||||
+So, to be able to successfully use \fIBoost\&.Build\fP, you need to know only four things:
|
||||
+.IP "\(bu" 2
|
||||
+How to configure \fIBoost\&.Build\fP (http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html)
|
||||
+.IP "\(bu" 2
|
||||
+How to declare targets in Jamfiles (http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html)
|
||||
+.IP "\(bu" 2
|
||||
+How the build process works (http://www.boost.org/boost-build2/doc/html/bbv2/overview/build_process.html)
|
||||
+.PP
|
||||
+.PP
|
||||
+Some Basics about the \fIBoost\&.Jam\fP language\&. See the section called “Boost\&.Jam Language” (http://www.boost.org/boost-build2/doc/html/bbv2/overview/jam_language.html)
|
||||
+.SH "CONCEPTS"
|
||||
+.PP
|
||||
+\fIBoost\&.Build\fP has a few unique concepts that are introduced in this section\&. The best way to explain the concepts is by comparison with more classical build tools
|
||||
+.PP
|
||||
+When using any flavour of make, you directly specify targets and commands that are used to create them from other target\&. The below example creates a\&.o from a\&.c using a hardcoded compiler invocation command
|
||||
+.PP
|
||||
+a\&.o: a\&.c
|
||||
+.br
|
||||
+ g++ -o a\&.o -g a\&.c
|
||||
+.PP
|
||||
+This is rather low-level description mechanism and it is hard to adjust commands, options, and sets of created targets depending on the used compiler and operating system\&.
|
||||
+.PP
|
||||
+To improve portability, most modern build system provide a set of higher-level functions that can be used in build description files\&. Consider this example:
|
||||
+.PP
|
||||
+add_program ('a', 'a\&.c')
|
||||
+.br
|
||||
+.PP
|
||||
+This is a function call that creates targets necessary to create executable file from source file a\&.c\&. Depending on configured properties, different commands line may be used\&. However, \fIadd_program\fP is higher-level, but rather thin level All targets are created immediately when build description is parsed, which makes it impossible to perform multi-variant builds\&. Often, change in any build property requires complete reconfiguration of the build tree
|
||||
+.PP
|
||||
+In order to support true multivariant builds, Boost\&.Build introduces the concept of metatarget—object that is created when build description is parsed and can be later called with specific build properties to generate actual targets
|
||||
+.PP
|
||||
+Consider an example:
|
||||
+.PP
|
||||
+exe a : a\&.cpp ;
|
||||
+.br
|
||||
+.PP
|
||||
+When this declaration is parsed, \fIBoost\&.Build\fP creates a metatarget, but does not yet decides what files must be created, or what commands must be used\&. After all build files are parsed, Boost\&.Build considers properties requested on the command line\&. Supposed you have invoked \fIBoost\&.Build\fP with:
|
||||
+.PP
|
||||
+\fIbjam\fP toolset=gcc toolset=msvc
|
||||
+.br
|
||||
+.PP
|
||||
+In that case, the metatarget will be called twice, once with toolset=gcc and once with toolset=msvc\&. Both invocations will produce concrete targets, that will have different extensions and use different command lines\&. Another key concept is build property\&. Build property is a variable that affects the build process\&. It can be specified on the command line, and is passed when calling a metatarget
|
||||
+.PP
|
||||
+While all build tools have a similar mechanism, \fIBoost\&.Build\fP differs by requiring that all build properties are declared in advance, and providing a large set of properties with portable semantics
|
||||
+.PP
|
||||
+The final concept is property propagation\&. Boost\&.Build does not require that every metatarget is called with the same properties\&. Instead, the 'top-level' metatargets are called with the properties specified on the command line Each metatarget can elect to augment or override some properties (in particular, using the requirements mechanism, see the section called “Requirements”: http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html#bbv2.overview.targets.requirements) Then, the dependency metatargets are called with modified properties and produce concrete targets that are then used in build process Of course, dependency metatargets maybe in turn modify build properties and have dependencies of their own\&.
|
||||
+.PP
|
||||
+For more in-depth treatment of the requirements and concepts, you may refer to SYRCoSE 2009 Boost\&.Build article (http://syrcose.ispras.ru/2009/files/04_paper.pdf)\&.
|
||||
+.SH "SEE ALSO"
|
||||
+.PP
|
||||
+\fBboost-libraries\fP(3)
|
||||
+.SH "SUPPORT"
|
||||
+.PP
|
||||
+Please report any bugs to https://svn.boost.org/trac/boost/
|
||||
+.SH "COPYRIGHT"
|
||||
+.PP
|
||||
+Boost Software License - Version 1\&.0 - August 17th, 2003
|
||||
+.PP
|
||||
+See the LICENSE_1_0\&.txt file for more information on that license, or directly on Internet:
|
||||
+.br
|
||||
+ http://www.boost.org/LICENSE_1_0.txt
|
||||
22
boost-1.50.0-fix-non-utf8-files.patch
Normal file
22
boost-1.50.0-fix-non-utf8-files.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp
|
||||
index 8b2bc43..d04f2fe 100644
|
||||
--- a/libs/units/example/autoprefixes.cpp
|
||||
+++ b/libs/units/example/autoprefixes.cpp
|
||||
@@ -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>
|
||||
{
|
||||
static const char* name() { return("EUR"); }
|
||||
- static const char* symbol() { return("€"); }
|
||||
+ static const char* symbol() { return("€"); }
|
||||
};
|
||||
|
||||
int main()
|
||||
@@ -140,7 +140,7 @@ int main()
|
||||
|
||||
quantity<euro_base_unit::unit_type> ce = 2048. * euro_base_unit::unit_type();
|
||||
cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR
|
||||
- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€
|
||||
+ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€
|
||||
|
||||
|
||||
return 0;
|
||||
60
boost-1.50.0-foreach.patch
Normal file
60
boost-1.50.0-foreach.patch
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
Index: /trunk/boost/foreach_fwd.hpp
|
||||
===================================================================
|
||||
--- /trunk/boost/foreach_fwd.hpp (revision 62661)
|
||||
+++ /trunk/boost/foreach_fwd.hpp (revision 75540)
|
||||
@@ -15,4 +15,6 @@
|
||||
#define BOOST_FOREACH_FWD_HPP
|
||||
|
||||
+#include <utility> // for std::pair
|
||||
+
|
||||
// This must be at global scope, hence the uglified name
|
||||
enum boost_foreach_argument_dependent_lookup_hack
|
||||
@@ -26,4 +28,7 @@
|
||||
namespace foreach
|
||||
{
|
||||
+ template<typename T>
|
||||
+ std::pair<T, T> in_range(T begin, T end);
|
||||
+
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// boost::foreach::tag
|
||||
@@ -47,4 +52,22 @@
|
||||
} // namespace foreach
|
||||
|
||||
+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
|
||||
+namespace BOOST_FOREACH
|
||||
+{
|
||||
+ using foreach::in_range;
|
||||
+ using foreach::tag;
|
||||
+
|
||||
+ template<typename T>
|
||||
+ struct is_lightweight_proxy
|
||||
+ : foreach::is_lightweight_proxy<T>
|
||||
+ {};
|
||||
+
|
||||
+ template<typename T>
|
||||
+ struct is_noncopyable
|
||||
+ : foreach::is_noncopyable<T>
|
||||
+ {};
|
||||
+
|
||||
+} // namespace BOOST_FOREACH
|
||||
+
|
||||
} // namespace boost
|
||||
|
||||
Index: /trunk/boost/foreach.hpp
|
||||
===================================================================
|
||||
--- /trunk/boost/foreach.hpp (revision 75077)
|
||||
+++ /trunk/boost/foreach.hpp (revision 75540)
|
||||
@@ -166,5 +166,5 @@
|
||||
// at the global namespace for your type.
|
||||
template<typename T>
|
||||
-inline boost::foreach::is_lightweight_proxy<T> *
|
||||
+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
|
||||
boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
|
||||
|
||||
@@ -191,5 +191,5 @@
|
||||
// at the global namespace for your type.
|
||||
template<typename T>
|
||||
-inline boost::foreach::is_noncopyable<T> *
|
||||
+inline boost::BOOST_FOREACH::is_noncopyable<T> *
|
||||
boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
|
||||
|
||||
12
boost-1.50.0-long-double-1.patch
Normal file
12
boost-1.50.0-long-double-1.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/libs/math/config/has_long_double_support.cpp b/libs/math/config/has_long_double_support.cpp
|
||||
index d314cf3..9022408 100644
|
||||
--- a/libs/math/config/has_long_double_support.cpp
|
||||
+++ b/libs/math/config/has_long_double_support.cpp
|
||||
@@ -8,3 +8,7 @@
|
||||
#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."
|
||||
#endif
|
||||
+
|
||||
+int main(int argc, char *argv[]) {
|
||||
+ return 0;
|
||||
+}
|
||||
122
boost-1.50.0-pool.patch
Normal file
122
boost-1.50.0-pool.patch
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
Index: boost/pool/pool.hpp
|
||||
===================================================================
|
||||
--- boost/pool/pool.hpp (revision 78317)
|
||||
+++ boost/pool/pool.hpp (revision 78326)
|
||||
@@ -27,4 +27,6 @@
|
||||
#include <boost/pool/poolfwd.hpp>
|
||||
|
||||
+// std::numeric_limits
|
||||
+#include <boost/limits.hpp>
|
||||
// boost::math::static_lcm
|
||||
#include <boost/math/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 = math::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;
|
||||
+}
|
||||
57
boost-1.53.0-attribute.patch
Normal file
57
boost-1.53.0-attribute.patch
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
diff -urp boost_1_48_0~/boost/config/compiler/gcc.hpp boost_1_48_0/boost/config/compiler/gcc.hpp
|
||||
--- boost_1_48_0~/boost/config/compiler/gcc.hpp 2012-01-16 16:15:14.643239525 +0100
|
||||
+++ boost_1_48_0/boost/config/compiler/gcc.hpp 2012-01-16 16:21:24.072247987 +0100
|
||||
@@ -120,13 +120,13 @@
|
||||
// _WIN32 or one of its variant spellings. Note that Cygwin is a POSIX environment,
|
||||
// so does not define _WIN32 or its variants.
|
||||
# define BOOST_HAS_DECLSPEC
|
||||
-# define BOOST_SYMBOL_EXPORT __attribute__((dllexport))
|
||||
-# define BOOST_SYMBOL_IMPORT __attribute__((dllimport))
|
||||
+# define BOOST_SYMBOL_EXPORT __attribute__((__dllexport__))
|
||||
+# define BOOST_SYMBOL_IMPORT __attribute__((__dllimport__))
|
||||
# else
|
||||
-# define BOOST_SYMBOL_EXPORT __attribute__((visibility("default")))
|
||||
+# define BOOST_SYMBOL_EXPORT __attribute__((__visibility__("default")))
|
||||
# define BOOST_SYMBOL_IMPORT
|
||||
# endif
|
||||
-# define BOOST_SYMBOL_VISIBLE __attribute__((visibility("default")))
|
||||
+# define BOOST_SYMBOL_VISIBLE __attribute__((__visibility__("default")))
|
||||
#else
|
||||
// config/platform/win32.hpp will define BOOST_SYMBOL_EXPORT, etc., unless already defined
|
||||
# define BOOST_SYMBOL_EXPORT
|
||||
diff -urp boost_1_48_0~/boost/gil/gil_config.hpp boost_1_48_0/boost/gil/gil_config.hpp
|
||||
--- boost_1_48_0~/boost/gil/gil_config.hpp 2012-01-16 16:15:29.883239865 +0100
|
||||
+++ boost_1_48_0/boost/gil/gil_config.hpp 2012-01-16 16:17:49.096243036 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
#if defined(_MSC_VER)
|
||||
# define GIL_FORCEINLINE __forceinline
|
||||
#elif defined(__GNUC__) && __GNUC__ > 3
|
||||
-# define GIL_FORCEINLINE inline __attribute__ ((always_inline))
|
||||
+# define GIL_FORCEINLINE inline __attribute__ ((__always_inline__))
|
||||
#else
|
||||
# define GIL_FORCEINLINE inline
|
||||
#endif
|
||||
diff -urp boost_1_48_0~/boost/optional/optional.hpp boost_1_48_0/boost/optional/optional.hpp
|
||||
--- boost_1_48_0~/boost/optional/optional.hpp 2012-01-16 16:15:29.743239804 +0100
|
||||
+++ boost_1_48_0/boost/optional/optional.hpp 2012-01-16 16:17:47.488242994 +0100
|
||||
@@ -127,7 +127,7 @@ class aligned_storage
|
||||
union
|
||||
// This works around GCC warnings about breaking strict aliasing rules when casting storage address to T*
|
||||
#if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS)
|
||||
- __attribute__((may_alias))
|
||||
+ __attribute__((__may_alias__))
|
||||
#endif
|
||||
dummy_u
|
||||
{
|
||||
diff -urp boost_1_48_0~/boost/random/detail/integer_log2.hpp boost_1_48_0/boost/random/detail/integer_log2.hpp
|
||||
--- boost_1_48_0~/boost/random/detail/integer_log2.hpp 2012-01-16 16:15:24.962239810 +0100
|
||||
+++ boost_1_48_0/boost/random/detail/integer_log2.hpp 2012-01-16 16:17:44.104242884 +0100
|
||||
@@ -27,7 +27,7 @@ namespace detail {
|
||||
#elif defined(BOOST_MSVC)
|
||||
#define BOOST_RANDOM_DETAIL_CONSTEXPR __forceinline
|
||||
#elif defined(__GNUC__) && __GNUC__ >= 4
|
||||
-#define BOOST_RANDOM_DETAIL_CONSTEXPR __attribute__((const)) __attribute__((always_inline))
|
||||
+#define BOOST_RANDOM_DETAIL_CONSTEXPR __attribute__((__const__)) __attribute__((__always_inline__))
|
||||
#else
|
||||
#define BOOST_RANDOM_DETAIL_CONSTEXPR inline
|
||||
#endif
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
--- boost_1_73_0/tools/boost_install/boost-install.jam~ 2020-04-24 20:21:50.330267122 +0100
|
||||
+++ boost_1_73_0/tools/boost_install/boost-install.jam 2020-04-24 20:22:16.818360540 +0100
|
||||
@@ -652,25 +652,6 @@
|
||||
"get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
|
||||
: true ;
|
||||
|
||||
- if [ path.is-rooted $(cmakedir) ]
|
||||
- {
|
||||
- local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
|
||||
-
|
||||
- print.text
|
||||
-
|
||||
- ""
|
||||
- "# If the computed and the original directories are symlink-equivalent, use original"
|
||||
- "if(EXISTS \"$(cmakedir-native)\")"
|
||||
- " get_filename_component(_BOOST_CMAKEDIR_ORIGINAL \"$(cmakedir-native)\" REALPATH)"
|
||||
- " if(_BOOST_CMAKEDIR STREQUAL _BOOST_CMAKEDIR_ORIGINAL)"
|
||||
- " set(_BOOST_CMAKEDIR \"$(cmakedir-native)\")"
|
||||
- " endif()"
|
||||
- " unset(_BOOST_CMAKEDIR_ORIGINAL)"
|
||||
- "endif()"
|
||||
- ""
|
||||
- : true ;
|
||||
- }
|
||||
-
|
||||
get-dir "_BOOST_INCLUDEDIR" : $(includedir) ;
|
||||
|
||||
if $(library-type) = INTERFACE
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From 0039878782516ea3313608f99f0d50e846151bc2 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Wakely <jwakely@fedoraproject.org>
|
||||
Date: Mon, 31 Jan 2022 11:37:29 +0000
|
||||
Subject: [PATCH] Fix narrowing conversions for ppc
|
||||
|
||||
These constants are too large for `long long` so are unsigned,
|
||||
and then cannot be narrowed to the signed type.
|
||||
|
||||
Fixes #29
|
||||
---
|
||||
.../numeric/interval/detail/ppc_rounding_control.hpp | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/boost/numeric/interval/detail/ppc_rounding_control.hpp b/include/boost/numeric/interval/detail/ppc_rounding_control.hpp
|
||||
index 87fe8ee..99f9986 100644
|
||||
--- boost_1_76_0/boost/numeric/interval/detail/ppc_rounding_control.hpp
|
||||
+++ boost_1_76_0/boost/numeric/interval/detail/ppc_rounding_control.hpp
|
||||
@@ -28,10 +28,10 @@ typedef union {
|
||||
double dmode;
|
||||
} rounding_mode_struct;
|
||||
|
||||
-static const rounding_mode_struct mode_upward = { 0xFFF8000000000002LL };
|
||||
-static const rounding_mode_struct mode_downward = { 0xFFF8000000000003LL };
|
||||
-static const rounding_mode_struct mode_to_nearest = { 0xFFF8000000000000LL };
|
||||
-static const rounding_mode_struct mode_toward_zero = { 0xFFF8000000000001LL };
|
||||
+static const rounding_mode_struct mode_upward = { (::boost::long_long_type)0xFFF8000000000002LL };
|
||||
+static const rounding_mode_struct mode_downward = { (::boost::long_long_type)0xFFF8000000000003LL };
|
||||
+static const rounding_mode_struct mode_to_nearest = { (::boost::long_long_type)0xFFF8000000000000LL };
|
||||
+static const rounding_mode_struct mode_toward_zero = { (::boost::long_long_type)0xFFF8000000000001LL };
|
||||
|
||||
struct ppc_rounding_control
|
||||
{
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 1ded9b9c219542442b3c10af815e5413a2a89c75 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas W Rodgers <trodgers@redhat.com>
|
||||
Date: Tue, 1 Mar 2022 10:03:34 -0800
|
||||
Subject: [PATCH] Adjust b2 build flags for Fedora Packaging
|
||||
|
||||
---
|
||||
src/engine/build.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh
|
||||
index f1ad08cb..ab58deba 100755
|
||||
--- a/tools/build/src/engine/build.sh
|
||||
+++ b/tools/build/src/engine/build.sh
|
||||
@@ -323,7 +323,7 @@ case "${B2_TOOLSET}" in
|
||||
|
||||
gcc|gcc-*)
|
||||
CXX_VERSION_OPT=${CXX_VERSION_OPT:---version}
|
||||
- B2_CXXFLAGS_RELEASE="-O2 -s"
|
||||
+ B2_CXXFLAGS_RELEASE="${RPM_OPT_FLAGS} ${RPM_LD_FLAGS}"
|
||||
B2_CXXFLAGS_DEBUG="-O0 -g"
|
||||
;;
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
From ebc90bc3e372dc8e5db21f79d2a79e4f5c4d01ee Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Palka <ppalka@redhat.com>
|
||||
Date: Mon, 4 Dec 2023 09:24:20 -0500
|
||||
Subject: [PATCH] Adjust options for Fedora package build
|
||||
|
||||
---
|
||||
tools/build/src/tools/gcc.jam | 30 +++++++++++++++---------------
|
||||
1 file changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
|
||||
index 834f5e1bf..c753afc23 100644
|
||||
--- a/tools/build/src/tools/gcc.jam
|
||||
+++ b/tools/build/src/tools/gcc.jam
|
||||
@@ -513,7 +513,7 @@ rule compile.fortran ( targets * : sources * : properties * )
|
||||
|
||||
actions compile.c++ bind PCH_FILE
|
||||
{
|
||||
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)"
|
||||
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)"
|
||||
}
|
||||
|
||||
actions compile.c bind PCH_FILE
|
||||
@@ -523,7 +523,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) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)"
|
||||
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)"
|
||||
}
|
||||
|
||||
actions compile.c.preprocess bind PCH_FILE
|
||||
@@ -627,22 +627,22 @@ 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 <optimization>minimal : -O1 ;
|
||||
+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 <optimization>minimal : ;
|
||||
toolset.flags gcc.compile OPTIONS <optimization>debug : -Og ;
|
||||
|
||||
-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 <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 ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>extra : -Wall -Wextra ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>pedantic : -Wall -Wextra -pedantic ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>all : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>extra : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>pedantic : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : ;
|
||||
|
||||
toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
|
||||
toolset.flags gcc.compile OPTIONS <profiling>on : -pg ;
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From d9554db26c3dbb00a6a293ee4fd4966e4e278da8 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Dimov <pdimov@gmail.com>
|
||||
Date: Mon, 15 Dec 2025 21:51:45 +0200
|
||||
Subject: [PATCH] Install boost_system as header-only
|
||||
|
||||
---
|
||||
boost-install.jam | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/boost-install.jam b/boost-install.jam
|
||||
index b87e308..5e6bfa6 100644
|
||||
--- a/tools/boost_install/boost-install.jam
|
||||
+++ b/tools/boost_install/boost-install.jam
|
||||
@@ -1015,7 +1015,7 @@ local rule install-cmake-config- ( install-or-stage : version : name : requireme
|
||||
|
||||
local library-type = UNKNOWN ;
|
||||
|
||||
- if $(name) = boost_headers || $(name) = boost_math || $(name) = boost_exception
|
||||
+ if $(name) = boost_headers || $(name) = boost_math || $(name) = boost_exception || $(name) = boost_system
|
||||
{
|
||||
library-type = INTERFACE ;
|
||||
}
|
||||
From 9529e070ea9e9afd1da17edd48993d560fdc0d7a Mon Sep 17 00:00:00 2001
|
||||
From: Peter Dimov <pdimov@gmail.com>
|
||||
Date: Mon, 15 Dec 2025 21:52:49 +0200
|
||||
Subject: [PATCH] Still install boost_system, for the CMake configuration. Refs
|
||||
#132.
|
||||
|
||||
---
|
||||
build.jam | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/build.jam b/build.jam
|
||||
index 65da5aa6..5b6545c8 100644
|
||||
--- a/libs/system//build.jam
|
||||
+++ b/libs/system//build.jam
|
||||
@@ -21,4 +21,5 @@ explicit
|
||||
;
|
||||
|
||||
call-if : boost-library system
|
||||
+ : install boost_system
|
||||
;
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 6a8ff06728b64a1121a6179d891ab0baf3b9290b Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Palka <ppalka@redhat.com>
|
||||
Date: Mon, 4 Dec 2023 09:27:13 -0500
|
||||
Subject: [PATCH] Adjust options to remove RPATH for Fedora package builds
|
||||
|
||||
---
|
||||
tools/build/src/tools/gcc.jam | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
|
||||
index c753afc23..e0b627726 100644
|
||||
--- a/tools/build/src/tools/gcc.jam
|
||||
+++ b/tools/build/src/tools/gcc.jam
|
||||
@@ -1035,12 +1035,12 @@ rule link.dll ( targets * : sources * : properties * )
|
||||
|
||||
actions link bind LIBRARIES
|
||||
{
|
||||
- "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -Wl,$(RPATH_OPTION)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<:T)" $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS))
|
||||
+ "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -o "$(<:T)" $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS))
|
||||
}
|
||||
|
||||
actions link.dll bind LIBRARIES
|
||||
{
|
||||
- "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -Wl,$(RPATH_OPTION)$(SPACE)-Wl,$(RPATH) -Wl,$(IMPLIB_OPTION:E=--out-implib),"$(<[2]:T)" -o "$(<[1]:T)" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,"$(SONAME_PREFIX:E=)$(<[1]:D=)" $(SHARED_OPTION:E=-shared) $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS))
|
||||
+ "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -Wl,$(IMPLIB_OPTION:E=--out-implib),"$(<[2]:T)" -o "$(<[1]:T)" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,"$(SONAME_PREFIX:E=)$(<[1]:D=)" $(SHARED_OPTION:E=-shared) $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS))
|
||||
}
|
||||
|
||||
###
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
From 9ac89e9936b826c13e90611cb9a81a7aa0508d20 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Cho <michael@michaelcho.dev>
|
||||
Date: Sun, 30 Mar 2025 21:45:49 -0400
|
||||
Subject: [PATCH] Add include for add_const
|
||||
|
||||
Signed-off-by: Michael Cho <michael@michaelcho.dev>
|
||||
---
|
||||
include/boost/range/detail/any_iterator_interface.hpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/boost/range/detail/any_iterator_interface.hpp b/include/boost/range/detail/any_iterator_interface.hpp
|
||||
index 1103be6c..79e71dbd 100644
|
||||
--- boost_1_90_0/boost/range/detail/any_iterator_interface.hpp
|
||||
+++ boost_1_90_0/boost/range/detail/any_iterator_interface.hpp
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <boost/mpl/if.hpp>
|
||||
#include <boost/range/detail/any_iterator_buffer.hpp>
|
||||
#include <boost/iterator/iterator_categories.hpp>
|
||||
+#include <boost/type_traits/add_const.hpp>
|
||||
#include <boost/type_traits/is_convertible.hpp>
|
||||
#include <boost/type_traits/is_reference.hpp>
|
||||
#include <boost/type_traits/remove_const.hpp>
|
||||
19
boost-cmake-soname.patch
Normal file
19
boost-cmake-soname.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
*** tools/build/CMake/BoostCore.cmake.orig 2010-01-12 20:01:46.006547352 -0800
|
||||
--- tools/build/CMake/BoostCore.cmake 2010-01-12 20:02:54.222546929 -0800
|
||||
*************** macro(boost_library_variant LIBNAME)
|
||||
*** 755,761 ****
|
||||
if (BUILD_SOVERSIONED)
|
||||
set_target_properties(${VARIANT_LIBNAME}
|
||||
PROPERTIES
|
||||
! SOVERSION "${BOOST_VERSION}"
|
||||
)
|
||||
endif()
|
||||
endif ()
|
||||
--- 755,761 ----
|
||||
if (BUILD_SOVERSIONED)
|
||||
set_target_properties(${VARIANT_LIBNAME}
|
||||
PROPERTIES
|
||||
! SOVERSION "_FEDORA_SONAME"
|
||||
)
|
||||
endif()
|
||||
endif ()
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
# The meta-package doesn't contain any files, this is intended.
|
||||
addFilter("boost.x86_64: E: no-binary")
|
||||
|
||||
# All docs are in a separate boost-doc package
|
||||
addFilter("boost.*: W: no-documentation")
|
||||
addFilter("boost.*: W: description-shorter-than-summary")
|
||||
|
||||
# Upstream don't provide one
|
||||
addFilter("boost-doctools.x86_64: W: no-manual-page-for-binary quickbook")
|
||||
|
||||
# Ignore these
|
||||
addFilter("boost.*: W: spelling-error %description -l en_US foundational ")
|
||||
addFilter("boost.*: W: spelling-error %description -l en_US invariants ")
|
||||
addFilter("boost.*: W: spelling-error %description -l en_US postconditions ")
|
||||
addFilter("boost.*: W: spelling-error %description -l en_US userland ")
|
||||
addFilter("boost.*: W: spelling-error Summary(en_US) numpy ")
|
||||
|
||||
# The example code is useless without the headers
|
||||
addFilter("boost-examples.x86_64: E: devel-dependency boost-devel")
|
||||
|
||||
# These libs are statically linked
|
||||
addFilter("boost-date-time.x86_64: E: shared-lib-without-dependency-information /usr/lib64/libboost_date_time.so.*")
|
||||
addFilter("boost-system.x86_64: E: shared-lib-without-dependency-information /usr/lib64/libboost_system.so.*")
|
||||
addFilter("boost-stacktrace.x86_64: E: shared-lib-without-dependency-information /usr/lib64/libboost_stacktrace_noop.so.*")
|
||||
2368
boost.spec
2368
boost.spec
File diff suppressed because it is too large
Load diff
19
gating.yaml
19
gating.yaml
|
|
@ -1,19 +0,0 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_stable
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
|
||||
12
libboost_thread-mt.so
Normal file
12
libboost_thread-mt.so
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
/* 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. libbost_system-mt.so is among
|
||||
libbost_thread-mt.so's DT_NEEDED, but program linker requires that
|
||||
missing symbols are satisfied by direct dependency, not a
|
||||
transitive one. Hence this linker script, which brings in the
|
||||
Boost.System DSO. */
|
||||
|
||||
INPUT(libboost_thread-mt.so.1.50.0)
|
||||
INPUT(libboost_system-mt.so.1.50.0)
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
summary: CI Gating Plan
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (boost_1_90_0.tar.bz2) = 1c81b60f63367d7249f277f0a569c181926dcf5a725e30433dd336205f1782880489dd00df6a1a74fd107765d3ca2cd49f806788cabb7d5700a8a55927a9a199
|
||||
52dd00be775e689f55a987baebccc462 boost_1_50_0.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Makefile of /tools/boost/Sanity/boost-testsuite-sanity
|
||||
# Description: boost testing by upstream testsuite
|
||||
# Author: Michal Kolar <mkolar@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2021 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
export TEST=/tools/boost/Sanity/boost-testsuite-sanity
|
||||
export TESTVERSION=1.0
|
||||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE tests
|
||||
|
||||
.PHONY: all install download clean
|
||||
|
||||
run: $(FILES) build
|
||||
./runtest.sh
|
||||
|
||||
build: $(BUILT_FILES)
|
||||
test -x runtest.sh || chmod a+x runtest.sh
|
||||
|
||||
clean:
|
||||
rm -f *~ $(BUILT_FILES)
|
||||
|
||||
|
||||
include /usr/share/rhts/lib/rhts-make.include
|
||||
|
||||
$(METADATA): Makefile
|
||||
@echo "Owner: Michal Kolar <mkolar@redhat.com>" > $(METADATA)
|
||||
@echo "Name: $(TEST)" >> $(METADATA)
|
||||
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||
@echo "Description: boost testing by upstream testsuite" >> $(METADATA)
|
||||
@echo "Type: Sanity" >> $(METADATA)
|
||||
@echo "TestTime: 1h" >> $(METADATA)
|
||||
@echo "RunFor: boost" >> $(METADATA)
|
||||
@echo "Requires: boost dnf-utils rpm-build boost-b2" >> $(METADATA)
|
||||
@echo "Priority: Normal" >> $(METADATA)
|
||||
@echo "License: GPLv2+" >> $(METADATA)
|
||||
@echo "Confidential: no" >> $(METADATA)
|
||||
@echo "Destructive: no" >> $(METADATA)
|
||||
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7 -RHEL8" >> $(METADATA)
|
||||
|
||||
rhts-lint $(METADATA)
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
PURPOSE of /tools/boost/Sanity/boost-testsuite-sanity
|
||||
Description: boost testing by upstream testsuite
|
||||
Author: Michal Kolar <mkolar@redhat.com>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
summary: boost testing by upstream testsuite
|
||||
description: ''
|
||||
contact:
|
||||
- Michal Kolar <mkolar@redhat.com>
|
||||
component:
|
||||
- boost
|
||||
test: ./runtest.sh
|
||||
framework: beakerlib
|
||||
recommend:
|
||||
- boost
|
||||
- dnf-utils
|
||||
- rpm-build
|
||||
- boost-b2
|
||||
duration: 1h
|
||||
extra-summary: /tools/boost/Sanity/boost-testsuite-sanity
|
||||
extra-task: /tools/boost/Sanity/boost-testsuite-sanity
|
||||
|
|
@ -1,99 +0,0 @@
|
|||
#!/bin/bash
|
||||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# runtest.sh of /tools/boost/Sanity/boost-testsuite-sanity
|
||||
# Description: boost testing by upstream testsuite
|
||||
# Author: Michal Kolar <mkolar@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2021 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Include Beaker environment
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
BUILD_USER=${BUILD_USER:-bstbld}
|
||||
TESTS_COUNT_MIN=${TESTS_COUNT_MIN:-100}
|
||||
PACKAGE="boost"
|
||||
REQUIRES="$PACKAGE rpm-build boost-b2"
|
||||
if rlIsFedora; then
|
||||
REQUIRES="$REQUIRES dnf-utils"
|
||||
else
|
||||
REQUIRES="$REQUIRES yum-utils"
|
||||
fi
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
rlShowRunningKernel
|
||||
rlAssertRpm --all
|
||||
rlRun "TmpDir=`mktemp -d /home/boost.XXXXXXXXXX`" # work in /home due to high demands on disk space
|
||||
rlRun "cp tests $TmpDir"
|
||||
rlRun "pushd $TmpDir"
|
||||
rlFetchSrcForInstalled $PACKAGE
|
||||
rlRun "useradd -M -N $BUILD_USER" 0,9
|
||||
[ "$?" == "0" ] && rlRun "del=yes"
|
||||
rlRun "chown -R $BUILD_USER:users $TmpDir"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartSetup "build boost"
|
||||
rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm"
|
||||
rlRun "dnf builddep -y $TmpDir/SPECS/*.spec"
|
||||
rlRun "sed -i -e 's/^%prep/%prep\n%dump/' $TmpDir/SPECS/*.spec"
|
||||
rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
|
||||
rlRun "rlFileSubmit $TmpDir/rpmbuild.log"
|
||||
rlRun "toplev_dirname=`awk '/toplev_dirname/{print $3; exit}' $TmpDir/rpmbuild.log`"
|
||||
cd $TmpDir/BUILD/$toplev_dirname
|
||||
if [ $? -ne 0 ]; then
|
||||
# handle rpm 4.20 build directory difference
|
||||
# https://github.com/rpm-software-management/rpm/issues/3147
|
||||
rlRun "cd $TmpDir/BUILD/*-build/$toplev_dirname"
|
||||
fi
|
||||
# now we know the top-level build dir, keep it for later
|
||||
rlRun "BuildDir=$(pwd)"
|
||||
rlRun "su -c './bootstrap.sh &>$TmpDir/bootstrap.log' $BUILD_USER"
|
||||
rlRun "rlFileSubmit $TmpDir/bootstrap.log"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "run testsuite"
|
||||
while read test_path; do
|
||||
if [ -f $BuildDir/libs/$test_path/test/Jamfile* ]; then
|
||||
rlRun "cd $BuildDir/libs/$test_path/test"
|
||||
rlRun "su -c '/usr/bin/b2 -d1 --build-dir=$TmpDir/test-build &>>$TmpDir/testsuite.log' $BUILD_USER"
|
||||
rm -fr $TmpDir/test-build
|
||||
else
|
||||
rlLogInfo "$test_path/Jamfile* not found, skipping"
|
||||
fi
|
||||
done <$TmpDir/tests
|
||||
rlRun "rlFileSubmit $TmpDir/testsuite.log"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "evaluate results"
|
||||
rlRun "cd $TmpDir"
|
||||
rlRun "grep -E '\.\.\.failed .+$TmpDir/test-build' testsuite.log" 1 "There should be no failure"
|
||||
rlRun "tests_count=\$(grep -E '\*\*passed\*\*.+$TmpDir/test-build' testsuite.log | wc -l)"
|
||||
[ "$tests_count" -ge "$TESTS_COUNT_MIN" ] && rlLogInfo "Test counter: $tests_count" || rlFail "Test counter $tests_count should be greater than or equal to $TESTS_COUNT_MIN"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
rlRun "popd"
|
||||
rlRun "rm -r $TmpDir"
|
||||
[ "$del" == "yes" ] && rlRun "userdel $BUILD_USER"
|
||||
rlPhaseEnd
|
||||
rlJournalPrintText
|
||||
rlJournalEnd
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
integer
|
||||
random
|
||||
rational
|
||||
regex
|
||||
timer
|
||||
5
ver.py
Normal file
5
ver.py
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
import platform
|
||||
import sys
|
||||
|
||||
sys.stdout.write (".".join (platform.python_version_tuple ()[:2]))
|
||||
sys.stdout.write ("\n")
|
||||
Loading…
Add table
Add a link
Reference in a new issue