summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2017-09-27 00:23:23 (GMT)
committerDongHun Kwak <dh0128.kwak@samsung.com>2017-09-27 00:23:23 (GMT)
commit478965830fb46d8657e788cda69eec06532831a4 (patch)
treedebd14699241ba0e1b0da2500151c63a32264929
parentdcc956c9f89f7cf2de217042b16f89e2885ca2bd (diff)
downloadboost-478965830fb46d8657e788cda69eec06532831a4.zip
boost-478965830fb46d8657e788cda69eec06532831a4.tar.gz
boost-478965830fb46d8657e788cda69eec06532831a4.tar.bz2
Bump to boost 1.65.1refs/changes/61/152661/1
[Model] All [BinType] AP [Customer] OPEN [Issue#] N/A [Request] N/A [Occurrence Version] N/A [Problem] Version upgrade [Cause & Measure] Version upgrade [Checking Method] N/A [Team] Open Source Management and Setting Part [Developer] dh0128.kwak [Solution company] Samsung [Change Type] N/A Change-Id: If2c807317d6810a61cb74361142977a9d1572666 Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
-rw-r--r--libs/python/build/Jamfile.v2152
-rw-r--r--packaging/boost.spec34
2 files changed, 26 insertions, 160 deletions
diff --git a/libs/python/build/Jamfile.v2 b/libs/python/build/Jamfile.v2
deleted file mode 100644
index b963c25..0000000
--- a/libs/python/build/Jamfile.v2
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright David Abrahams 2001-2006. Distributed under the Boost
-# Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-import os ;
-import indirect ;
-import modules ;
-import feature ;
-
-import python ;
-
-if ! [ python.configured ] && ! ( --without-python in [ modules.peek : ARGV ] )
-{
- # Attempt default configuration of python
- import toolset : using ;
- using python ;
-}
-
-if [ python.configured ] || ( --without-python in [ modules.peek : ARGV ] )
-{
- alias config-warning ;
-}
-else
-{
- message config-warning
- : "warning: No python installation configured and autoconfiguration"
- : "note: failed. See http://www.boost.org/libs/python/doc/building.html"
- : "note: for configuration instructions or pass --without-python to"
- : "note: suppress this message and silently skip all Boost.Python targets"
- ;
-}
-
-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 ] ;
-
-project boost/python
- : source-location ../src
- : requirements
- -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
- <tag>@$(__name__).tag
- <cxxflags>-fno-strict-aliasing
- ;
-
-rule tag ( name : type ? : property-set )
-{
- local result = $(name) ;
- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
- {
- if $(name) = boost_python && $(PYTHON_ID)
- {
- result = $(result)-$(PYTHON_ID) ;
- }
- }
-
- # forward to the boost tagging rule
- return [ indirect.call $(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
- $(result) : $(type) : $(property-set) ] ;
-}
-
-rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
-rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
-
-rule lib_boost_python ( is-py3 ? )
-{
-
- lib [ cond $(is-py3) : boost_python3 : boost_python ]
- : # sources
- numeric.cpp
- list.cpp
- long.cpp
- dict.cpp
- tuple.cpp
- str.cpp
- slice.cpp
-
- converter/from_python.cpp
- converter/registry.cpp
- converter/type_id.cpp
- object/enum.cpp
- object/class.cpp
- object/function.cpp
- object/inheritance.cpp
- object/life_support.cpp
- object/pickle_support.cpp
- errors.cpp
- module.cpp
- converter/builtin_converters.cpp
- converter/arg_to_python_base.cpp
- object/iterator.cpp
- object/stl_iterator.cpp
- object_protocol.cpp
- object_operators.cpp
- wrapper.cpp
- import.cpp
- exec.cpp
- object/function_doc_signature.cpp
- : # requirements
- <link>static:<define>BOOST_PYTHON_STATIC_LIB
- <define>BOOST_PYTHON_SOURCE
-
- # On Windows, all code using Python has to link to the Python
- # import library.
- #
- # On *nix we never link libboost_python to libpython. When
- # extending Python, all Python symbols are provided by the
- # Python interpreter executable. When embedding Python, the
- # client executable is expected to explicitly link to
- # /python//python (the target representing libpython) itself.
- #
- # python_for_extensions is a target defined by Boost.Build to
- # provide the Python include paths, and on Windows, the Python
- # import library, as usage requirements.
- [ cond [ python.configured ] : <library>/python//python_for_extensions ]
-
- # we prevent building when there is no python available
- # as it's not possible anyway, and to cause dependents to
- # fail to build
- [ unless [ python.configured ] : <build>no ]
- <dependency>config-warning
-
- <python-debugging>on:<define>BOOST_DEBUG_PYTHON
- [ cond $(is-py3) : <python>$(py3-version) ]
- : # default build
- <link>shared
- : # usage requirements
- <link>static:<define>BOOST_PYTHON_STATIC_LIB
- <python-debugging>on:<define>BOOST_DEBUG_PYTHON
- ;
-
-}
-
-lib_boost_python ;
-boost-install boost_python ;
-
-if $(py3-version)
-{
- lib_boost_python yes ;
- boost-install boost_python3 ;
-}
diff --git a/packaging/boost.spec b/packaging/boost.spec
index 6e9fdb9..c78b38b 100644
--- a/packaging/boost.spec
+++ b/packaging/boost.spec
@@ -1,12 +1,11 @@
-%define run_tests 0
-%if %{run_tests}
+%if "%{run_tests}" == "1"
# check is defined off at .rpmmacros file.
%define check %%check
%endif
-%define ver 1.62.0
-%define file_version 1_62_0
-%define short_version 1_62
+%define ver 1.65.1
+%define file_version 1_65_0
+%define short_version 1_65
#Only define to 1 to generate the man pages
%define build_docs 0
@@ -26,7 +25,7 @@
%define boost_libs4 boost-signals boost-system boost-thread
%define boost_libs5 boost-wave boost-regex
%define boost_libs6 boost-random boost-chrono boost-locale
-%define boost_libs7 boost-timer boost-atomic boost-log boost-container
+%define boost_libs7 boost-timer boost-atomic boost-log boost-container boost_stacktrace
%define most_libs %boost_libs1 %boost_libs2 %boost_libs3 %boost_libs4 %boost_libs5 %boost_libs6 %boost_libs7
@@ -71,7 +70,7 @@ Url: http://www.boost.org
Summary: Boost C++ Libraries
License: BSL-1.0
Group: Base/Libraries
-Version: 1.62.0
+Version: 1.65.1
Release: 0
Source0: %{name}_%{file_version}.tar.bz2
Source1: boost-rpmlintrc
@@ -299,6 +298,15 @@ Provides: boost-signals
%description -n boost-signals
This package contains the Boost::Signals Runtime libraries.
+
+%package -n boost_stacktrace
+Summary: Boost.Stacktrace runtime library
+Group: System/Libraries
+Requires: boost-license
+
+%description -n boost_stacktrace
+This package contains the Boost.Stacktrace runtime library.
+
%package -n boost-system
Summary: Boost::System Runtime Libraries
Group: System/Libraries
@@ -477,7 +485,7 @@ cd doc
%endif
%check
-%if %{run_tests}
+%if "%{run_tests}" == "1"
BOOST_LIBS="chrono,program_options,thread,system,filesystem,date_time,regex,serialization,iostreams,random,test"
chmod 777 ./run_test.sh
echo "RUN run_test.sh"
@@ -588,6 +596,7 @@ rm -f %{buildroot}%{_libdir}/*.a
%post -n boost-mpi -p /sbin/ldconfig
%endif
%post -n boost-graph -p /sbin/ldconfig
+%post -n boost_stacktrace -p /sbin/ldconfig
%post -n boost-system -p /sbin/ldconfig
%post -n boost-wave -p /sbin/ldconfig
%post -n boost-random -p /sbin/ldconfig
@@ -627,6 +636,7 @@ rm -f %{buildroot}%{_libdir}/*.a
%postun -n boost-mpi -p /sbin/ldconfig
%endif
%postun -n boost-graph -p /sbin/ldconfig
+%postun -n boost_stacktrace -p /sbin/ldconfig
%postun -n boost-system -p /sbin/ldconfig
%postun -n boost-wave -p /sbin/ldconfig
%postun -n boost-random -p /sbin/ldconfig
@@ -770,6 +780,14 @@ rm -f %{buildroot}%{_libdir}/*.a
%license LICENSE_1_0.txt
%{_libdir}/libboost_signals*.so.*
+%files -n boost_stacktrace
+%manifest %{name}.manifest
+%defattr(-, root, root, -)
+%license LICENSE_1_0.txt
+%{_libdir}/libboost_stacktrace_addr2line.so.*
+%{_libdir}/libboost_stacktrace_basic.so.*
+%{_libdir}/libboost_stacktrace_noop.so.*
+
%files -n boost-system
%manifest %{name}.manifest
%defattr(-, root, root, -)