Compare commits
109 Commits
master
...
f37-riscv6
Author | SHA1 | Date | |
---|---|---|---|
9a76903c21 | |||
42e7661062 | |||
cd7659b0b8 | |||
|
e938c8d9b3 | ||
|
bea3cff9ae | ||
|
af99b52501 | ||
|
6585f3fb6e | ||
|
2888982c28 | ||
|
b96dcf38c8 | ||
|
12bd4872ac | ||
|
19a004c283 | ||
|
36115b3780 | ||
|
5827653083 | ||
|
9c645e2838 | ||
|
efa25cfd81 | ||
|
83163cb5f7 | ||
|
3bd0a83d52 | ||
|
3c2829edfe | ||
|
9eaf760933 | ||
|
5eaac698fe | ||
|
bc37ceb79d | ||
|
0e92f1aa2e | ||
|
6502666126 | ||
|
6edfd32617 | ||
|
bba3a6c2a0 | ||
|
214bbadaf6 | ||
|
3824fb1903 | ||
|
0fc8825319 | ||
|
6a7ecd767d | ||
|
65b36067d5 | ||
|
03817f73cb | ||
|
ee1a4870ab | ||
|
dd07b4b21f | ||
|
7fd53e5641 | ||
|
237974a0ce | ||
|
582a02c7ab | ||
|
b796f2d0eb | ||
|
5f7b377f41 | ||
|
3eea468474 | ||
|
67e502ea95 | ||
|
8bed92113e | ||
|
aa5af673c5 | ||
|
394a768911 | ||
|
325ac22f96 | ||
|
cb5a05db6c | ||
|
5c328ce476 | ||
|
ddd384021b | ||
|
64d97f19ff | ||
|
8158d2d41c | ||
|
820bf32137 | ||
|
31a1406483 | ||
|
c570dcff0d | ||
|
cdb89c50f8 | ||
|
9e8114f822 | ||
|
f1058cd956 | ||
|
ddb9ecef4e | ||
|
3fcfdd32f8 | ||
|
8e6b263013 | ||
|
b594da2a28 | ||
|
a562db598b | ||
|
378d8d7e42 | ||
|
66b109b6e1 | ||
|
9e76353688 | ||
|
fb6db033ed | ||
|
1f2e448e09 | ||
|
b93614e906 | ||
|
ab7eefd18e | ||
|
5d6038484f | ||
|
434963c709 | ||
|
1a2264a222 | ||
|
0e0b60eac1 | ||
|
a0e9e6a602 | ||
|
c808f65625 | ||
|
eefba79672 | ||
|
d5a194094a | ||
|
193ea1c207 | ||
|
1ab43be260 | ||
|
0fc400a27f | ||
|
56941f6dac | ||
|
b9f2e3cc4a | ||
|
3458dcd53a | ||
|
8aafa09ef7 | ||
|
f5c0d413a7 | ||
|
0666fd79ba | ||
|
5f1c9ef7fa | ||
|
0f9795fc5c | ||
|
8e32c40a85 | ||
|
e7f763888a | ||
|
575500ddcb | ||
|
081b85cab4 | ||
|
419c3aba65 | ||
|
c424db8834 | ||
|
777ed71df5 | ||
|
f158da30f8 | ||
|
094f7ed60f | ||
|
aca49b6923 | ||
|
90fdd43d4d | ||
|
15eed98242 | ||
|
bf8dec78cc | ||
|
8e25e3cb3f | ||
|
dad36c9161 | ||
|
5fb7b5da8b | ||
|
a07a46867a | ||
|
811a3a3329 | ||
|
166218aed3 | ||
|
015b3a9f0a | ||
|
ae9f023f89 | ||
|
061d021ce1 | ||
|
557e21db14 |
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
144
b2.1
Normal file
144
b2.1
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
.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
|
@ -1,150 +0,0 @@
|
|||||||
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
|
|
@ -1,22 +0,0 @@
|
|||||||
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;
|
|
@ -1,60 +0,0 @@
|
|||||||
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; }
|
|
||||||
|
|
@ -1,80 +0,0 @@
|
|||||||
diff -up boost_1_53_0/boost/math/special_functions/sign.hpp\~ boost_1_53_0/boost/math/special_functions/sign.hpp
|
|
||||||
--- boost_1_53_0/boost/math/special_functions/sign.hpp~ 2011-05-17 14:19:17.000000000 +0200
|
|
||||||
+++ boost_1_53_0/boost/math/special_functions/sign.hpp 2013-07-22 23:24:39.751342557 +0200
|
|
||||||
@@ -110,7 +110,6 @@ template<class T> int (signbit)(T x)
|
|
||||||
{
|
|
||||||
typedef typename detail::fp_traits<T>::type traits;
|
|
||||||
typedef typename traits::method method;
|
|
||||||
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
|
||||||
return detail::signbit_impl(x, method());
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -124,7 +123,6 @@ template<class T> T (changesign)(const T
|
|
||||||
{ //!< \brief return unchanged binary pattern of x, except for change of sign bit.
|
|
||||||
typedef typename detail::fp_traits<T>::sign_change_type traits;
|
|
||||||
typedef typename traits::method method;
|
|
||||||
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
|
||||||
|
|
||||||
return detail::changesign_impl(x, method());
|
|
||||||
}
|
|
||||||
diff -up boost_1_53_0/boost/math/special_functions/fpclassify.hpp~ boost_1_53_0/boost/math/special_functions/fpclassify.hpp
|
|
||||||
--- boost_1_53_0/boost/math/special_functions/fpclassify.hpp~ 2012-12-12 19:17:22.000000000 +0100
|
|
||||||
+++ boost_1_53_0/boost/math/special_functions/fpclassify.hpp 2013-07-22 12:07:59.478713488 +0200
|
|
||||||
@@ -327,7 +327,6 @@ inline bool (isfinite)(T x)
|
|
||||||
{ //!< \brief return true if floating-point type t is finite.
|
|
||||||
typedef typename detail::fp_traits<T>::type traits;
|
|
||||||
typedef typename traits::method method;
|
|
||||||
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
|
||||||
typedef typename tools::promote_args<T>::type value_type;
|
|
||||||
return detail::isfinite_impl(static_cast<value_type>(x), method());
|
|
||||||
}
|
|
||||||
@@ -338,7 +338,6 @@ inline bool (isfinite)(long double x)
|
|
||||||
{ //!< \brief return true if floating-point type t is finite.
|
|
||||||
typedef detail::fp_traits<long double>::type traits;
|
|
||||||
typedef traits::method method;
|
|
||||||
- typedef boost::is_floating_point<long double>::type fp_tag;
|
|
||||||
typedef long double value_type;
|
|
||||||
return detail::isfinite_impl(static_cast<value_type>(x), method());
|
|
||||||
}
|
|
||||||
@@ -398,7 +397,6 @@ inline bool (isnormal)(T x)
|
|
||||||
{
|
|
||||||
typedef typename detail::fp_traits<T>::type traits;
|
|
||||||
typedef typename traits::method method;
|
|
||||||
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
|
||||||
typedef typename tools::promote_args<T>::type value_type;
|
|
||||||
return detail::isnormal_impl(static_cast<value_type>(x), method());
|
|
||||||
}
|
|
||||||
@@ -409,7 +408,6 @@ inline bool (isnormal)(long double x)
|
|
||||||
{
|
|
||||||
typedef detail::fp_traits<long double>::type traits;
|
|
||||||
typedef traits::method method;
|
|
||||||
- typedef boost::is_floating_point<long double>::type fp_tag;
|
|
||||||
typedef long double value_type;
|
|
||||||
return detail::isnormal_impl(static_cast<value_type>(x), method());
|
|
||||||
}
|
|
||||||
@@ -487,7 +485,6 @@ inline bool (isinf)(T x)
|
|
||||||
{
|
|
||||||
typedef typename detail::fp_traits<T>::type traits;
|
|
||||||
typedef typename traits::method method;
|
|
||||||
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
|
||||||
typedef typename tools::promote_args<T>::type value_type;
|
|
||||||
return detail::isinf_impl(static_cast<value_type>(x), method());
|
|
||||||
}
|
|
||||||
@@ -498,7 +496,6 @@ inline bool (isinf)(long double x)
|
|
||||||
{
|
|
||||||
typedef detail::fp_traits<long double>::type traits;
|
|
||||||
typedef traits::method method;
|
|
||||||
- typedef boost::is_floating_point<long double>::type fp_tag;
|
|
||||||
typedef long double value_type;
|
|
||||||
return detail::isinf_impl(static_cast<value_type>(x), method());
|
|
||||||
}
|
|
||||||
@@ -570,7 +567,6 @@ inline bool (isnan)(T x)
|
|
||||||
{ //!< \brief return true if floating-point type t is NaN (Not A Number).
|
|
||||||
typedef typename detail::fp_traits<T>::type traits;
|
|
||||||
typedef typename traits::method method;
|
|
||||||
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
|
||||||
return detail::isnan_impl(x, method());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Diff finished. Mon Jul 22 12:09:24 2013
|
|
@ -1,130 +0,0 @@
|
|||||||
diff -urp boost_1_54_0-orig/boost/graph/breadth_first_search.hpp boost_1_54_0/boost/graph/breadth_first_search.hpp
|
|
||||||
--- boost_1_54_0-orig/boost/graph/breadth_first_search.hpp 2013-07-23 00:47:43.418886551 +0200
|
|
||||||
+++ boost_1_54_0/boost/graph/breadth_first_search.hpp 2013-07-23 00:50:40.339958756 +0200
|
|
||||||
@@ -64,7 +64,6 @@ namespace boost {
|
|
||||||
BOOST_CONCEPT_ASSERT(( IncidenceGraphConcept<IncidenceGraph> ));
|
|
||||||
typedef graph_traits<IncidenceGraph> GTraits;
|
|
||||||
typedef typename GTraits::vertex_descriptor Vertex;
|
|
||||||
- typedef typename GTraits::edge_descriptor Edge;
|
|
||||||
BOOST_CONCEPT_ASSERT(( BFSVisitorConcept<BFSVisitor, IncidenceGraph> ));
|
|
||||||
BOOST_CONCEPT_ASSERT(( ReadWritePropertyMapConcept<ColorMap, Vertex> ));
|
|
||||||
typedef typename property_traits<ColorMap>::value_type ColorValue;
|
|
||||||
diff -urp boost_1_53_0-orig/boost/graph/compressed_sparse_row_graph.hpp boost_1_53_0/boost/graph/compressed_sparse_row_graph.hpp
|
|
||||||
--- boost_1_53_0-orig/boost/graph/compressed_sparse_row_graph.hpp 2013-07-23 01:32:19.273266030 +0200
|
|
||||||
+++ boost_1_53_0/boost/graph/compressed_sparse_row_graph.hpp 2013-07-23 01:34:15.202970721 +0200
|
|
||||||
@@ -642,8 +642,6 @@ class compressed_sparse_row_graph<direct
|
|
||||||
const GlobalToLocal& global_to_local) {
|
|
||||||
typedef compressed_sparse_row_graph Graph;
|
|
||||||
typedef typename boost::graph_traits<Graph>::vertex_descriptor vertex_t;
|
|
||||||
- typedef typename boost::graph_traits<Graph>::vertices_size_type vertex_num;
|
|
||||||
- typedef typename boost::graph_traits<Graph>::edges_size_type edge_num;
|
|
||||||
typedef std::vector<std::pair<vertex_t, vertex_t> > edge_vector_t;
|
|
||||||
edge_vector_t new_edges(first, last);
|
|
||||||
if (new_edges.empty()) return;
|
|
||||||
@@ -666,8 +664,6 @@ class compressed_sparse_row_graph<direct
|
|
||||||
const GlobalToLocal& global_to_local) {
|
|
||||||
typedef compressed_sparse_row_graph Graph;
|
|
||||||
typedef typename boost::graph_traits<Graph>::vertex_descriptor vertex_t;
|
|
||||||
- typedef typename boost::graph_traits<Graph>::vertices_size_type vertex_num;
|
|
||||||
- typedef typename boost::graph_traits<Graph>::edges_size_type edge_num;
|
|
||||||
typedef std::pair<vertex_t, vertex_t> vertex_pair;
|
|
||||||
typedef std::vector<
|
|
||||||
boost::tuple<vertex_pair,
|
|
||||||
@@ -1164,7 +1160,6 @@ inline std::pair<typename BOOST_BIDIR_CS
|
|
||||||
typename BOOST_BIDIR_CSR_GRAPH_TYPE::in_edge_iterator>
|
|
||||||
in_edges(Vertex v, const BOOST_BIDIR_CSR_GRAPH_TYPE& g)
|
|
||||||
{
|
|
||||||
- typedef typename BOOST_BIDIR_CSR_GRAPH_TYPE::edge_descriptor ed;
|
|
||||||
typedef typename BOOST_BIDIR_CSR_GRAPH_TYPE::in_edge_iterator it;
|
|
||||||
EdgeIndex v_row_start = g.m_backward.m_rowstart[v];
|
|
||||||
EdgeIndex next_row_start = g.m_backward.m_rowstart[v + 1];
|
|
||||||
@@ -1368,7 +1363,6 @@ put(Tag tag,
|
|
||||||
typename property_map<BOOST_CSR_GRAPH_TYPE, Tag>::key_type k,
|
|
||||||
typename lookup_one_property<typename property_map<BOOST_CSR_GRAPH_TYPE, Tag>::plist_type, Tag>::type val) {
|
|
||||||
typedef typename property_map<BOOST_CSR_GRAPH_TYPE, Tag>::all_tag all_tag;
|
|
||||||
- typedef typename property_map<BOOST_CSR_GRAPH_TYPE, all_tag>::type outer_pm;
|
|
||||||
lookup_one_property<typename property_map<BOOST_CSR_GRAPH_TYPE, Tag>::plist_type, Tag>::lookup(get(all_tag(), g, k), tag) = val;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -urp boost_1_53_0-orig/boost/graph/detail/adjacency_list.hpp boost_1_53_0/boost/graph/detail/adjacency_list.hpp
|
|
||||||
--- boost_1_53_0-orig/boost/graph/detail/adjacency_list.hpp 2013-07-23 01:32:19.390266741 +0200
|
|
||||||
+++ boost_1_53_0/boost/graph/detail/adjacency_list.hpp 2013-07-23 01:34:15.275971164 +0200
|
|
||||||
@@ -634,7 +634,6 @@ namespace boost {
|
|
||||||
directed_graph_helper<Config>& g_)
|
|
||||||
{
|
|
||||||
typedef typename Config::graph_type graph_type;
|
|
||||||
- typedef typename Config::edge_parallel_category Cat;
|
|
||||||
graph_type& g = static_cast<graph_type&>(g_);
|
|
||||||
g.out_edge_list(u).clear();
|
|
||||||
// clear() should be a req of Sequence and AssociativeContainer,
|
|
||||||
@@ -781,7 +780,6 @@ namespace boost {
|
|
||||||
typedef typename Graph::global_edgelist_selector EdgeListS;
|
|
||||||
BOOST_STATIC_ASSERT((!is_same<EdgeListS, vecS>::value));
|
|
||||||
|
|
||||||
- typedef typename EdgeList::value_type StoredEdge;
|
|
||||||
typename EdgeList::iterator i = el.begin(), end = el.end();
|
|
||||||
for (; i != end; ++i) {
|
|
||||||
if ((*i).get_target() == v) {
|
|
||||||
@@ -986,7 +984,6 @@ namespace boost {
|
|
||||||
BOOST_STATIC_ASSERT((!is_same<EdgeListS, vecS>::value));
|
|
||||||
|
|
||||||
typedef typename Config::graph_type graph_type;
|
|
||||||
- typedef typename Config::edge_parallel_category Cat;
|
|
||||||
graph_type& g = static_cast<graph_type&>(g_);
|
|
||||||
while (true) {
|
|
||||||
typename Config::out_edge_iterator ei, ei_end;
|
|
||||||
@@ -1588,7 +1585,6 @@ namespace boost {
|
|
||||||
typedef typename Config::graph_type Graph;
|
|
||||||
typedef typename Config::StoredEdge StoredEdge;
|
|
||||||
const Graph& cg = static_cast<const Graph&>(g_);
|
|
||||||
- typedef typename Config::out_edge_iterator out_edge_iterator;
|
|
||||||
const typename Config::OutEdgeList& el = cg.out_edge_list(u);
|
|
||||||
typename Config::OutEdgeList::const_iterator it = graph_detail::
|
|
||||||
find(el, StoredEdge(v));
|
|
||||||
diff -urp boost_1_53_0-orig/boost/graph/detail/compressed_sparse_row_struct.hpp boost_1_53_0/boost/graph/detail/compressed_sparse_row_struct.hpp
|
|
||||||
--- boost_1_53_0-orig/boost/graph/detail/compressed_sparse_row_struct.hpp 2013-07-23 01:32:19.395266772 +0200
|
|
||||||
+++ boost_1_53_0/boost/graph/detail/compressed_sparse_row_struct.hpp 2013-07-23 01:34:15.278971182 +0200
|
|
||||||
@@ -218,8 +218,6 @@ namespace detail {
|
|
||||||
// the user has supplied the number of edges.
|
|
||||||
edges_size_type numedges = numedges_or_zero;
|
|
||||||
if (numedges == 0) {
|
|
||||||
- typedef typename std::iterator_traits<InputIterator>::iterator_category
|
|
||||||
- category;
|
|
||||||
numedges = boost::graph::detail::reserve_count_for_single_pass(edge_begin, edge_end);
|
|
||||||
}
|
|
||||||
m_column.clear();
|
|
||||||
@@ -313,7 +311,6 @@ namespace detail {
|
|
||||||
inherited_edge_properties::resize(numedges);
|
|
||||||
EdgeIndex current_edge = 0;
|
|
||||||
typedef typename boost::graph_traits<Graph>::vertex_descriptor g_vertex;
|
|
||||||
- typedef typename boost::graph_traits<Graph>::edge_descriptor g_edge;
|
|
||||||
typedef typename boost::graph_traits<Graph>::out_edge_iterator
|
|
||||||
g_out_edge_iter;
|
|
||||||
|
|
||||||
@@ -347,7 +344,6 @@ namespace detail {
|
|
||||||
// Flip sequence
|
|
||||||
BidirectionalIterator first(last_sorted);
|
|
||||||
BidirectionalIterator last(first_sorted);
|
|
||||||
- typedef Vertex vertex_t;
|
|
||||||
typedef Vertex vertex_num;
|
|
||||||
typedef EdgeIndex edge_num;
|
|
||||||
edge_num new_edge_count = std::distance(first, last);
|
|
||||||
diff -urp boost_1_53_0-orig/boost/graph/detail/histogram_sort.hpp boost_1_53_0/boost/graph/detail/histogram_sort.hpp
|
|
||||||
--- boost_1_53_0-orig/boost/graph/detail/histogram_sort.hpp 2013-07-23 01:32:19.364266583 +0200
|
|
||||||
+++ boost_1_53_0/boost/graph/detail/histogram_sort.hpp 2013-07-23 01:34:15.279971188 +0200
|
|
||||||
@@ -159,7 +159,6 @@ histogram_sort_inplace(KeyIterator key_b
|
|
||||||
Value1Iter values1,
|
|
||||||
KeyTransform key_transform) {
|
|
||||||
|
|
||||||
- typedef NumKeys vertices_size_type;
|
|
||||||
typedef typename std::iterator_traits<RowstartIterator>::value_type EdgeIndex;
|
|
||||||
|
|
||||||
// 1. Copy m_rowstart (except last element) to get insert positions
|
|
||||||
@@ -194,7 +193,6 @@ histogram_sort_inplace(KeyIterator key_b
|
|
||||||
Value2Iter values2,
|
|
||||||
KeyTransform key_transform) {
|
|
||||||
|
|
||||||
- typedef NumKeys vertices_size_type;
|
|
||||||
typedef typename std::iterator_traits<RowstartIterator>::value_type EdgeIndex;
|
|
||||||
|
|
||||||
// 1. Copy m_rowstart (except last element) to get insert positions
|
|
@ -1,13 +0,0 @@
|
|||||||
diff -up boost_1_53_0/boost/lexical_cast.hpp\~ boost_1_53_0/boost/lexical_cast.hpp
|
|
||||||
--- boost_1_53_0/boost/lexical_cast.hpp~ 2012-12-29 15:41:23.000000000 +0100
|
|
||||||
+++ boost_1_53_0/boost/lexical_cast.hpp 2013-07-22 23:27:48.841566845 +0200
|
|
||||||
@@ -865,7 +865,6 @@ namespace boost {
|
|
||||||
#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
|
|
||||||
BOOST_STATIC_ASSERT(!std::numeric_limits<T>::is_signed);
|
|
||||||
#endif
|
|
||||||
- typedef typename Traits::int_type int_type;
|
|
||||||
CharT const czero = lcast_char_constants<CharT>::zero;
|
|
||||||
--end;
|
|
||||||
value = 0;
|
|
||||||
|
|
||||||
Diff finished. Mon Jul 22 23:28:02 2013
|
|
@ -1,46 +0,0 @@
|
|||||||
diff -urp boost_1_53_0-orig/boost/math/special_functions/detail/igamma_inverse.hpp boost_1_53_0/boost/math/special_functions/detail/igamma_inverse.hpp
|
|
||||||
--- boost_1_53_0-orig/boost/math/special_functions/detail/igamma_inverse.hpp 2013-07-23 01:32:21.874281840 +0200
|
|
||||||
+++ boost_1_53_0/boost/math/special_functions/detail/igamma_inverse.hpp 2013-07-23 01:34:15.291971260 +0200
|
|
||||||
@@ -341,7 +341,6 @@ struct gamma_p_inverse_func
|
|
||||||
// flag is set, then Q(x) - q and it's derivatives.
|
|
||||||
//
|
|
||||||
typedef typename policies::evaluation<T, Policy>::type value_type;
|
|
||||||
- typedef typename lanczos::lanczos<T, Policy>::type evaluation_type;
|
|
||||||
typedef typename policies::normalise<
|
|
||||||
Policy,
|
|
||||||
policies::promote_float<false>,
|
|
||||||
diff -urp boost_1_53_0-orig/boost/math/special_functions/gamma.hpp boost_1_53_0/boost/math/special_functions/gamma.hpp
|
|
||||||
--- boost_1_53_0-orig/boost/math/special_functions/gamma.hpp 2013-07-23 01:32:21.824281537 +0200
|
|
||||||
+++ boost_1_53_0/boost/math/special_functions/gamma.hpp 2013-07-23 01:34:15.322971451 +0200
|
|
||||||
@@ -1360,7 +1360,6 @@ inline typename tools::promote_args<T1,
|
|
||||||
BOOST_FPU_EXCEPTION_GUARD
|
|
||||||
typedef typename tools::promote_args<T1, T2>::type result_type;
|
|
||||||
typedef typename policies::evaluation<result_type, Policy>::type value_type;
|
|
||||||
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
|
|
||||||
typedef typename policies::normalise<
|
|
||||||
Policy,
|
|
||||||
policies::promote_float<false>,
|
|
||||||
@@ -1489,7 +1488,6 @@ inline typename tools::promote_args<T1,
|
|
||||||
BOOST_FPU_EXCEPTION_GUARD
|
|
||||||
typedef typename tools::promote_args<T1, T2>::type result_type;
|
|
||||||
typedef typename policies::evaluation<result_type, Policy>::type value_type;
|
|
||||||
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
|
|
||||||
typedef typename policies::normalise<
|
|
||||||
Policy,
|
|
||||||
policies::promote_float<false>,
|
|
||||||
@@ -1520,7 +1518,6 @@ inline typename tools::promote_args<T1,
|
|
||||||
BOOST_FPU_EXCEPTION_GUARD
|
|
||||||
typedef typename tools::promote_args<T1, T2>::type result_type;
|
|
||||||
typedef typename policies::evaluation<result_type, Policy>::type value_type;
|
|
||||||
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
|
|
||||||
typedef typename policies::normalise<
|
|
||||||
Policy,
|
|
||||||
policies::promote_float<false>,
|
|
||||||
@@ -1551,7 +1548,6 @@ inline typename tools::promote_args<T1,
|
|
||||||
BOOST_FPU_EXCEPTION_GUARD
|
|
||||||
typedef typename tools::promote_args<T1, T2>::type result_type;
|
|
||||||
typedef typename policies::evaluation<result_type, Policy>::type value_type;
|
|
||||||
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
|
|
||||||
typedef typename policies::normalise<
|
|
||||||
Policy,
|
|
||||||
policies::promote_float<false>,
|
|
@ -1,65 +0,0 @@
|
|||||||
diff -up ./boost/regex/icu.hpp~ ./boost/regex/icu.hpp
|
|
||||||
--- ./boost/regex/icu.hpp~ 2011-10-16 14:19:37.000000000 +0200
|
|
||||||
+++ ./boost/regex/icu.hpp 2013-07-22 23:32:44.346321967 +0200
|
|
||||||
@@ -423,7 +423,6 @@ bool do_regex_match(BidiIterator first,
|
|
||||||
{
|
|
||||||
typedef u16_to_u32_iterator<BidiIterator, UChar32> conv_type;
|
|
||||||
typedef match_results<conv_type> match_type;
|
|
||||||
- typedef typename match_type::allocator_type alloc_type;
|
|
||||||
match_type what;
|
|
||||||
bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
|
|
||||||
// copy results across to m:
|
|
||||||
@@ -439,7 +438,6 @@ bool do_regex_match(BidiIterator first,
|
|
||||||
{
|
|
||||||
typedef u8_to_u32_iterator<BidiIterator, UChar32> conv_type;
|
|
||||||
typedef match_results<conv_type> match_type;
|
|
||||||
- typedef typename match_type::allocator_type alloc_type;
|
|
||||||
match_type what;
|
|
||||||
bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
|
|
||||||
// copy results across to m:
|
|
||||||
@@ -598,7 +596,6 @@ bool do_regex_search(BidiIterator first,
|
|
||||||
{
|
|
||||||
typedef u16_to_u32_iterator<BidiIterator, UChar32> conv_type;
|
|
||||||
typedef match_results<conv_type> match_type;
|
|
||||||
- typedef typename match_type::allocator_type alloc_type;
|
|
||||||
match_type what;
|
|
||||||
bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
|
|
||||||
// copy results across to m:
|
|
||||||
@@ -615,7 +612,6 @@ bool do_regex_search(BidiIterator first,
|
|
||||||
{
|
|
||||||
typedef u8_to_u32_iterator<BidiIterator, UChar32> conv_type;
|
|
||||||
typedef match_results<conv_type> match_type;
|
|
||||||
- typedef typename match_type::allocator_type alloc_type;
|
|
||||||
match_type what;
|
|
||||||
bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
|
|
||||||
// copy results across to m:
|
|
||||||
diff -up ./boost/regex/v4/regex_format.hpp~ ./boost/regex/v4/regex_format.hpp
|
|
||||||
--- ./boost/regex/v4/regex_format.hpp~ 2012-05-24 12:03:48.000000000 +0200
|
|
||||||
+++ ./boost/regex/v4/regex_format.hpp 2013-07-22 23:31:06.466740621 +0200
|
|
||||||
@@ -1064,7 +1064,6 @@ struct format_functor_c_string
|
|
||||||
template <class OutputIter>
|
|
||||||
OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
|
|
||||||
{
|
|
||||||
- typedef typename Match::char_type char_type;
|
|
||||||
const charT* end = func;
|
|
||||||
while(*end) ++end;
|
|
||||||
return regex_format_imp(i, m, func, end, f, t);
|
|
||||||
@@ -1083,7 +1082,6 @@ struct format_functor_container
|
|
||||||
template <class OutputIter>
|
|
||||||
OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
|
|
||||||
{
|
|
||||||
- typedef typename Match::char_type char_type;
|
|
||||||
return re_detail::regex_format_imp(i, m, func.begin(), func.end(), f, t);
|
|
||||||
}
|
|
||||||
private:
|
|
||||||
diff -up ./boost/regex/v4/regex_split.hpp~ ./boost/regex/v4/regex_split.hpp
|
|
||||||
--- ./boost/regex/v4/regex_split.hpp~ 2007-11-25 19:07:19.000000000 +0100
|
|
||||||
+++ ./boost/regex/v4/regex_split.hpp 2013-07-22 23:31:29.098875039 +0200
|
|
||||||
@@ -107,7 +107,6 @@ std::size_t regex_split(OutputIterator o
|
|
||||||
std::size_t max_split)
|
|
||||||
{
|
|
||||||
typedef typename std::basic_string<charT, Traits1, Alloc1>::const_iterator ci_t;
|
|
||||||
- typedef typename match_results<ci_t>::allocator_type match_allocator;
|
|
||||||
ci_t last = s.begin();
|
|
||||||
std::size_t init_size = max_split;
|
|
||||||
re_detail::split_pred<OutputIterator, charT, Traits1, Alloc1> pred(&last, &out, &max_split);
|
|
@ -1,30 +0,0 @@
|
|||||||
diff -up boost_1_53_0/boost/static_assert.hpp\~ boost_1_53_0/boost/static_assert.hpp
|
|
||||||
--- boost_1_53_0/boost/static_assert.hpp~ 2012-12-11 15:42:26.000000000 +0100
|
|
||||||
+++ boost_1_53_0/boost/static_assert.hpp 2013-07-19 14:15:59.504039071 +0200
|
|
||||||
@@ -43,6 +43,14 @@
|
|
||||||
#else
|
|
||||||
# define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x)
|
|
||||||
#endif
|
|
||||||
+//
|
|
||||||
+// If the compiler warns about unused typedefs then enable this:
|
|
||||||
+//
|
|
||||||
+#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
|
|
||||||
+# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
|
|
||||||
+#else
|
|
||||||
+# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#ifndef BOOST_NO_CXX11_STATIC_ASSERT
|
|
||||||
# define BOOST_STATIC_ASSERT( B ) static_assert(B, #B)
|
|
||||||
@@ -122,7 +130,8 @@ template<int x> struct static_assert_tes
|
|
||||||
#define BOOST_STATIC_ASSERT( B ) \
|
|
||||||
typedef ::boost::static_assert_test<\
|
|
||||||
sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >)>\
|
|
||||||
- BOOST_JOIN(boost_static_assert_typedef_, __LINE__)
|
|
||||||
+ BOOST_JOIN(boost_static_assert_typedef_, __LINE__) \
|
|
||||||
+ BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
Diff finished. Fri Jul 19 14:16:04 2013
|
|
@ -1,26 +0,0 @@
|
|||||||
diff -up boost_1_53_0/boost/thread/future.hpp\~ boost_1_53_0/boost/thread/future.hpp
|
|
||||||
--- boost_1_53_0/boost/thread/future.hpp~ 2012-12-16 20:01:45.000000000 +0100
|
|
||||||
+++ boost_1_53_0/boost/thread/future.hpp 2013-07-23 16:50:27.044995968 +0200
|
|
||||||
@@ -2911,10 +2913,6 @@ namespace boost
|
|
||||||
{
|
|
||||||
typedef typename boost::result_of<typename decay<F>::type()>::type R;
|
|
||||||
typedef packaged_task<R()> packaged_task_type;
|
|
||||||
-
|
|
||||||
- typedef detail::async_func<typename decay<F>::type> BF;
|
|
||||||
- typedef typename BF::result_type Rp;
|
|
||||||
-
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
template <class F>
|
|
||||||
@@ -2925,9 +2924,6 @@ namespace boost
|
|
||||||
{
|
|
||||||
typedef typename boost::result_of<typename decay<F>::type()>::type R;
|
|
||||||
typedef packaged_task<R> packaged_task_type;
|
|
||||||
-
|
|
||||||
- typedef detail::async_func<typename decay<F>::type> BF;
|
|
||||||
- typedef typename BF::result_type Rp;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (int(policy) & int(launch::async))
|
|
||||||
|
|
||||||
Diff finished. Tue Jul 23 16:50:30 2013
|
|
@ -1,11 +0,0 @@
|
|||||||
diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp
|
|
||||||
--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200
|
|
||||||
+++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200
|
|
||||||
@@ -27,7 +27,6 @@ namespace boundary {
|
|
||||||
int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end)
|
|
||||||
{
|
|
||||||
typedef LeftIterator left_iterator;
|
|
||||||
- typedef RightIterator right_iterator;
|
|
||||||
typedef typename std::iterator_traits<left_iterator>::value_type char_type;
|
|
||||||
typedef std::char_traits<char_type> traits;
|
|
||||||
while(l_begin!=l_end && r_begin!=r_end) {
|
|
@ -1,24 +0,0 @@
|
|||||||
Index: boost/random/generate_canonical.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/random/generate_canonical.hpp (revision 85073)
|
|
||||||
+++ boost/random/generate_canonical.hpp (working copy)
|
|
||||||
@@ -54,7 +54,6 @@
|
|
||||||
using std::floor;
|
|
||||||
BOOST_ASSERT((g.min)() == 0);
|
|
||||||
BOOST_ASSERT((g.max)() == 1);
|
|
||||||
- typedef typename URNG::result_type base_result;
|
|
||||||
std::size_t digits = std::numeric_limits<RealType>::digits;
|
|
||||||
std::size_t engine_bits = detail::generator_bits<URNG>::value();
|
|
||||||
std::size_t b = (std::min)(bits, digits);
|
|
||||||
Index: boost/random/uniform_real_distribution.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/random/uniform_real_distribution.hpp (revision 85073)
|
|
||||||
+++ boost/random/uniform_real_distribution.hpp (working copy)
|
|
||||||
@@ -36,7 +36,6 @@
|
|
||||||
{
|
|
||||||
for(;;) {
|
|
||||||
typedef T result_type;
|
|
||||||
- typedef typename Engine::result_type base_result;
|
|
||||||
result_type numerator = static_cast<T>(eng() - (eng.min)());
|
|
||||||
result_type divisor = static_cast<T>((eng.max)() - (eng.min)());
|
|
||||||
BOOST_ASSERT(divisor > 0);
|
|
@ -1,31 +0,0 @@
|
|||||||
diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp
|
|
||||||
--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200
|
|
||||||
+++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100
|
|
||||||
@@ -52,16 +52,15 @@ struct print
|
|
||||||
enum { n = sizeof(T) + -1 };
|
|
||||||
#elif defined(__MWERKS__)
|
|
||||||
void f(int);
|
|
||||||
-#else
|
|
||||||
- enum {
|
|
||||||
- n =
|
|
||||||
-# if defined(__EDG_VERSION__)
|
|
||||||
- aux::dependent_unsigned<T>::value > -1
|
|
||||||
-# else
|
|
||||||
- sizeof(T) > -1
|
|
||||||
-# endif
|
|
||||||
- };
|
|
||||||
-#endif
|
|
||||||
+#elif defined(__EDG_VERSION__)
|
|
||||||
+ enum { n = aux::dependent_unsigned<T>::value > -1 };
|
|
||||||
+#elif defined(BOOST_GCC)
|
|
||||||
+ enum { n1 };
|
|
||||||
+ enum { n2 };
|
|
||||||
+ enum { n = n1 != n2 };
|
|
||||||
+#else
|
|
||||||
+ enum { n = sizeof(T) > -1 };
|
|
||||||
+#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
#if defined(BOOST_MSVC)
|
|
||||||
|
|
||||||
Diff finished. Tue Jan 20 12:45:03 2015
|
|
@ -1,13 +0,0 @@
|
|||||||
Index: boost_1_57_0/tools/build/src/tools/python.jam
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406)
|
|
||||||
+++ boost_1_57_0/tools/build/src/tools/python.jam (working copy)
|
|
||||||
@@ -994,7 +994,7 @@
|
|
||||||
else
|
|
||||||
{
|
|
||||||
alias python_for_extensions
|
|
||||||
- :
|
|
||||||
+ : python
|
|
||||||
: $(target-requirements)
|
|
||||||
:
|
|
||||||
: $(usage-requirements)
|
|
@ -1,31 +1,30 @@
|
|||||||
diff -up boost_1_58_0/libs/pool/test/Jamfile.v2\~ boost_1_58_0/libs/pool/test/Jamfile.v2
|
--- boost_1_68_0/libs/pool/test/Jamfile.v2.orig 2018-08-01 20:50:52.000000000 +0000
|
||||||
--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0100
|
+++ boost_1_68_0/libs/pool/test/Jamfile.v2 2018-12-01 17:29:33.322195409 +0000
|
||||||
+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +0100
|
@@ -22,18 +22,18 @@
|
||||||
@@ -28,17 +28,17 @@
|
import testing ;
|
||||||
local Werr = <toolset>gcc:<warnings-as-errors>on <toolset>msvc:<warnings-as-errors>on ;
|
|
||||||
|
|
||||||
test-suite pool :
|
test-suite pool :
|
||||||
- [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 ]
|
- [ run test_simple_seg_storage.cpp : : : <toolset>msvc:<cxxflags>-wd4267 ]
|
||||||
- [ run test_pool_alloc.cpp : : : $(Werr) ]
|
- [ run test_pool_alloc.cpp ]
|
||||||
- [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 ]
|
- [ run pool_msvc_compiler_bug_test.cpp : : : <toolset>msvc:<cxxflags>-wd4512 ]
|
||||||
- [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) ]
|
- [ run test_msvc_mem_leak_detect.cpp ]
|
||||||
- [ run test_bug_3349.cpp : : : $(Werr) ]
|
- [ run test_bug_3349.cpp ]
|
||||||
- [ run test_bug_4960.cpp : : : $(Werr) ]
|
- [ run test_bug_4960.cpp ]
|
||||||
- [ run test_bug_1252.cpp : : : $(Werr) ]
|
+ [ run test_simple_seg_storage.cpp : : : <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ]
|
||||||
- [ run test_bug_2696.cpp : : : $(Werr) ]
|
+ [ run test_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
|
||||||
- [ run test_bug_5526.cpp : : : $(Werr) ]
|
+ [ run pool_msvc_compiler_bug_test.cpp : : : <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ]
|
||||||
+ [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ]
|
+ [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ]
|
||||||
+ [ run test_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
+ [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ]
|
||||||
+ [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ]
|
+ [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ]
|
||||||
+ [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
[ run test_bug_1252.cpp : : :
|
||||||
+ [ run test_bug_3349.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
<toolset>clang:<cxxflags>-Wno-c++11-long-long
|
||||||
+ [ run test_bug_4960.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
<toolset>gcc:<cxxflags>-Wno-long-long
|
||||||
+ [ run test_bug_1252.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
- <toolset>pathscale:<cxxflags>-Wno-long-long ]
|
||||||
+ [ run test_bug_2696.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
- [ run test_bug_2696.cpp ]
|
||||||
+ [ run test_bug_5526.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
- [ run test_bug_5526.cpp ]
|
||||||
|
+ <toolset>pathscale:<cxxflags>-Wno-long-long <library>/boost/system//boost_system ]
|
||||||
|
+ [ run test_bug_2696.cpp : : : <library>/boost/system//boost_system ]
|
||||||
|
+ [ run test_bug_5526.cpp : : : <library>/boost/system//boost_system ]
|
||||||
[ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ]
|
[ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ]
|
||||||
- [ run ../example/time_pool_alloc.cpp : : : $(Werr) ]
|
[ compile test_poisoned_macros.cpp ]
|
||||||
+ [ run ../example/time_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
;
|
||||||
[ compile test_poisoned_macros.cpp : $(Werr) ]
|
|
||||||
|
|
||||||
#
|
|
||||||
|
@ -1,87 +0,0 @@
|
|||||||
--- boost_1_63_0/libs/mpi/build/Jamfile.v2 2016-12-22 06:33:17.000000000 -0600
|
|
||||||
+++ boost_1_63_0/libs/mpi/build/Jamfile.v2 2017-05-19 01:45:05.485563800 -0500
|
|
||||||
@@ -11,6 +11,7 @@
|
|
||||||
import mpi ;
|
|
||||||
import indirect ;
|
|
||||||
import python ;
|
|
||||||
+import feature ;
|
|
||||||
|
|
||||||
libraries = ;
|
|
||||||
|
|
||||||
@@ -53,18 +54,38 @@ lib boost_mpi
|
|
||||||
<library>../../serialization/build//boost_serialization
|
|
||||||
<library>/mpi//mpi [ mpi.extra-requirements ]
|
|
||||||
;
|
|
||||||
+
|
|
||||||
+rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
|
|
||||||
|
|
||||||
libraries += boost_mpi ;
|
|
||||||
+rule find-py3-version
|
|
||||||
+{
|
|
||||||
+ local versions = [ feature.values python ] ;
|
|
||||||
+ local py3ver ;
|
|
||||||
+ for local v in $(versions)
|
|
||||||
+ {
|
|
||||||
+ if $(v) >= 3.0
|
|
||||||
+ {
|
|
||||||
+ py3ver = $(v) ;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return $(py3ver) ;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+py3-version = [ find-py3-version ] ;
|
|
||||||
|
|
||||||
if [ python.configured ]
|
|
||||||
{
|
|
||||||
- lib boost_mpi_python
|
|
||||||
+
|
|
||||||
+ rule lib_boost_mpi_python ( is-py3 ? ) {
|
|
||||||
+
|
|
||||||
+ lib [ cond $(is-py3) : boost_mpi_python3 : boost_mpi_python ]
|
|
||||||
: # Sources
|
|
||||||
python/serialize.cpp
|
|
||||||
: # Requirements
|
|
||||||
<library>boost_mpi
|
|
||||||
<library>/mpi//mpi [ mpi.extra-requirements ]
|
|
||||||
- <library>/boost/python//boost_python
|
|
||||||
+ [ cond $(is-py3) : <library>/boost/python//boost_python3 : <library>/boost/python//boost_python ]
|
|
||||||
<link>shared:<define>BOOST_MPI_DYN_LINK=1
|
|
||||||
<link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
|
|
||||||
<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
|
|
||||||
@@ -76,7 +97,6 @@ libraries += boost_mpi ;
|
|
||||||
: # Usage requirements
|
|
||||||
<library>/mpi//mpi [ mpi.extra-requirements ]
|
|
||||||
;
|
|
||||||
- libraries += boost_mpi_python ;
|
|
||||||
|
|
||||||
python-extension mpi
|
|
||||||
: # Sources
|
|
||||||
@@ -93,8 +113,8 @@ libraries += boost_mpi ;
|
|
||||||
python/status.cpp
|
|
||||||
python/py_timer.cpp
|
|
||||||
: # Requirements
|
|
||||||
- <library>/boost/python//boost_python
|
|
||||||
- <library>boost_mpi_python
|
|
||||||
+ [ cond $(is-py3) : <library>/boost/python//boost_python3 : <library>/boost/python//boost_python ]
|
|
||||||
+ [ cond $(is-py3) : <library>boost_mpi_python3 : <library>boost_mpi_python ]
|
|
||||||
<library>boost_mpi
|
|
||||||
<library>/mpi//mpi [ mpi.extra-requirements ]
|
|
||||||
<link>shared:<define>BOOST_MPI_DYN_LINK=1
|
|
||||||
@@ -102,6 +122,16 @@ libraries += boost_mpi ;
|
|
||||||
<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
|
|
||||||
<link>shared <runtime-link>shared
|
|
||||||
;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if $(py3-version) {
|
|
||||||
+ lib_boost_mpi_python yes ;
|
|
||||||
+ libraries += boost_mpi_python3 ;
|
|
||||||
+ } else {
|
|
||||||
+ lib_boost_mpi_python ;
|
|
||||||
+ libraries += boost_mpi_python ;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if ! ( --without-mpi in [ modules.peek : ARGV ] )
|
|
@ -1,13 +0,0 @@
|
|||||||
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2018-01-19 13:09:56.041685502 +0000
|
|
||||||
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 13:09:56.042685500 +0000
|
|
||||||
@@ -421,7 +421,9 @@
|
|
||||||
|
|
||||||
rule set-address-model-options ( targets * : sources * : properties * )
|
|
||||||
{
|
|
||||||
- local model = [ feature.get-values address-model : $(properties) ] ;
|
|
||||||
+ # For RPM builds the address model flag is passed in %{optflags}.
|
|
||||||
+ # local model = [ feature.get-values address-model : $(properties) ] ;
|
|
||||||
+ local model ;
|
|
||||||
if $(model)
|
|
||||||
{
|
|
||||||
local option ;
|
|
@ -1,26 +0,0 @@
|
|||||||
--- boost_1_66_0/tools/build/src/engine/build.jam~ 2018-02-07 21:36:14.552201421 +0000
|
|
||||||
+++ boost_1_66_0/tools/build/src/engine/build.jam 2018-02-07 21:36:29.014173266 +0000
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
#~ http://www.boost.org/LICENSE_1_0.txt)
|
|
||||||
|
|
||||||
# Clean env vars of any "extra" empty values.
|
|
||||||
-for local v in ARGV CC CFLAGS LIBS
|
|
||||||
+for local v in ARGV CC CFLAGS LIBS RPM_OPT_FLAGS RPM_LD_FLAGS
|
|
||||||
{
|
|
||||||
local values ;
|
|
||||||
for local x in $($(v))
|
|
||||||
@@ -215,12 +215,12 @@
|
|
||||||
: -L$(--python-lib[1]) -l$(--python-lib[2]) ;
|
|
||||||
## GCC 2.x, 3.x, 4.x
|
|
||||||
toolset gcc gcc : "-o " : -D
|
|
||||||
- : -pedantic -fno-strict-aliasing
|
|
||||||
+ : -pedantic -fno-strict-aliasing $(RPM_OPT_FLAGS)
|
|
||||||
[ opt --release : [ opt --symbols : -g : -s ] -O3 ]
|
|
||||||
[ opt --debug : -g -O0 -fno-inline ]
|
|
||||||
[ opt --profile : -O3 -g -pg ]
|
|
||||||
-I$(--python-include) -I$(--extra-include) -Wno-long-long
|
|
||||||
- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
|
|
||||||
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) $(RPM_LD_FLAGS) ;
|
|
||||||
## GCC 2.x, 3.x on CYGWIN but without cygwin1.dll
|
|
||||||
toolset gcc-nocygwin gcc : "-o " : -D
|
|
||||||
: -s -O3 -mno-cygwin
|
|
@ -1,49 +0,0 @@
|
|||||||
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2017-12-13 23:56:50.000000000 +0000
|
|
||||||
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 12:48:26.264755316 +0000
|
|
||||||
@@ -603,7 +603,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)" -c -o "$(<:W)" "$(>:W)"
|
|
||||||
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
|
|
||||||
}
|
|
||||||
|
|
||||||
actions compile.c bind PCH_FILE
|
|
||||||
@@ -613,7 +613,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)" "$(>:W)" -E >"$(<:W)"
|
|
||||||
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
|
|
||||||
}
|
|
||||||
|
|
||||||
actions compile.c.preprocess bind PCH_FILE
|
|
||||||
@@ -755,17 +755,17 @@ 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 <warnings>off : -w ;
|
|
||||||
-toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
|
|
||||||
-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ;
|
|
||||||
+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 : ;
|
|
||||||
+toolset.flags gcc.compile OPTIONS <warnings>on : ;
|
|
||||||
+toolset.flags gcc.compile OPTIONS <warnings>all : ;
|
|
||||||
toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
|
|
||||||
|
|
||||||
toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
|
|
@ -1,23 +0,0 @@
|
|||||||
From fdbdb94db64e888fce90fe519be23c2a4396a82e Mon Sep 17 00:00:00 2001
|
|
||||||
From: pradeep <pradeep@arrayfire.com>
|
|
||||||
Date: Tue, 8 May 2018 14:53:38 +0530
|
|
||||||
Subject: [PATCH 1/2] Fix return var qualifier in svm_ptr::get_context
|
|
||||||
|
|
||||||
Lack of `const` qualifier is throwing errors with GCC 8.1
|
|
||||||
---
|
|
||||||
include/boost/compute/memory/svm_ptr.hpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/include/boost/compute/memory/svm_ptr.hpp b/include/boost/compute/memory/svm_ptr.hpp
|
|
||||||
index c8753f5b..56cf1268 100644
|
|
||||||
--- a/include/boost/compute/memory/svm_ptr.hpp
|
|
||||||
+++ b/include/boost/compute/memory/svm_ptr.hpp
|
|
||||||
@@ -126,7 +126,7 @@ class svm_ptr
|
|
||||||
return m_ptr - other.m_ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
- context& get_context() const
|
|
||||||
+ const context& get_context() const
|
|
||||||
{
|
|
||||||
return m_context;
|
|
||||||
}
|
|
@ -1,62 +0,0 @@
|
|||||||
--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200
|
|
||||||
+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200
|
|
||||||
@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti
|
|
||||||
# using python : 2.3 : /usr/local/bin/python ;
|
|
||||||
#
|
|
||||||
rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
|
|
||||||
- : condition * : extension-suffix ? )
|
|
||||||
+ : condition * : extension-suffix ? : abi-letters ? )
|
|
||||||
{
|
|
||||||
project.push-current $(.project) ;
|
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ;
|
|
||||||
+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ;
|
|
||||||
|
|
||||||
project.pop-current ;
|
|
||||||
}
|
|
||||||
@@ -653,7 +653,7 @@ local rule system-library-dependencies (
|
|
||||||
|
|
||||||
# Declare a target to represent Python's library.
|
|
||||||
#
|
|
||||||
-local rule declare-libpython-target ( version ? : requirements * )
|
|
||||||
+local rule declare-libpython-target ( version ? : requirements * : abi-letters ? )
|
|
||||||
{
|
|
||||||
# Compute the representation of Python version in the name of Python's
|
|
||||||
# library file.
|
|
||||||
@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
|
|
||||||
}
|
|
||||||
|
|
||||||
# Declare it.
|
|
||||||
- lib python.lib : : <name>python$(lib-version) $(requirements) ;
|
|
||||||
+ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# Implementation of init.
|
|
||||||
local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
|
|
||||||
- condition * : extension-suffix ? )
|
|
||||||
+ condition * : extension-suffix ? : abi-letters ? )
|
|
||||||
{
|
|
||||||
local prefix ;
|
|
||||||
local exec-prefix ;
|
|
||||||
@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
|
|
||||||
extension-suffix ?= _d ;
|
|
||||||
}
|
|
||||||
extension-suffix ?= "" ;
|
|
||||||
+ abi-letters ?= "" ;
|
|
||||||
|
|
||||||
local cmds-to-try ;
|
|
||||||
|
|
||||||
@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- declare-libpython-target $(version) : $(target-requirements) ;
|
|
||||||
+ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ;
|
|
||||||
|
|
||||||
# This is an evil hack. On, Windows, when Python is embedded, nothing
|
|
||||||
# seems to set up sys.path to include Python's standard library
|
|
@ -1,39 +0,0 @@
|
|||||||
From 660487c43fde76f3e64f1cb2e644500da92fe582 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
|
|
||||||
Date: Fri, 9 Feb 2018 18:20:30 +0100
|
|
||||||
Subject: [PATCH] Fix build with Python 3.7
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Python 3.7 changes the return type of _PyUnicode_AsString()
|
|
||||||
from void* to const char* -- causing the build of boost-python
|
|
||||||
to fail.
|
|
||||||
|
|
||||||
Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
|
|
||||||
---
|
|
||||||
src/converter/builtin_converters.cpp | 7 ++++++-
|
|
||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
|
|
||||||
index 1c28af7fc..ee2d5b479 100644
|
|
||||||
--- a/libs/python/src/converter/builtin_converters.cpp
|
|
||||||
+++ b/libs/python/src/converter/builtin_converters.cpp
|
|
||||||
@@ -45,11 +45,16 @@ namespace
|
|
||||||
{
|
|
||||||
return PyString_Check(obj) ? PyString_AsString(obj) : 0;
|
|
||||||
}
|
|
||||||
-#else
|
|
||||||
+#elif PY_VERSION_HEX < 0x03070000
|
|
||||||
void* convert_to_cstring(PyObject* obj)
|
|
||||||
{
|
|
||||||
return PyUnicode_Check(obj) ? _PyUnicode_AsString(obj) : 0;
|
|
||||||
}
|
|
||||||
+#else
|
|
||||||
+ void* convert_to_cstring(PyObject* obj)
|
|
||||||
+ {
|
|
||||||
+ return PyUnicode_Check(obj) ? const_cast<void*>(reinterpret_cast<const void*>(_PyUnicode_AsString(obj))) : 0;
|
|
||||||
+ }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Given a target type and a SlotPolicy describing how to perform a
|
|
@ -1,15 +0,0 @@
|
|||||||
--- boost_1_66_0/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp~ 2018-02-23 16:59:53.785141676 +0000
|
|
||||||
+++ boost_1_66_0/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp 2018-02-23 17:00:16.838092946 +0000
|
|
||||||
@@ -68,7 +68,11 @@
|
|
||||||
typedef unsignedtype type; \
|
|
||||||
static type call(signedtype n) \
|
|
||||||
{ \
|
|
||||||
- return static_cast<unsignedtype>((n >= 0) ? n : -n); \
|
|
||||||
+ if (n >= 0) \
|
|
||||||
+ return n; \
|
|
||||||
+ if (n == std::numeric_limits<signedtype>::min()) \
|
|
||||||
+ return (unsignedtype)n; \
|
|
||||||
+ return (unsignedtype)(-n); \
|
|
||||||
} \
|
|
||||||
} \
|
|
||||||
/**/
|
|
37
boost-1.73-locale-empty-vector.patch
Normal file
37
boost-1.73-locale-empty-vector.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From daf4ef50c88c2b9a6bf2c40b537eebc202caad6e Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?S=C3=A9bastien=20Gonzalve?=
|
||||||
|
<sebastien.gonzalve@aliceadsl.fr>
|
||||||
|
Date: Sat, 14 Nov 2020 10:39:47 +0100
|
||||||
|
Subject: [PATCH] Do not try to access element when vector is empty
|
||||||
|
|
||||||
|
Trying to access tmp[0] causes a crash on Fedora when assertion on STL
|
||||||
|
are enabled.
|
||||||
|
|
||||||
|
/usr/include/c++/10/bits/stl_vector.h:1045: std::vector<_Tp, _Alloc>::reference std::vector<_Tp, _Alloc>::operator[](std::vector<_Tp, _Alloc>::size_type) [with _Tp = unsigned char; _Alloc = std::allocator<unsigned char>; std::vector<_Tp, _Alloc>::reference = unsigned char&; std::vector<_Tp, _Alloc>::size_type = long unsigned int]: Assertion '__builtin_expect(__n < this->size(), true)' failed.
|
||||||
|
|
||||||
|
This patch just passes nullptr as pointer to getSortKey() when tmp size
|
||||||
|
is 0, preventing dereferencing elements in empty vector.
|
||||||
|
|
||||||
|
I guess that &tmp[0] should be optimized as 'no real access' when
|
||||||
|
disabling assertion, but actually leads to crash when assert are
|
||||||
|
enabled.
|
||||||
|
---
|
||||||
|
src/icu/collator.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libs/locale/src/icu/collator.cpp b/libs/locale/src/icu/collator.cpp
|
||||||
|
index 7f1ea6a..dc59e8c 100644
|
||||||
|
--- a/libs/locale/src/icu/collator.cpp
|
||||||
|
+++ b/libs/locale/src/icu/collator.cpp
|
||||||
|
@@ -93,7 +93,7 @@ namespace boost {
|
||||||
|
std::vector<uint8_t> tmp;
|
||||||
|
tmp.resize(str.length());
|
||||||
|
icu::Collator *collate = get_collator(level);
|
||||||
|
- int len = collate->getSortKey(str,&tmp[0],tmp.size());
|
||||||
|
+ int len = collate->getSortKey(str,tmp.empty()?nullptr:&tmp[0],tmp.size());
|
||||||
|
if(len > int(tmp.size())) {
|
||||||
|
tmp.resize(len);
|
||||||
|
collate->getSortKey(str,&tmp[0],tmp.size());
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
28
boost-1.73.0-cmakedir.patch
Normal file
28
boost-1.73.0-cmakedir.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
--- 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
|
114
boost-1.75.0-remove-deprecated-boost-iterator.patch
Normal file
114
boost-1.75.0-remove-deprecated-boost-iterator.patch
Normal file
@ -0,0 +1,114 @@
|
|||||||
|
From f364ee7be2bb1a44a2724d92f67490deaf19dc5e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrey Semashev <andrey.semashev@gmail.com>
|
||||||
|
Date: Mon, 11 May 2020 19:59:23 +0300
|
||||||
|
Subject: [PATCH] Removed usage of deprecated header boost/detail/iterator.hpp.
|
||||||
|
|
||||||
|
The header was deprecated in favor of <iterator>. It generates compiler
|
||||||
|
warnings and will be removed in a future release.
|
||||||
|
---
|
||||||
|
boost/detail/algorithm.hpp | 2 +-
|
||||||
|
boost/graph/adjacency_iterator.hpp | 6 +++---
|
||||||
|
boost/graph/detail/adjacency_list.hpp | 5 +++--
|
||||||
|
boost/graph/incremental_components.hpp | 6 +++---
|
||||||
|
4 files changed, 10 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/boost/detail/algorithm.hpp b/boost/detail/algorithm.hpp
|
||||||
|
index 7793fb357..9b3195cbf 100644
|
||||||
|
--- a/boost/detail/algorithm.hpp
|
||||||
|
+++ b/boost/detail/algorithm.hpp
|
||||||
|
@@ -30,7 +30,7 @@
|
||||||
|
|
||||||
|
#ifndef BOOST_ALGORITHM_HPP
|
||||||
|
#define BOOST_ALGORITHM_HPP
|
||||||
|
-#include <boost/detail/iterator.hpp>
|
||||||
|
+
|
||||||
|
// Algorithms on sequences
|
||||||
|
//
|
||||||
|
// The functions in this file have not yet gone through formal
|
||||||
|
diff --git a/boost/graph/adjacency_iterator.hpp b/boost/graph/adjacency_iterator.hpp
|
||||||
|
index 5325e7875..4693e3a3a 100644
|
||||||
|
--- a/boost/graph/adjacency_iterator.hpp
|
||||||
|
+++ b/boost/graph/adjacency_iterator.hpp
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
#ifndef BOOST_ADJACENCY_ITERATOR_HPP
|
||||||
|
#define BOOST_ADJACENCY_ITERATOR_HPP
|
||||||
|
|
||||||
|
-#include <boost/detail/iterator.hpp>
|
||||||
|
+#include <iterator>
|
||||||
|
#include <boost/iterator/iterator_adaptor.hpp>
|
||||||
|
#include <boost/graph/graph_traits.hpp>
|
||||||
|
|
||||||
|
@@ -45,7 +45,7 @@ template < class Graph,
|
||||||
|
class adjacency_iterator_generator
|
||||||
|
{
|
||||||
|
typedef
|
||||||
|
- typename boost::detail::iterator_traits< OutEdgeIter >::difference_type
|
||||||
|
+ typename std::iterator_traits< OutEdgeIter >::difference_type
|
||||||
|
difference_type;
|
||||||
|
|
||||||
|
public:
|
||||||
|
@@ -81,7 +81,7 @@ template < class Graph,
|
||||||
|
class inv_adjacency_iterator_generator
|
||||||
|
{
|
||||||
|
typedef
|
||||||
|
- typename boost::detail::iterator_traits< InEdgeIter >::difference_type
|
||||||
|
+ typename std::iterator_traits< InEdgeIter >::difference_type
|
||||||
|
difference_type;
|
||||||
|
|
||||||
|
public:
|
||||||
|
diff --git a/boost/graph/detail/adjacency_list.hpp b/boost/graph/detail/adjacency_list.hpp
|
||||||
|
index 4b11fa516..c1a2ada23 100644
|
||||||
|
--- a/boost/graph/detail/adjacency_list.hpp
|
||||||
|
+++ b/boost/graph/detail/adjacency_list.hpp
|
||||||
|
@@ -21,6 +21,7 @@
|
||||||
|
#include <boost/range/irange.hpp>
|
||||||
|
#include <boost/graph/graph_traits.hpp>
|
||||||
|
#include <memory>
|
||||||
|
+#include <iterator>
|
||||||
|
#include <algorithm>
|
||||||
|
#include <boost/limits.hpp>
|
||||||
|
|
||||||
|
@@ -2370,7 +2371,7 @@ namespace detail
|
||||||
|
typedef typename OutEdgeList::size_type degree_size_type;
|
||||||
|
typedef typename OutEdgeList::iterator OutEdgeIter;
|
||||||
|
|
||||||
|
- typedef boost::detail::iterator_traits< OutEdgeIter >
|
||||||
|
+ typedef std::iterator_traits< OutEdgeIter >
|
||||||
|
OutEdgeIterTraits;
|
||||||
|
typedef
|
||||||
|
typename OutEdgeIterTraits::iterator_category OutEdgeIterCat;
|
||||||
|
@@ -2398,7 +2399,7 @@ namespace detail
|
||||||
|
|
||||||
|
// Edge Iterator
|
||||||
|
|
||||||
|
- typedef boost::detail::iterator_traits< EdgeIter > EdgeIterTraits;
|
||||||
|
+ typedef std::iterator_traits< EdgeIter > EdgeIterTraits;
|
||||||
|
typedef typename EdgeIterTraits::iterator_category EdgeIterCat;
|
||||||
|
typedef typename EdgeIterTraits::difference_type EdgeIterDiff;
|
||||||
|
|
||||||
|
diff --git a/boost/graph/incremental_components.hpp b/boost/graph/incremental_components.hpp
|
||||||
|
index 1ad8c9403..f16882e2a 100644
|
||||||
|
--- a/boost/graph/incremental_components.hpp
|
||||||
|
+++ b/boost/graph/incremental_components.hpp
|
||||||
|
@@ -13,10 +13,10 @@
|
||||||
|
#ifndef BOOST_INCREMENTAL_COMPONENTS_HPP
|
||||||
|
#define BOOST_INCREMENTAL_COMPONENTS_HPP
|
||||||
|
|
||||||
|
-#include <boost/detail/iterator.hpp>
|
||||||
|
+#include <boost/tuple/tuple.hpp>
|
||||||
|
#include <boost/graph/detail/incremental_components.hpp>
|
||||||
|
#include <boost/iterator/counting_iterator.hpp>
|
||||||
|
-#include <boost/make_shared.hpp>
|
||||||
|
+#include <boost/smart_ptr/make_shared.hpp>
|
||||||
|
#include <boost/pending/disjoint_sets.hpp>
|
||||||
|
#include <iterator>
|
||||||
|
|
||||||
|
@@ -69,7 +69,7 @@ void compress_components(ParentIterator first, ParentIterator last)
|
||||||
|
}
|
||||||
|
|
||||||
|
template < class ParentIterator >
|
||||||
|
-typename boost::detail::iterator_traits< ParentIterator >::difference_type
|
||||||
|
+typename std::iterator_traits< ParentIterator >::difference_type
|
||||||
|
component_count(ParentIterator first, ParentIterator last)
|
||||||
|
{
|
||||||
|
std::ptrdiff_t count = 0;
|
35
boost-1.76.0-enum_type_object-type-python-3.11.patch
Normal file
35
boost-1.76.0-enum_type_object-type-python-3.11.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From ae5da2a7e8f1111757d8a474095486a5b22aa12d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Victor Stinner <vstinner@python.org>
|
||||||
|
Date: Mon, 25 Apr 2022 10:51:46 +0200
|
||||||
|
Subject: [PATCH] Fix enum_type_object type on Python 3.11
|
||||||
|
|
||||||
|
The enum_type_object type inherits from PyLong_Type which is not tracked
|
||||||
|
by the GC. Instances doesn't have to be tracked by the GC: remove the
|
||||||
|
Py_TPFLAGS_HAVE_GC flag.
|
||||||
|
|
||||||
|
The Python C API documentation says:
|
||||||
|
|
||||||
|
"To create a container type, the tp_flags field of the type object
|
||||||
|
must include the Py_TPFLAGS_HAVE_GC and provide an implementation of
|
||||||
|
the tp_traverse handler."
|
||||||
|
|
||||||
|
https://docs.python.org/dev/c-api/gcsupport.html
|
||||||
|
|
||||||
|
The new exception was introduced in Python 3.11 by:
|
||||||
|
https://github.com/python/cpython/issues/88429
|
||||||
|
---
|
||||||
|
libs/python/src/object/enum.cpp | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libs/python/src/object/enum.cpp b/libs/python/src/object/enum.cpp
|
||||||
|
index 293e705899..5753b32e07 100644
|
||||||
|
--- a/libs/python/src/object/enum.cpp
|
||||||
|
+++ b/libs/python/src/object/enum.cpp
|
||||||
|
@@ -113,7 +113,6 @@ static PyTypeObject enum_type_object = {
|
||||||
|
#if PY_VERSION_HEX < 0x03000000
|
||||||
|
| Py_TPFLAGS_CHECKTYPES
|
||||||
|
#endif
|
||||||
|
- | Py_TPFLAGS_HAVE_GC
|
||||||
|
| Py_TPFLAGS_BASETYPE, /* tp_flags */
|
||||||
|
0, /* tp_doc */
|
||||||
|
0, /* tp_traverse */
|
32
boost-1.76.0-fix-narrowing-conversions-for-ppc.patch
Normal file
32
boost-1.76.0-fix-narrowing-conversions-for-ppc.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
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
|
||||||
|
--- a/include/boost/numeric/interval/detail/ppc_rounding_control.hpp
|
||||||
|
+++ b/include/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
|
||||||
|
{
|
27
boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch
Normal file
27
boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From d1343f28dcbe25b100b082b34775bd92ead4602c Mon Sep 17 00:00:00 2001
|
||||||
|
From: jzmaddock <john@johnmaddock.co.uk>
|
||||||
|
Date: Tue, 25 Jan 2022 09:27:40 +0000
|
||||||
|
Subject: [PATCH] Update gcc Intel intrinsic usage config. Fixes
|
||||||
|
https://github.com/boostorg/multiprecision/issues/419.
|
||||||
|
|
||||||
|
---
|
||||||
|
include/boost/multiprecision/cpp_int/intel_intrinsics.hpp | 6 +++++-
|
||||||
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
|
||||||
|
index eb4624bb4..37717cd51 100644
|
||||||
|
--- a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
|
||||||
|
+++ b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
|
||||||
|
@@ -19,7 +19,11 @@
|
||||||
|
// If this is GCC/clang, then check that the actual intrinsic exists:
|
||||||
|
//
|
||||||
|
#if defined(__has_builtin) && defined(__GNUC__)
|
||||||
|
-#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) && !(defined(BOOST_GCC) && (__GNUC__ >= 9))
|
||||||
|
+#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) \
|
||||||
|
+ && !(defined(BOOST_GCC) && (__GNUC__ >= 9) \
|
||||||
|
+ && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)\
|
||||||
|
+ || defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_AMD64) \
|
||||||
|
+ || defined(_M_X64) || defined(__amd64__) || defined(_M_X64)))
|
||||||
|
#undef BOOST_MP_HAS_IMMINTRIN_H
|
||||||
|
#endif
|
||||||
|
#elif defined(BOOST_MP_HAS_IMMINTRIN_H) && defined(__GNUC__) && !(defined(BOOST_GCC) && (__GNUC__ >= 9))
|
1263
boost-1.76.0-ptr_cont-xml.patch
Normal file
1263
boost-1.76.0-ptr_cont-xml.patch
Normal file
File diff suppressed because it is too large
Load Diff
34
boost-1.76.0-random-test.patch
Normal file
34
boost-1.76.0-random-test.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From c3ada7a1b2b54f4b27585f72308a76984f8489b4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: jzmaddock <john@johnmaddock.co.uk>
|
||||||
|
Date: Tue, 16 Mar 2021 10:47:16 +0000
|
||||||
|
Subject: [PATCH] Add missing #includes.
|
||||||
|
|
||||||
|
---
|
||||||
|
test/multiprecision_float_test.cpp | 1 +
|
||||||
|
test/multiprecision_int_test.cpp | 1 +
|
||||||
|
2 files changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/test/multiprecision_float_test.cpp b/test/multiprecision_float_test.cpp
|
||||||
|
index 904c59d8f..bc2a9364d 100644
|
||||||
|
--- boost_1_76_0/libs/random/test/multiprecision_float_test.cpp
|
||||||
|
+++ boost_1_76_0/libs/random/test/multiprecision_float_test.cpp
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
#include <boost/multiprecision/debug_adaptor.hpp>
|
||||||
|
#include <boost/scoped_ptr.hpp>
|
||||||
|
#include <boost/random.hpp>
|
||||||
|
+#include <boost/mpl/list.hpp>
|
||||||
|
#include <sstream>
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/test/multiprecision_int_test.cpp b/test/multiprecision_int_test.cpp
|
||||||
|
index 577e52aff..41ec229b5 100644
|
||||||
|
--- boost_1_76_0/libs/random/test/multiprecision_int_test.cpp
|
||||||
|
+++ boost_1_76_0/libs/random/test/multiprecision_int_test.cpp
|
||||||
|
@@ -32,6 +32,7 @@
|
||||||
|
#include <boost/random/uniform_int.hpp>
|
||||||
|
#include <boost/random/uniform_smallint.hpp>
|
||||||
|
#include <boost/random/discrete_distribution.hpp>
|
||||||
|
+#include <boost/mpl/list.hpp>
|
||||||
|
#include <sstream>
|
||||||
|
|
||||||
|
typedef boost::mpl::list <
|
25
boost-1.78.0-b2-build-flags.patch
Normal file
25
boost-1.78.0-b2-build-flags.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
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
|
||||||
|
|
68
boost-1.78.0-build-optflags.patch
Normal file
68
boost-1.78.0-build-optflags.patch
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
From 739edb2889cb63c281a3597e712988a40bc82829 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas W Rodgers <rodgert@twrodgers.com>
|
||||||
|
Date: Mon, 28 Feb 2022 20:55:14 -0800
|
||||||
|
Subject: [PATCH 1/3] Adjust options for Fedora package build
|
||||||
|
|
||||||
|
---
|
||||||
|
src/tools/gcc.jam | 31 ++++++++++++++++---------------
|
||||||
|
1 file changed, 16 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
|
||||||
|
index 47a11322..543cfd84 100644
|
||||||
|
--- a/tools/build/src/tools/gcc.jam
|
||||||
|
+++ b/tools/build/src/tools/gcc.jam
|
||||||
|
@@ -510,7 +510,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"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<:W)" "$(>:W)"
|
||||||
|
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<:W)" "$(>:W)"
|
||||||
|
}
|
||||||
|
|
||||||
|
actions compile.c bind PCH_FILE
|
||||||
|
@@ -521,6 +521,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"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:W)" -E >"$(<:W)"
|
||||||
|
++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" $(PCH_FILE:D)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:W)" -E >"$(<:W)"
|
||||||
|
}
|
||||||
|
|
||||||
|
actions compile.c.preprocess bind PCH_FILE
|
||||||
|
@@ -623,20 +624,20 @@ 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 <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 <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 : ;
|
||||||
|
+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.35.1
|
||||||
|
|
72
boost-1.78.0-fix-b2-staging.patch
Normal file
72
boost-1.78.0-fix-b2-staging.patch
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
From 78fd284a42caabe8815cb0870b46e5567872e75b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dmitry <grisumbras@gmail.com>
|
||||||
|
Date: Sat, 11 Dec 2021 16:58:23 +0300
|
||||||
|
Subject: [PATCH] Don't skip install targets if there's <build>no in ureqs
|
||||||
|
(#113)
|
||||||
|
|
||||||
|
---
|
||||||
|
src/tools/stage.jam | 4 ++++
|
||||||
|
test/install_build_no.py | 26 ++++++++++++++++++++++++++
|
||||||
|
test/test_all.py | 1 +
|
||||||
|
3 files changed, 31 insertions(+)
|
||||||
|
create mode 100755 test/install_build_no.py
|
||||||
|
|
||||||
|
diff --git a/tools/build/src/tools/stage.jam b/tools/build/src/tools/stage.jam
|
||||||
|
index c5f02e3ba4..325129dc81 100644
|
||||||
|
--- a/tools/build/src/tools/stage.jam
|
||||||
|
+++ b/tools/build/src/tools/stage.jam
|
||||||
|
@@ -478,6 +478,10 @@ class install-target-class : basic-target
|
||||||
|
return [ sequence.unique $(result2) ] ;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ rule skip-from-usage-requirements ( )
|
||||||
|
+ {
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
# Returns true iff 'type' is subtype of some element of 'types-to-include'.
|
||||||
|
#
|
||||||
|
local rule include-type ( type : types-to-include * )
|
||||||
|
diff --git a/tools/build/test/install_build_no.py b/tools/build/test/install_build_no.py
|
||||||
|
new file mode 100755
|
||||||
|
index 0000000000..0ccf3c5cc6
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tools/build/test/install_build_no.py
|
||||||
|
@@ -0,0 +1,26 @@
|
||||||
|
+#!/usr/bin/python
|
||||||
|
+
|
||||||
|
+# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com)
|
||||||
|
+# Distributed under the Boost Software License, Version 1.0.
|
||||||
|
+# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt)
|
||||||
|
+
|
||||||
|
+# Check that <build>no in usage-requirements of dependencies does not affect
|
||||||
|
+# install rule, i.e. a skipped installed target does not affect insallation of
|
||||||
|
+# other targets.
|
||||||
|
+
|
||||||
|
+import BoostBuild
|
||||||
|
+
|
||||||
|
+t = BoostBuild.Tester()
|
||||||
|
+
|
||||||
|
+t.write("a.cpp", "int main() {}\n")
|
||||||
|
+
|
||||||
|
+t.write("jamroot.jam", """
|
||||||
|
+make x : : maker : <build>no ;
|
||||||
|
+exe a : a.cpp ;
|
||||||
|
+install install : x a ;
|
||||||
|
+""")
|
||||||
|
+
|
||||||
|
+t.run_build_system()
|
||||||
|
+t.expect_addition("install/a.exe")
|
||||||
|
+
|
||||||
|
+t.cleanup()
|
||||||
|
diff --git a/tools/build/test/test_all.py b/tools/build/test/test_all.py
|
||||||
|
index b7ef5ad701..9ed729d017 100644
|
||||||
|
--- a/tools/build/test/test_all.py
|
||||||
|
+++ b/tools/build/test/test_all.py
|
||||||
|
@@ -250,6 +250,7 @@ def reorder_tests(tests, first_test):
|
||||||
|
"inherit_toolset",
|
||||||
|
"inherited_dependency",
|
||||||
|
"inline",
|
||||||
|
+ "install_build_no",
|
||||||
|
"libjpeg",
|
||||||
|
"liblzma",
|
||||||
|
"libpng",
|
@ -1,16 +1,24 @@
|
|||||||
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2018-01-19 13:23:45.361330881 +0000
|
From 25e4220a4564a3f8ec22607fcdbee90c81f040d6 Mon Sep 17 00:00:00 2001
|
||||||
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 13:23:45.362330880 +0000
|
From: Thomas W Rodgers <trodgers@redhat.com>
|
||||||
@@ -1191,7 +1191,7 @@ rule link ( targets * : sources * : prop
|
Date: Mon, 28 Feb 2022 21:24:07 -0800
|
||||||
|
Subject: [PATCH 2/3] Adjust options to remove RPATH for Fedora package builds
|
||||||
|
|
||||||
|
---
|
||||||
|
src/tools/gcc.jam | 5 ++---
|
||||||
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
|
||||||
|
index 543cfd84..fd213ccb 100644
|
||||||
|
--- a/tools/build/src/tools/gcc.jam
|
||||||
|
+++ b/tools/build/src/tools/gcc.jam
|
||||||
|
@@ -1045,12 +1045,11 @@ actions link.dll.mingw bind LIBRARIES
|
||||||
|
|
||||||
actions link bind LIBRARIES
|
actions link bind LIBRARIES
|
||||||
{
|
{
|
||||||
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||||
+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
-}
|
||||||
}
|
+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)}
|
||||||
|
|
||||||
rule link.dll ( targets * : sources * : properties * )
|
|
||||||
@@ -1204,7 +1204,7 @@ rule link.dll ( targets * : sources * :
|
|
||||||
# Differs from 'link' above only by -shared.
|
|
||||||
actions link.dll bind LIBRARIES
|
actions link.dll bind LIBRARIES
|
||||||
{
|
{
|
||||||
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||||
@ -18,3 +26,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
###
|
###
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
@ -1,19 +0,0 @@
|
|||||||
*** 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 ()
|
|
24
boost.rpmlintrc
Normal file
24
boost.rpmlintrc
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
# 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.*")
|
984
boost.spec
984
boost.spec
File diff suppressed because it is too large
Load Diff
19
gating.yaml
Normal file
19
gating.yaml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--- !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}
|
6
plans/ci.fmf
Normal file
6
plans/ci.fmf
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
summary: CI Gating Plan
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
directory: tests
|
||||||
|
execute:
|
||||||
|
how: beakerlib
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (boost_1_66_0.tar.bz2) = 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
|
SHA512 (boost_1_78_0.tar.bz2) = 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
|
||||||
|
63
tests/boost-testsuite-sanity/Makefile
Normal file
63
tests/boost-testsuite-sanity/Makefile
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# 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)
|
3
tests/boost-testsuite-sanity/PURPOSE
Normal file
3
tests/boost-testsuite-sanity/PURPOSE
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
PURPOSE of /tools/boost/Sanity/boost-testsuite-sanity
|
||||||
|
Description: boost testing by upstream testsuite
|
||||||
|
Author: Michal Kolar <mkolar@redhat.com>
|
16
tests/boost-testsuite-sanity/main.fmf
Normal file
16
tests/boost-testsuite-sanity/main.fmf
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
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
|
90
tests/boost-testsuite-sanity/runtest.sh
Executable file
90
tests/boost-testsuite-sanity/runtest.sh
Executable file
@ -0,0 +1,90 @@
|
|||||||
|
#!/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 "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
|
||||||
|
rlRun "rlFileSubmit $TmpDir/rpmbuild.log"
|
||||||
|
rlRun "cd $TmpDir/BUILD/boost*"
|
||||||
|
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 $TmpDir/BUILD/boost*/libs/$test_path/test/Jamfile* ]; then
|
||||||
|
rlRun "cd $TmpDir/BUILD/boost*/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
|
5
tests/boost-testsuite-sanity/tests
Normal file
5
tests/boost-testsuite-sanity/tests
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
integer
|
||||||
|
random
|
||||||
|
rational
|
||||||
|
regex
|
||||||
|
timer
|
Loading…
Reference in New Issue
Block a user