commit
80d2eba124
@ -1,13 +1,13 @@
|
||||
diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp
|
||||
index 8b2bc43..d04f2fe 100644
|
||||
index 9966766c6..090be0906 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("€"); }
|
||||
static constexpr const char* name() { return("EUR"); }
|
||||
- static constexpr const char* symbol() { return("€"); }
|
||||
+ static constexpr const char* symbol() { return("€"); }
|
||||
};
|
||||
|
||||
int main()
|
||||
@ -20,3 +20,5 @@ index 8b2bc43..d04f2fe 100644
|
||||
|
||||
|
||||
return 0;
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -1,31 +1,33 @@
|
||||
diff -up boost_1_58_0/libs/pool/test/Jamfile.v2\~ boost_1_58_0/libs/pool/test/Jamfile.v2
|
||||
--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0100
|
||||
+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +0100
|
||||
@@ -28,17 +28,17 @@
|
||||
local Werr = <toolset>gcc:<warnings-as-errors>on <toolset>msvc:<warnings-as-errors>on ;
|
||||
|
||||
@@ -22,18 +22,18 @@ import os ;
|
||||
import testing ;
|
||||
|
||||
test-suite pool :
|
||||
- [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 ]
|
||||
- [ run test_pool_alloc.cpp : : : $(Werr) ]
|
||||
- [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 ]
|
||||
- [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_3349.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_4960.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_1252.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_2696.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_5526.cpp : : : $(Werr) ]
|
||||
+ [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ]
|
||||
+ [ run test_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ]
|
||||
+ [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_3349.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_4960.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_1252.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_2696.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_5526.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
- [ 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 ]
|
||||
- [ run ../example/time_pool_alloc.cpp : : : $(Werr) ]
|
||||
+ [ run ../example/time_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
[ compile test_poisoned_macros.cpp : $(Werr) ]
|
||||
|
||||
#
|
||||
[ compile test_poisoned_macros.cpp ]
|
||||
;
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -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,6 +1,6 @@
|
||||
--- 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
|
||||
@@ -571,7 +571,7 @@ rule compile.fortran ( targets * : sources * : properties * )
|
||||
|
||||
actions compile.c++ bind PCH_FILE
|
||||
{
|
||||
@ -9,7 +9,7 @@
|
||||
}
|
||||
|
||||
actions compile.c bind PCH_FILE
|
||||
@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE
|
||||
@@ -581,7 +581,7 @@ actions compile.c bind PCH_FILE
|
||||
|
||||
actions compile.c++.preprocess bind PCH_FILE
|
||||
{
|
||||
@ -18,7 +18,7 @@
|
||||
}
|
||||
|
||||
actions compile.c.preprocess bind PCH_FILE
|
||||
@@ -755,17 +755,17 @@ actions compile.c.pch
|
||||
@@ -704,19 +704,17 @@ actions compile.c.pch
|
||||
###
|
||||
|
||||
# Declare flags and action for compilation.
|
||||
@ -32,7 +32,9 @@
|
||||
-
|
||||
-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 <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 <optimization>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>speed : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>space : ;
|
||||
@ -47,3 +49,5 @@
|
||||
toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
|
||||
|
||||
toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -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,29 +0,0 @@
|
||||
From 0fce0e589353d772ceda4d493b147138406b22fd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= <moritz.wanzenboeck@catalysts.cc>
|
||||
Date: Wed, 11 Jul 2018 11:57:46 +0200
|
||||
Subject: [PATCH] Add missing return statement in numpy import
|
||||
|
||||
This adds a missing return statement in the python3 specific
|
||||
import logic of boost.python.numpy.
|
||||
|
||||
For python3 wrap_import_array() needs to return a pointer value.
|
||||
The import_array() macro only returns NULL in case of error. The
|
||||
missing return statement is UB, so the compiler can assume it does
|
||||
not happen. This means the compiler can assume the error branch
|
||||
is always taken, so import_array must always fail.
|
||||
---
|
||||
src/numpy/numpy.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/numpy/numpy.cpp b/src/numpy/numpy.cpp
|
||||
index 8e259bc75..3ae2295e3 100644
|
||||
--- a/libs/python/src/numpy/numpy.cpp
|
||||
+++ b/libs/python/src/numpy/numpy.cpp
|
||||
@@ -19,6 +19,7 @@ static void wrap_import_array()
|
||||
static void * wrap_import_array()
|
||||
{
|
||||
import_array();
|
||||
+ return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- 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
|
||||
@@ -99,7 +99,7 @@ py3-version = ;
|
||||
# using python : 2.3 : /usr/local/bin/python ;
|
||||
#
|
||||
rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
|
||||
@ -9,7 +9,7 @@
|
||||
{
|
||||
project.push-current $(.project) ;
|
||||
|
||||
@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
|
||||
@@ -112,7 +112,7 @@ rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
project.pop-current ;
|
||||
}
|
||||
@@ -653,7 +653,7 @@ local rule system-library-dependencies (
|
||||
@@ -668,7 +668,7 @@ rule version-suffix ( version )
|
||||
|
||||
# Declare a target to represent Python's library.
|
||||
#
|
||||
@ -27,7 +27,7 @@
|
||||
{
|
||||
# Compute the representation of Python version in the name of Python's
|
||||
# library file.
|
||||
@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
|
||||
@@ -692,13 +692,13 @@ local rule declare-libpython-target ( version ? : requirements * )
|
||||
}
|
||||
|
||||
# Declare it.
|
||||
@ -43,15 +43,15 @@
|
||||
{
|
||||
local prefix ;
|
||||
local exec-prefix ;
|
||||
@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
|
||||
@@ -714,6 +714,7 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
|
||||
extension-suffix ?= _d ;
|
||||
}
|
||||
extension-suffix ?= "" ;
|
||||
+ abi-letters ?= "" ;
|
||||
|
||||
local cmds-to-try ;
|
||||
|
||||
@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
|
||||
|
||||
@@ -970,7 +971,7 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -60,3 +60,5 @@
|
||||
|
||||
# This is an evil hack. On, Windows, when Python is embedded, nothing
|
||||
# seems to set up sys.path to include Python's standard library
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -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); \
|
||||
} \
|
||||
} \
|
||||
/**/
|
||||
161
boost.spec
161
boost.spec
@ -1,6 +1,7 @@
|
||||
%global boost_docdir __tmp_docdir
|
||||
%global boost_examplesdir __tmp_examplesdir
|
||||
%global version_enc 1_66_0
|
||||
%global version_enc 1_72_0
|
||||
%global version_mid 72
|
||||
%global toplev_dirname %{name}_%{version_enc}
|
||||
%global sonamever %{version}
|
||||
|
||||
@ -20,8 +21,8 @@
|
||||
%bcond_with docs_generated
|
||||
|
||||
Name: boost
|
||||
Version: 1.66.0
|
||||
Release: 18
|
||||
Version: 1.72.0
|
||||
Release: 1
|
||||
Summary: The free peer-reviewed portable C++ source libraries
|
||||
License: Boost and MIT and Python
|
||||
URL: http://www.boost.org
|
||||
@ -52,27 +53,9 @@ Patch62: boost-1.66.0-python-abi_letters.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1190039
|
||||
Patch65: boost-1.66.0-build-optflags.patch
|
||||
|
||||
Patch68: boost-1.66.0-address-model.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1318383
|
||||
Patch82: boost-1.66.0-no-rpath.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1541035
|
||||
Patch83: boost-1.66.0-bjam-build-flags.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1545092
|
||||
Patch84: boost-1.66.0-spirit-abs-overflow.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1585515
|
||||
Patch85: boost-1.66.0-compute.patch
|
||||
|
||||
# https://github.com/boostorg/python/pull/186
|
||||
Patch86: boost-1.66.0-python37.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1596468
|
||||
# https://github.com/boostorg/python/pull/218
|
||||
Patch87: boost-1.66.0-numpy3.patch
|
||||
|
||||
Requires: boost-atomic%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-chrono%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-container%{?_isa} = %{version}-%{release}
|
||||
@ -90,7 +73,6 @@ Requires: boost-program-options%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-random%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-regex%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-signals%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-stacktrace%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-system%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-test%{?_isa} = %{version}-%{release}
|
||||
@ -98,6 +80,7 @@ Requires: boost-thread%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-timer%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-type_erasure%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-wave%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-contract%{?_isa} = %{version}-%{release}
|
||||
|
||||
BuildRequires: gcc-c++ m4 tcl gdb
|
||||
BuildRequires: libstdc++-devel bzip2-devel zlib-devel
|
||||
@ -106,6 +89,14 @@ BuildRequires: python2-numpy python3-numpy
|
||||
%if %{with quadmath}
|
||||
BuildRequires: libquadmath-devel
|
||||
%endif
|
||||
BuildRequires: boost-atomic boost-build boost-chrono boost-container boost-context
|
||||
BuildRequires: boost-coroutine boost-date-time boost-devel boost-doctools boost-wave
|
||||
BuildRequires: boost-examples boost-fiber boost-filesystem boost-graph boost-iostreams
|
||||
BuildRequires: boost-jam boost-locale boost-log boost-math boost-numpy2 boost-numpy3
|
||||
BuildRequires: boost-program-options boost-python2 boost-python2-devel boost-python3
|
||||
BuildRequires: boost-python3-devel boost-random boost-regex boost-serialization
|
||||
BuildRequires: boost-stacktrace boost-system boost-test boost-thread boost-timer boost-type_erasure
|
||||
Obsoletes: boost-signals
|
||||
|
||||
%description
|
||||
Boost provides free peer-reviewed portable C++ source libraries. The
|
||||
@ -118,6 +109,13 @@ the new C++11 Standard. C++11 also includes several more Boost
|
||||
libraries in addition to those from TR1. More Boost libraries are
|
||||
proposed for standardization in C++17.
|
||||
|
||||
%package contract
|
||||
Summary: Boost.Contract runtime library
|
||||
|
||||
%description contract
|
||||
Runtime support for Boost.Contract, a library that implements
|
||||
Design by Contract or DbC or contract programming.
|
||||
|
||||
%package atomic
|
||||
Summary: C++11-style atomic<>
|
||||
|
||||
@ -364,13 +362,6 @@ Summary: Run-time component of boost serialization library
|
||||
|
||||
Run-time support for serialization for persistence and marshaling.
|
||||
|
||||
%package signals
|
||||
Summary: Run-time component of boost signals and slots library
|
||||
|
||||
%description signals
|
||||
|
||||
Managed signals & slots callback implementation (thread-safe version 2).
|
||||
|
||||
%package stacktrace
|
||||
Summary: Run-time component of boost stacktrace library
|
||||
|
||||
@ -683,13 +674,7 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x
|
||||
%patch61 -p1
|
||||
%patch62 -p1
|
||||
%patch65 -p1
|
||||
%patch68 -p1
|
||||
%patch82 -p1
|
||||
%patch83 -p1
|
||||
%patch84 -p1
|
||||
%patch85 -p2
|
||||
%patch86 -p1
|
||||
%patch87 -p1
|
||||
|
||||
%build
|
||||
: PYTHON2_VERSION=%{python2_version}
|
||||
@ -877,12 +862,19 @@ echo ============================= install serial-py3 ==================
|
||||
echo ============================= install Boost.Build ==================
|
||||
(cd tools/build
|
||||
./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install
|
||||
cp %{_builddir}/%{name}_%{version_enc}/tools/build/src/build/*.py $RPM_BUILD_ROOT%{_datadir}/boost-build/src/build/
|
||||
cp %{_builddir}/%{name}_%{version_enc}/tools/build/src/tools/*.py $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/
|
||||
chmod -x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/build/alias.py
|
||||
chmod +x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py
|
||||
rm -f $RPM_BUILD_ROOT%{_bindir}/b2
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/src/build/project.ann.py
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp
|
||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/cmake
|
||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.so.1
|
||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.so.1.%{version_mid}
|
||||
install -m 755 %{_builddir}/%{name}_%{version_enc}/tools/build/b2 $RPM_BUILD_ROOT%{_bindir}/bjam
|
||||
%{__install} -p -m 644 v2/doc/bjam.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1
|
||||
cp %{_libdir}/libboost_*.so.1.66.* $RPM_BUILD_ROOT%{_libdir}
|
||||
)
|
||||
|
||||
echo ============================= install Boost.QuickBook ==================
|
||||
@ -971,55 +963,73 @@ fi
|
||||
|
||||
%files
|
||||
%license LICENSE_1_0.txt
|
||||
%exclude %{_libdir}/libboost_signals.so.1.66.0
|
||||
|
||||
%files contract
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_contract.so.%{sonamever}
|
||||
|
||||
%files atomic
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_atomic.so.%{sonamever}
|
||||
%{_libdir}/libboost_atomic.so.1.66.*
|
||||
|
||||
%files chrono
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_chrono.so.%{sonamever}
|
||||
%{_libdir}/libboost_chrono.so.1.66.*
|
||||
|
||||
%files container
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_container.so.%{sonamever}
|
||||
%{_libdir}/libboost_container.so.1.66.*
|
||||
|
||||
%files context
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_context.so.%{sonamever}
|
||||
%{_libdir}/libboost_context.so.1.66.*
|
||||
|
||||
%files coroutine
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_coroutine.so.%{sonamever}
|
||||
%{_libdir}/libboost_coroutine.so.1.66.*
|
||||
|
||||
%files date-time
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_date_time.so.%{sonamever}
|
||||
%{_libdir}/libboost_date_time.so.1.66.*
|
||||
|
||||
%files fiber
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_fiber.so.%{sonamever}
|
||||
%{_libdir}/libboost_fiber.so.1.66.*
|
||||
|
||||
%files filesystem
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_filesystem.so.%{sonamever}
|
||||
%{_libdir}/libboost_filesystem.so.1.66.*
|
||||
|
||||
%files graph
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_graph.so.%{sonamever}
|
||||
%{_libdir}/libboost_graph.so.1.66.*
|
||||
|
||||
%files iostreams
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_iostreams.so.%{sonamever}
|
||||
%{_libdir}/libboost_iostreams.so.1.66.*
|
||||
|
||||
%files locale
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_locale.so.%{sonamever}
|
||||
%{_libdir}/libboost_locale.so.1.66.*
|
||||
|
||||
%files log
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_log.so.%{sonamever}
|
||||
%{_libdir}/libboost_log.so.1.66.*
|
||||
%{_libdir}/libboost_log_setup.so.%{sonamever}
|
||||
%{_libdir}/libboost_log_setup.so.1.66.*
|
||||
|
||||
%files math
|
||||
%license LICENSE_1_0.txt
|
||||
@ -1030,92 +1040,113 @@ fi
|
||||
%{_libdir}/libboost_math_tr1f.so.%{sonamever}
|
||||
%{_libdir}/libboost_math_tr1l.so.%{sonamever}
|
||||
|
||||
%{_libdir}/libboost_math_c99.so.1.66.*
|
||||
%{_libdir}/libboost_math_c99f.so.1.66.*
|
||||
%{_libdir}/libboost_math_c99l.so.1.66.*
|
||||
%{_libdir}/libboost_math_tr1.so.1.66.*
|
||||
%{_libdir}/libboost_math_tr1f.so.1.66.*
|
||||
%{_libdir}/libboost_math_tr1l.so.1.66.*
|
||||
%files numpy2
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_numpy.so.%{sonamever}
|
||||
%{_libdir}/libboost_numpy27.so.%{sonamever}
|
||||
%{_libdir}/libboost_numpy.so.1.66.*
|
||||
|
||||
%files numpy3
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_numpy3.so.%{sonamever}
|
||||
%{_libdir}/libboost_numpy37.so.%{sonamever}
|
||||
%{_libdir}/libboost_numpy3.so.1.66.*
|
||||
|
||||
%files test
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_prg_exec_monitor.so.%{sonamever}
|
||||
%{_libdir}/libboost_unit_test_framework.so.%{sonamever}
|
||||
%{_libdir}/libboost_prg_exec_monitor.so.1.66.*
|
||||
%{_libdir}/libboost_unit_test_framework.so.1.66.*
|
||||
|
||||
%files program-options
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_program_options.so.%{sonamever}
|
||||
%{_libdir}/libboost_program_options.so.1.66.*
|
||||
|
||||
%files python2
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_python.so.%{sonamever}
|
||||
%{_libdir}/libboost_python27.so.%{sonamever}
|
||||
%{_libdir}/libboost_python.so.1.66.*
|
||||
|
||||
%files python2-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_numpy.so
|
||||
%{_libdir}/libboost_python.so
|
||||
%{_libdir}/libboost_numpy27.so
|
||||
%{_libdir}/libboost_python27.so
|
||||
|
||||
%files python3
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_python3.so.%{sonamever}
|
||||
%{_libdir}/libboost_python37.so.%{sonamever}
|
||||
%{_libdir}/libboost_python3.so.1.66.*
|
||||
|
||||
%files python3-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_numpy3.so
|
||||
%{_libdir}/libboost_python3.so
|
||||
%{_libdir}/libboost_numpy37.so
|
||||
%{_libdir}/libboost_python37.so
|
||||
|
||||
%files random
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_random.so.%{sonamever}
|
||||
%{_libdir}/libboost_random.so.1.66.*
|
||||
|
||||
%files regex
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_regex.so.%{sonamever}
|
||||
%{_libdir}/libboost_regex.so.1.66.*
|
||||
|
||||
%files serialization
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_serialization.so.%{sonamever}
|
||||
%{_libdir}/libboost_wserialization.so.%{sonamever}
|
||||
|
||||
%files signals
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_signals.so.%{sonamever}
|
||||
|
||||
%{_libdir}/libboost_serialization.so.1.66.*
|
||||
%{_libdir}/libboost_wserialization.so.1.66.*
|
||||
%files stacktrace
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_stacktrace_addr2line.so.%{sonamever}
|
||||
%{_libdir}/libboost_stacktrace_basic.so.%{sonamever}
|
||||
%{_libdir}/libboost_stacktrace_noop.so.%{sonamever}
|
||||
|
||||
%{_libdir}/libboost_stacktrace_addr2line.so.1.66.*
|
||||
%{_libdir}/libboost_stacktrace_basic.so.1.66.*
|
||||
%{_libdir}/libboost_stacktrace_noop.so.1.66.*
|
||||
%files system
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_system.so.%{sonamever}
|
||||
%{_libdir}/libboost_system.so.1.66.*
|
||||
|
||||
%files thread
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_thread.so.%{sonamever}
|
||||
%{_libdir}/libboost_thread.so.1.66.*
|
||||
|
||||
%files timer
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_timer.so.%{sonamever}
|
||||
%{_libdir}/libboost_timer.so.1.66.*
|
||||
|
||||
%files type_erasure
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_type_erasure.so.%{sonamever}
|
||||
%{_libdir}/libboost_type_erasure.so.1.66.*
|
||||
|
||||
%files wave
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_wave.so.%{sonamever}
|
||||
%{_libdir}/libboost_wave.so.1.66.*
|
||||
|
||||
%files help
|
||||
%doc %{boost_docdir}/*
|
||||
|
||||
%files devel
|
||||
%exclude %{_libdir}/libboost_numpy3.so
|
||||
%exclude %{_libdir}/libboost_numpy.so
|
||||
%exclude %{_libdir}/libboost_python3.so
|
||||
%exclude %{_libdir}/libboost_python.so
|
||||
%exclude %{_libdir}/libboost_numpy37.so
|
||||
%exclude %{_libdir}/libboost_numpy27.so
|
||||
%exclude %{_libdir}/libboost_python37.so
|
||||
%exclude %{_libdir}/libboost_python27.so
|
||||
%license LICENSE_1_0.txt
|
||||
%{_includedir}/%{name}
|
||||
%{_libdir}/*.so
|
||||
@ -1147,16 +1178,16 @@ fi
|
||||
|
||||
%files openmpi-python2-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/openmpi/lib/libboost_mpi_python.so
|
||||
%{_libdir}/openmpi/lib/libboost_mpi_python27.so
|
||||
|
||||
%files openmpi-python3
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/openmpi/lib/libboost_mpi_python3.so.%{sonamever}
|
||||
%{_libdir}/openmpi/lib/libboost_mpi_python37.so.%{sonamever}
|
||||
%{python3_sitearch}/openmpi/boost/
|
||||
|
||||
%files openmpi-python3-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/openmpi/lib/libboost_mpi_python3.so
|
||||
%{_libdir}/openmpi/lib/libboost_mpi_python37.so
|
||||
|
||||
|
||||
%files graph-openmpi
|
||||
@ -1176,21 +1207,21 @@ fi
|
||||
|
||||
%files mpich-python2
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python.so.%{sonamever}
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python27.so.%{sonamever}
|
||||
%{python2_sitearch}/mpich/boost/
|
||||
|
||||
%files mpich-python2-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python.so
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python27.so
|
||||
|
||||
%files mpich-python3
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python3.so.%{sonamever}
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python37.so.%{sonamever}
|
||||
%{python3_sitearch}/mpich/boost/
|
||||
|
||||
%files mpich-python3-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python3.so
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python37.so
|
||||
|
||||
%files graph-mpich
|
||||
%license LICENSE_1_0.txt
|
||||
@ -1213,13 +1244,19 @@ fi
|
||||
%{_mandir}/man1/bjam.1*
|
||||
|
||||
%changelog
|
||||
* Thu Mar 19 2020 Yu Xiangyang<yuxiangyang4@huawei.com> - 1.66.0-18
|
||||
- Type:bugfix
|
||||
* Mon Apr 20 2020 Wang Shuo<wangshuo47@huawei.com> - 1.72.0-1
|
||||
- Type:requirement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: fix build src.rpm error
|
||||
- DESC:update boost to 1.72.0
|
||||
|
||||
* Tue Mar 10 2020 Wang Shuo<wangshuo47@huawei.com> - 1.66.0-17
|
||||
* Fri Feb 28 2020 Wang Shuo<wangshuo47@huawei.com> - 1.66.0-18
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:restart
|
||||
- DESC:remove %{?dist} in Release
|
||||
|
||||
* Wed Feb 26 2020 Wang Shuo<wangshuo47@huawei.com> - 1.66.0-17
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user