basebuilder_pel7ppc64bebuilder0
5 years ago
11 changed files with 2064 additions and 3 deletions
@ -0,0 +1,31 @@
@@ -0,0 +1,31 @@
|
||||
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 |
@ -0,0 +1,13 @@
@@ -0,0 +1,13 @@
|
||||
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) |
@ -0,0 +1,30 @@
@@ -0,0 +1,30 @@
|
||||
--- boost_1_68_0/libs/pool/test/Jamfile.v2.orig 2018-08-01 20:50:52.000000000 +0000 |
||||
+++ boost_1_68_0/libs/pool/test/Jamfile.v2 2018-12-01 17:29:33.322195409 +0000 |
||||
@@ -22,18 +22,18 @@ |
||||
import testing ; |
||||
|
||||
test-suite pool : |
||||
- [ run test_simple_seg_storage.cpp : : : <toolset>msvc:<cxxflags>-wd4267 ] |
||||
- [ run test_pool_alloc.cpp ] |
||||
- [ run pool_msvc_compiler_bug_test.cpp : : : <toolset>msvc:<cxxflags>-wd4512 ] |
||||
- [ run test_msvc_mem_leak_detect.cpp ] |
||||
- [ run test_bug_3349.cpp ] |
||||
- [ run test_bug_4960.cpp ] |
||||
+ [ run test_simple_seg_storage.cpp : : : <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ] |
||||
+ [ run test_pool_alloc.cpp : : : <library>/boost/system//boost_system ] |
||||
+ [ run pool_msvc_compiler_bug_test.cpp : : : <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ] |
||||
+ [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ] |
||||
+ [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ] |
||||
+ [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ] |
||||
[ run test_bug_1252.cpp : : : |
||||
<toolset>clang:<cxxflags>-Wno-c++11-long-long |
||||
<toolset>gcc:<cxxflags>-Wno-long-long |
||||
- <toolset>pathscale:<cxxflags>-Wno-long-long ] |
||||
- [ run test_bug_2696.cpp ] |
||||
- [ 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 ] |
||||
[ compile test_poisoned_macros.cpp ] |
||||
; |
@ -0,0 +1,120 @@
@@ -0,0 +1,120 @@
|
||||
Index: boost/pool/pool.hpp |
||||
=================================================================== |
||||
--- boost/pool/pool.hpp (revision 78317) |
||||
+++ boost/pool/pool.hpp (revision 78326) |
||||
@@ -27,4 +27,6 @@ |
||||
#include <boost/pool/poolfwd.hpp> |
||||
|
||||
+// std::numeric_limits |
||||
+#include <boost/limits.hpp> |
||||
// boost::integer::static_lcm |
||||
#include <boost/integer/common_factor_ct.hpp> |
||||
@@ -358,4 +360,11 @@ |
||||
} |
||||
|
||||
+ size_type max_chunks() const |
||||
+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. |
||||
+ size_type partition_size = alloc_size(); |
||||
+ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type); |
||||
+ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); |
||||
+ } |
||||
+ |
||||
static void * & nextof(void * const ptr) |
||||
{ //! \returns Pointer dereferenced. |
||||
@@ -377,5 +388,7 @@ |
||||
//! the first time that object needs to allocate system memory. |
||||
//! The default is 32. This parameter may not be 0. |
||||
- //! \param nmax_size is the maximum number of chunks to allocate in one block. |
||||
+ //! \param nmax_size is the maximum number of chunks to allocate in one block. |
||||
+ set_next_size(nnext_size); |
||||
+ set_max_size(nmax_size); |
||||
} |
||||
|
||||
@@ -400,7 +413,7 @@ |
||||
} |
||||
void set_next_size(const size_type nnext_size) |
||||
- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. |
||||
- //! \returns nnext_size. |
||||
- next_size = start_size = nnext_size; |
||||
+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. |
||||
+ BOOST_USING_STD_MIN(); |
||||
+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); |
||||
} |
||||
size_type get_max_size() const |
||||
@@ -410,5 +423,6 @@ |
||||
void set_max_size(const size_type nmax_size) |
||||
{ //! Set max_size. |
||||
- max_size = nmax_size; |
||||
+ BOOST_USING_STD_MIN(); |
||||
+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); |
||||
} |
||||
size_type get_requested_size() const |
||||
@@ -713,7 +727,7 @@ |
||||
BOOST_USING_STD_MIN(); |
||||
if(!max_size) |
||||
- next_size <<= 1; |
||||
+ set_next_size(next_size << 1); |
||||
else if( next_size*partition_size/requested_size < max_size) |
||||
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); |
||||
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); |
||||
|
||||
// initialize it, |
||||
@@ -753,7 +767,7 @@ |
||||
BOOST_USING_STD_MIN(); |
||||
if(!max_size) |
||||
- next_size <<= 1; |
||||
+ set_next_size(next_size << 1); |
||||
else if( next_size*partition_size/requested_size < max_size) |
||||
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); |
||||
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); |
||||
|
||||
// initialize it, |
||||
@@ -797,4 +811,6 @@ |
||||
//! \returns Address of chunk n if allocated ok. |
||||
//! \returns 0 if not enough memory for n chunks. |
||||
+ if (n > max_chunks()) |
||||
+ return 0; |
||||
|
||||
const size_type partition_size = alloc_size(); |
||||
@@ -845,7 +861,7 @@ |
||||
BOOST_USING_STD_MIN(); |
||||
if(!max_size) |
||||
- next_size <<= 1; |
||||
+ set_next_size(next_size << 1); |
||||
else if( next_size*partition_size/requested_size < max_size) |
||||
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); |
||||
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); |
||||
|
||||
// insert it into the list, |
||||
Index: libs/pool/test/test_bug_6701.cpp |
||||
=================================================================== |
||||
--- libs/pool/test/test_bug_6701.cpp (revision 78326) |
||||
+++ libs/pool/test/test_bug_6701.cpp (revision 78326) |
||||
@@ -0,0 +1,27 @@ |
||||
+/* Copyright (C) 2012 Étienne Dupuis |
||||
+* |
||||
+* Use, modification and distribution is subject to the |
||||
+* Boost Software License, Version 1.0. (See accompanying |
||||
+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) |
||||
+*/ |
||||
+ |
||||
+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) |
||||
+ |
||||
+#include <boost/pool/object_pool.hpp> |
||||
+#include <boost/limits.hpp> |
||||
+ |
||||
+int main() |
||||
+{ |
||||
+ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768); |
||||
+ |
||||
+ void *x = p.malloc(); |
||||
+ BOOST_ASSERT(!x); |
||||
+ |
||||
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size()); |
||||
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size()); |
||||
+ |
||||
+ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768); |
||||
+ BOOST_ASSERT(!y); |
||||
+ |
||||
+ return 0; |
||||
+} |
@ -0,0 +1,26 @@
@@ -0,0 +1,26 @@
|
||||
--- 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 |
@ -0,0 +1,49 @@
@@ -0,0 +1,49 @@
|
||||
--- 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 ; |
@ -0,0 +1,20 @@
@@ -0,0 +1,20 @@
|
||||
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2018-01-19 13:23:45.361330881 +0000 |
||||
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 13:23:45.362330880 +0000 |
||||
@@ -1191,7 +1191,7 @@ rule link ( targets * : sources * : prop |
||||
|
||||
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)" -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 |
||||
{ |
||||
- "$(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)" "$(.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) |
||||
} |
||||
|
||||
### |
@ -0,0 +1,62 @@
@@ -0,0 +1,62 @@
|
||||
--- 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 |
@ -0,0 +1,21 @@
@@ -0,0 +1,21 @@
|
||||
changequote(`[', `]')dnl |
||||
/* GNU ld script |
||||
|
||||
Boost.Thread header files pull in enough of Boost.System that |
||||
symbols from the latter library are referenced by a compiled object |
||||
that includes Boost.Thread headers. libboost_system-mt.so is among |
||||
libboost_thread-mt.so's DT_NEEDED, but program linker requires that |
||||
missing symbols are satisfied by direct dependency, not by a |
||||
transitive one. Hence this linker script, which brings in the |
||||
Boost.System DSO. */ |
||||
|
||||
INPUT(libboost_thread.so.VERSION) |
||||
INPUT(libboost_system.so.VERSION) |
||||
ifdef([HAS_ATOMIC_FLAG_LOCKFREE],[], |
||||
[ |
||||
/* If the given architecture doesn't have lock-free implementation of |
||||
boost::atomic_flag, the dependency on Boost.Atomic may leak from |
||||
the header files to client binaries. */ |
||||
|
||||
INPUT(libboost_atomic.so.VERSION) |
||||
])dnl |
Loading…
Reference in new issue